diff options
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 36 | ||||
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.h | 3 | ||||
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | 9 |
3 files changed, 10 insertions, 38 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index f1467c4..2a770cd 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -39,7 +39,6 @@ #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MediaErrors.h> #include <media/stagefright/MetaData.h> -#include <media/stagefright/SkipCutBuffer.h> #include <gui/ISurfaceTexture.h> #include "avc_utils.h" @@ -64,13 +63,10 @@ NuPlayer::NuPlayer() mSkipRenderingVideoUntilMediaTimeUs(-1ll), mVideoLateByUs(0ll), mNumFramesTotal(0ll), - mNumFramesDropped(0ll), - mSkipCutBuffer(NULL) { + mNumFramesDropped(0ll) { } NuPlayer::~NuPlayer() { - delete mSkipCutBuffer; - mSkipCutBuffer = NULL; } void NuPlayer::setUID(uid_t uid) { @@ -238,32 +234,6 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { mSource->start(); - sp<MetaData> meta = mSource->getFormat(true /* audio */); - if (meta != NULL) { - int32_t delay = 0; - if (!meta->findInt32(kKeyEncoderDelay, &delay)) { - delay = 0; - } - int32_t padding = 0; - if (!meta->findInt32(kKeyEncoderPadding, &padding)) { - padding = 0; - } - int32_t numchannels = 0; - if (delay + padding) { - if (meta->findInt32(kKeyChannelCount, &numchannels)) { - size_t frameSize = numchannels * sizeof(int16_t); - if (mSkipCutBuffer) { - size_t prevbuffersize = mSkipCutBuffer->size(); - if (prevbuffersize != 0) { - ALOGW("Replacing SkipCutBuffer holding %d bytes", prevbuffersize); - } - delete mSkipCutBuffer; - } - mSkipCutBuffer = new SkipCutBuffer(delay * frameSize, padding * frameSize); - } - } - } - mRenderer = new Renderer( mAudioSink, new AMessage(kWhatRendererNotify, id())); @@ -892,10 +862,6 @@ void NuPlayer::renderBuffer(bool audio, const sp<AMessage> &msg) { skipUntilMediaTimeUs = -1; } - if (audio && mSkipCutBuffer) { - mSkipCutBuffer->submit(buffer); - } - mRenderer->queueBuffer(audio, buffer, reply); } diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index f917f64..25766e0 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -27,7 +27,6 @@ namespace android { struct ACodec; struct MetaData; struct NuPlayerDriver; -class SkipCutBuffer; struct NuPlayer : public AHandler { NuPlayer(); @@ -129,8 +128,6 @@ private: int64_t mVideoLateByUs; int64_t mNumFramesTotal, mNumFramesDropped; - SkipCutBuffer *mSkipCutBuffer; - status_t instantiateDecoder(bool audio, sp<Decoder> *decoder); status_t feedDecoderInputData(bool audio, const sp<AMessage> &msg); diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp index 25974b6..d18d146 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp @@ -124,6 +124,15 @@ sp<AMessage> NuPlayer::Decoder::makeFormat(const sp<MetaData> &meta) { msg->setInt32("channel-count", numChannels); msg->setInt32("sample-rate", sampleRate); + int32_t delay = 0; + if (meta->findInt32(kKeyEncoderDelay, &delay)) { + msg->setInt32("encoder-delay", delay); + } + int32_t padding = 0; + if (meta->findInt32(kKeyEncoderPadding, &padding)) { + msg->setInt32("encoder-padding", padding); + } + int32_t isADTS; if (meta->findInt32(kKeyIsADTS, &isADTS) && isADTS != 0) { msg->setInt32("is-adts", true); |