diff options
| author | Eric Laurent <elaurent@google.com> | 2013-11-14 17:28:47 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2013-11-14 17:36:42 -0800 |
| commit | 22612345ae97648d5b6db43cc1aa30aad77f7bba (patch) | |
| tree | 73b47a621118d0fa56d27929a9447e90ca27c97d /media/libmediaplayerservice | |
| parent | 4215e6166fca9f87a6e9e848b3dfd4ab0d25c954 (diff) | |
| download | frameworks_av-22612345ae97648d5b6db43cc1aa30aad77f7bba.zip frameworks_av-22612345ae97648d5b6db43cc1aa30aad77f7bba.tar.gz frameworks_av-22612345ae97648d5b6db43cc1aa30aad77f7bba.tar.bz2 | |
AwesomePlayer: correct stream type for offload
canOffloadStream() function in stagefright utils forces the
stream type to AUDIO_STREAM_MUSIC when querying the audio policy
manager if a particular track is offloadable or not.
This causes MP3 ringtones to be offloaded which is not a validated use case.
The fix consists in using the actual stream type read from the AudioSink.
Bug: 11410937.
Change-Id: I44b8e033a8e785a79cdc291b142f80b5580bdc4d
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index 05d44d4..a486cb5 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -100,7 +100,10 @@ class MediaPlayerService : public BnMediaPlayerService virtual void flush(); virtual void pause(); virtual void close(); - void setAudioStreamType(audio_stream_type_t streamType) { mStreamType = streamType; } + void setAudioStreamType(audio_stream_type_t streamType) { + mStreamType = streamType; } + virtual audio_stream_type_t getAudioStreamType() const { return mStreamType; } + void setVolume(float left, float right); virtual status_t setPlaybackRatePermille(int32_t ratePermille); status_t setAuxEffectSendLevel(float level); @@ -207,6 +210,9 @@ class MediaPlayerService : public BnMediaPlayerService virtual void pause() {} virtual void close() {} void setAudioStreamType(audio_stream_type_t streamType) {} + // stream type is not used for AudioCache + virtual audio_stream_type_t getAudioStreamType() const { return AUDIO_STREAM_DEFAULT; } + void setVolume(float left, float right) {} virtual status_t setPlaybackRatePermille(int32_t ratePermille) { return INVALID_OPERATION; } uint32_t sampleRate() const { return mSampleRate; } |