diff options
author | Ronghua Wu <ronghuawu@google.com> | 2015-05-27 11:02:54 -0700 |
---|---|---|
committer | Ronghua Wu <ronghuawu@google.com> | 2015-05-27 11:02:54 -0700 |
commit | 02cb98d726b97d8e6dbb9c6c60d32a3cedc7f82d (patch) | |
tree | 20eeb0b56c675dba4aef74860a4669da14dad4e7 /media/libmediaplayerservice | |
parent | 6374077319a2d060eefe5f4bf425aed37f90c5d0 (diff) | |
download | frameworks_av-02cb98d726b97d8e6dbb9c6c60d32a3cedc7f82d.zip frameworks_av-02cb98d726b97d8e6dbb9c6c60d32a3cedc7f82d.tar.gz frameworks_av-02cb98d726b97d8e6dbb9c6c60d32a3cedc7f82d.tar.bz2 |
libmediaplayerservice: get isStreaming info from source.
Bug: 19061436
Change-Id: I0fc0d6207b0d3297d64aadab3e81448e3f3fa1de
Diffstat (limited to 'media/libmediaplayerservice')
4 files changed, 13 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index 88a7745..8ec542a 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -324,6 +324,10 @@ status_t NuPlayer::GenericSource::setBuffers( return INVALID_OPERATION; } +bool NuPlayer::GenericSource::isStreaming() const { + return mIsStreaming; +} + NuPlayer::GenericSource::~GenericSource() { if (mLooper != NULL) { mLooper->unregisterHandler(id()); diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.h b/media/libmediaplayerservice/nuplayer/GenericSource.h index 0a75e4c..dc85d2d 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.h +++ b/media/libmediaplayerservice/nuplayer/GenericSource.h @@ -75,6 +75,8 @@ struct NuPlayer::GenericSource : public NuPlayer::Source { virtual status_t setBuffers(bool audio, Vector<MediaBuffer *> &buffers); + virtual bool isStreaming() const; + protected: virtual ~GenericSource(); diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index a79858c..8760cbb 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -834,7 +834,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { audio_stream_type_t streamType = mAudioSink->getAudioStreamType(); const bool hasVideo = (videoFormat != NULL); const bool canOffload = canOffloadStream( - audioMeta, hasVideo, true /* is_streaming */, streamType); + audioMeta, hasVideo, mSource->isStreaming(), streamType); if (canOffload) { if (!mOffloadAudio) { mRenderer->signalEnableOffloadAudio(); @@ -1107,7 +1107,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { audio_stream_type_t streamType = mAudioSink->getAudioStreamType(); const bool hasVideo = (videoFormat != NULL); const bool canOffload = canOffloadStream( - audioMeta, hasVideo, true /* is_streaming */, streamType); + audioMeta, hasVideo, mSource->isStreaming(), streamType); if (canOffload) { mRenderer->signalEnableOffloadAudio(); sp<AMessage> format = mSource->getFormat(true /*audio*/); @@ -1288,8 +1288,7 @@ void NuPlayer::onStart(int64_t startPositionUs) { sp<AMessage> videoFormat = mSource->getFormat(false /* audio */); mOffloadAudio = - canOffloadStream(audioMeta, (videoFormat != NULL), - true /* is_streaming */, streamType); + canOffloadStream(audioMeta, (videoFormat != NULL), mSource->isStreaming(), streamType); if (mOffloadAudio) { flags |= Renderer::FLAG_OFFLOAD_AUDIO; } diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h index ef1ba13..11a6a9f 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h @@ -118,6 +118,10 @@ struct NuPlayer::Source : public AHandler { return false; } + virtual bool isStreaming() const { + return true; + } + protected: virtual ~Source() {} |