summaryrefslogtreecommitdiffstats
path: root/cmds/bootanimation/BootAnimation.h
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-10-02 16:08:47 -0700
committerMike Lockwood <lockwood@google.com>2014-10-03 15:38:15 -0700
commitebf9a0d8a888042c16ec0cb6dd8419f18038663f (patch)
treee364c8e39ff0795a22da5a5d1e32472bc22dcebb /cmds/bootanimation/BootAnimation.h
parent76716c5a180aa471c6973ca7aa03c7f2da677823 (diff)
downloadframeworks_base-ebf9a0d8a888042c16ec0cb6dd8419f18038663f.zip
frameworks_base-ebf9a0d8a888042c16ec0cb6dd8419f18038663f.tar.gz
frameworks_base-ebf9a0d8a888042c16ec0cb6dd8419f18038663f.tar.bz2
Add support for playing audio during bootanimation
The bootanimation daemon will play 16 bit WAV files contained in bootanimation.zip For this to work, the bootanimation.zip must contain an audio_conf.txt file, which contains parameters to be used for the tinyalsa pcm_open call as well as mixer parameters to set before attempting to play the sound. If the bootanimation finds an audio_conf.txt file, then it will look for a file named "audio.wav" in each of the part subdirectories. If audio.wav is found, it will play that WAV file starting at the beginning of that part. The code for this is based on the tinyplay utility in tinyalsa. The audio_conf.txt and must begin with the following header: card=<ALSA card number> device=<ALSA device number> period_size=<period size> period_count=<period count> This header is followed by zero or more mixer settings, each with the format: mixer "<name>" = <value list> Since mixer names can contain spaces, the name must be enclosed in double quotes. The values in the value list can be integers, booleans (represented by 0 or 1) or strings for enum values. Finally I should mention that this change is not the right approach. Instead of going straight to ALSA we should be using the mediaserver instead. But mediaserver isn't ready in time due to interactions with the system server, and there isn't time to fix this for the current release. We need to fix that for the next one. Bug: 17674304 Change-Id: Ic391ade61c941d0a24f4d64fe005ac9375a23fa9
Diffstat (limited to 'cmds/bootanimation/BootAnimation.h')
-rw-r--r--cmds/bootanimation/BootAnimation.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h
index 72cd62b..f968b25 100644
--- a/cmds/bootanimation/BootAnimation.h
+++ b/cmds/bootanimation/BootAnimation.h
@@ -21,7 +21,7 @@
#include <sys/types.h>
#include <androidfw/AssetManager.h>
-#include <utils/threads.h>
+#include <utils/Thread.h>
#include <EGL/egl.h>
#include <GLES/gl.h>
@@ -30,6 +30,7 @@ class SkBitmap;
namespace android {
+class AudioPlayer;
class Surface;
class SurfaceComposerClient;
class SurfaceControl;
@@ -72,6 +73,7 @@ private:
SortedVector<Frame> frames;
bool playUntilComplete;
float backgroundColor[3];
+ FileMap* audioFile;
};
int fps;
int width;
@@ -82,11 +84,13 @@ private:
status_t initTexture(Texture* texture, AssetManager& asset, const char* name);
status_t initTexture(const Animation::Frame& frame);
bool android();
+ bool readFile(const char* name, String8& outString);
bool movie();
void checkExit();
sp<SurfaceComposerClient> mSession;
+ sp<AudioPlayer> mAudioPlayer;
AssetManager mAssets;
Texture mAndroid[2];
int mWidth;