diff options
| author | Eric Laurent <elaurent@google.com> | 2013-11-15 15:34:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-15 15:34:12 +0000 |
| commit | 7dae71d606ded1dbc2aa9733c3d98ffac57988f2 (patch) | |
| tree | 44eae87739ae1320383fbeb9dc4e3fbd3dd394d7 /include | |
| parent | d8a62e25ba6520c2531c7a3d32cc8066e1dab776 (diff) | |
| parent | 22612345ae97648d5b6db43cc1aa30aad77f7bba (diff) | |
| download | frameworks_av-7dae71d606ded1dbc2aa9733c3d98ffac57988f2.zip frameworks_av-7dae71d606ded1dbc2aa9733c3d98ffac57988f2.tar.gz frameworks_av-7dae71d606ded1dbc2aa9733c3d98ffac57988f2.tar.bz2 | |
Merge "AwesomePlayer: correct stream type for offload" into klp-dev
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 |