diff options
author | Lajos Molnar <lajos@google.com> | 2014-02-21 15:39:01 -0800 |
---|---|---|
committer | Lajos Molnar <lajos@google.com> | 2014-03-10 11:40:03 -0700 |
commit | 259f1624cf7b93ba831af10a616267487601c27f (patch) | |
tree | 69e0a151701a0a3b97f88d0859f0f674219e073b /media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | |
parent | 664334fc2204b9968e1600313383f5a6ff321811 (diff) | |
download | frameworks_av-259f1624cf7b93ba831af10a616267487601c27f.zip frameworks_av-259f1624cf7b93ba831af10a616267487601c27f.tar.gz frameworks_av-259f1624cf7b93ba831af10a616267487601c27f.tar.bz2 |
Revert "NuPlayer: Use a software renderer when using software codecs"
Remove software renderer support from NuPlayer because it is included
in MediaCodec.
Change-Id: I06e001df76df2e18ea8169620ff33aeec57e5ca2
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index bf5271e..a070c1a 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -20,8 +20,6 @@ #include "NuPlayerRenderer.h" -#include "SoftwareRenderer.h" - #include <media/stagefright/foundation/ABuffer.h> #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/AMessage.h> @@ -36,7 +34,6 @@ NuPlayer::Renderer::Renderer( const sp<AMessage> ¬ify, uint32_t flags) : mAudioSink(sink), - mSoftRenderer(NULL), mNotify(notify), mFlags(flags), mNumFramesWritten(0), @@ -60,12 +57,6 @@ NuPlayer::Renderer::Renderer( } NuPlayer::Renderer::~Renderer() { - delete mSoftRenderer; -} - -void NuPlayer::Renderer::setSoftRenderer(SoftwareRenderer *softRenderer) { - delete mSoftRenderer; - mSoftRenderer = softRenderer; } void NuPlayer::Renderer::queueBuffer( @@ -425,9 +416,6 @@ void NuPlayer::Renderer::onDrainVideoQueue() { ALOGV("rendering video at media time %.2f secs", (mFlags & FLAG_REAL_TIME ? realTimeUs : (realTimeUs + mAnchorTimeMediaUs - mAnchorTimeRealUs)) / 1E6); - if (mSoftRenderer != NULL) { - mSoftRenderer->render(entry->mBuffer->data(), entry->mBuffer->size(), NULL); - } } entry->mNotifyConsumed->setInt32("render", !tooLate); |