diff options
author | Geoffrey Pitsch <gpitsch@google.com> | 2016-06-08 00:38:58 -0700 |
---|---|---|
committer | Geoffrey Pitsch <gpitsch@google.com> | 2016-07-06 11:13:48 -0400 |
commit | d6d9a1d0b9cf6fa740d9fe410015b094475c5a4c (patch) | |
tree | 1acd21e2daca47872bca249e76f18110886b8fd1 /cmds/bootanimation/BootAnimation.h | |
parent | 58ef88927d5e28318920a135bba8edf5409115fe (diff) |
OpenSL-based audio support for BootAnimation
Respects dnd settings for sound playback.
Basic implementation uses in-memory wavs as buffers.
audioplay::playClip should not be called before previous clip ends.
Updated FORMAT.md to reflect no more audio_conf.txt
Bug: 29055299
Change-Id: Ifc358d7c85f11b8b54ae6446c40643b87bc567f2
Diffstat (limited to 'cmds/bootanimation/BootAnimation.h')
-rw-r--r-- | cmds/bootanimation/BootAnimation.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h index a093c9b87e75..5feea0187926 100644 --- a/cmds/bootanimation/BootAnimation.h +++ b/cmds/bootanimation/BootAnimation.h @@ -30,7 +30,6 @@ class SkBitmap; namespace android { -class AudioPlayer; class Surface; class SurfaceComposerClient; class SurfaceControl; @@ -98,7 +97,8 @@ private: SortedVector<Frame> frames; bool playUntilComplete; float backgroundColor[3]; - FileMap* audioFile; + uint8_t* audioData; + int audioLength; Animation* animation; }; int fps; @@ -124,7 +124,6 @@ private: void checkExit(); sp<SurfaceComposerClient> mSession; - sp<AudioPlayer> mAudioPlayer; AssetManager mAssets; Texture mAndroid[2]; Texture mClock; |