diff options
author | Marco Nelissen <marcone@google.com> | 2013-11-28 17:26:16 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-28 17:26:18 +0000 |
commit | 92630351d265a61faae2dfe006a8bb330283aa7b (patch) | |
tree | c3f2d9f3e92406c1a9922eba728a6499a9608aec /media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h | |
parent | 90892d1be84776f59a619ea4ef9ce51be5828ff8 (diff) | |
parent | da38df5f080eb62a06b22c5bada4357cf756255e (diff) | |
download | frameworks_av-92630351d265a61faae2dfe006a8bb330283aa7b.zip frameworks_av-92630351d265a61faae2dfe006a8bb330283aa7b.tar.gz frameworks_av-92630351d265a61faae2dfe006a8bb330283aa7b.tar.bz2 |
Merge "NuPlayer: Use a software renderer when using software codecs"
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h index 94a05ea..9124e03 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h @@ -23,6 +23,7 @@ namespace android { struct ABuffer; +class SoftwareRenderer; struct NuPlayer::Renderer : public AHandler { enum Flags { @@ -56,6 +57,8 @@ struct NuPlayer::Renderer : public AHandler { kWhatMediaRenderingStart = 'mdrd', }; + void setSoftRenderer(SoftwareRenderer *softRenderer); + protected: virtual ~Renderer(); @@ -83,6 +86,7 @@ private: static const int64_t kMinPositionUpdateDelayUs; sp<MediaPlayerBase::AudioSink> mAudioSink; + SoftwareRenderer *mSoftRenderer; sp<AMessage> mNotify; uint32_t mFlags; List<QueueEntry> mAudioQueue; |