diff options
| author | Eric Laurent <elaurent@google.com> | 2013-11-15 08:27:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-15 08:27:06 -0800 |
| commit | b4213a1252c23115f3fac77101adb33a9c6b9423 (patch) | |
| tree | 1477fe0312af38a2a24e655f7d62d7c1b9b1f38f /include | |
| parent | b5099903c059dc913e0e592969c10d15fac0c14c (diff) | |
| parent | 576e89b523d7705545032edc67d98d9ab1dedbd2 (diff) | |
| download | frameworks_av-b4213a1252c23115f3fac77101adb33a9c6b9423.zip frameworks_av-b4213a1252c23115f3fac77101adb33a9c6b9423.tar.gz frameworks_av-b4213a1252c23115f3fac77101adb33a9c6b9423.tar.bz2 | |
am 576e89b5: am 7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-dev
* commit '576e89b523d7705545032edc67d98d9ab1dedbd2':
AwesomePlayer: correct stream type for offload
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/MediaPlayerInterface.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/Utils.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index 3b151ef..cc244f0 100644 --- a/include/media/MediaPlayerInterface.h +++ b/include/media/MediaPlayerInterface.h @@ -99,6 +99,7 @@ public: virtual status_t getPosition(uint32_t *position) const = 0; virtual status_t getFramesWritten(uint32_t *frameswritten) const = 0; virtual int getSessionId() const = 0; + virtual audio_stream_type_t getAudioStreamType() const = 0; // If no callback is specified, use the "write" API below to submit // audio data. diff --git a/include/media/stagefright/Utils.h b/include/media/stagefright/Utils.h index c24f612..bbad271 100644 --- a/include/media/stagefright/Utils.h +++ b/include/media/stagefright/Utils.h @@ -57,7 +57,8 @@ status_t mapMimeToAudioFormat(audio_format_t& format, const char* mime); status_t sendMetaDataToHal(sp<MediaPlayerBase::AudioSink>& sink, const sp<MetaData>& meta); // Check whether the stream defined by meta can be offloaded to hardware -bool canOffloadStream(const sp<MetaData>& meta, bool hasVideo, bool isStreaming); +bool canOffloadStream(const sp<MetaData>& meta, bool hasVideo, + bool isStreaming, audio_stream_type_t streamType); } // namespace android |