diff options
author | Andreas Gampe <agampe@google.com> | 2014-12-12 17:43:50 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-12 17:43:50 +0000 |
commit | 6cc2764fdd7140d7c81265e86cc7c5dca3fe6623 (patch) | |
tree | 8615a9f514859f8065fe1c2489f68a35bc3687d2 /videodecoder | |
parent | d4d49639f15e5f2791e806556332df872d5c672f (diff) | |
parent | 661c5a76313015b6a3fea4b0e593b761a32f4372 (diff) | |
download | libmix-6cc2764fdd7140d7c81265e86cc7c5dca3fe6623.tar.gz |
am 661c5a76: Libmix: Remove unused variables
* commit '661c5a76313015b6a3fea4b0e593b761a32f4372':
Libmix: Remove unused variables
Diffstat (limited to 'videodecoder')
-rw-r--r-- | videodecoder/VideoDecoderBase.cpp | 8 | ||||
-rw-r--r-- | videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/videodecoder/VideoDecoderBase.cpp b/videodecoder/VideoDecoderBase.cpp index 8c66e80..74670e8 100644 --- a/videodecoder/VideoDecoderBase.cpp +++ b/videodecoder/VideoDecoderBase.cpp @@ -259,7 +259,6 @@ const VideoFormatInfo* VideoDecoderBase::getFormatInfo(void) { } const VideoRenderBuffer* VideoDecoderBase::getOutput(bool draining, VideoErrorBuffer *outErrBuf) { - VAStatus vaStatus; if (mVAStarted == false) { return NULL; } @@ -282,7 +281,7 @@ const VideoRenderBuffer* VideoDecoderBase::getOutput(bool draining, VideoErrorBu if (mOutputHead == NULL) { mOutputTail = NULL; } - vaStatus = vaSetTimestampForSurface(mVADisplay, outputByPos->renderBuffer.surface, outputByPos->renderBuffer.timeStamp); + vaSetTimestampForSurface(mVADisplay, outputByPos->renderBuffer.surface, outputByPos->renderBuffer.timeStamp); if (useGraphicBuffer && !mUseGEN) { vaSyncSurface(mVADisplay, outputByPos->renderBuffer.surface); fillDecodingErrors(&(outputByPos->renderBuffer)); @@ -337,7 +336,7 @@ const VideoRenderBuffer* VideoDecoderBase::getOutput(bool draining, VideoErrorBu } } //VTRACE("Output POC %d for display (pts = %.2f)", output->pictureOrder, output->renderBuffer.timeStamp/1E6); - vaStatus = vaSetTimestampForSurface(mVADisplay, output->renderBuffer.surface, output->renderBuffer.timeStamp); + vaSetTimestampForSurface(mVADisplay, output->renderBuffer.surface, output->renderBuffer.timeStamp); if (useGraphicBuffer && !mUseGEN) { vaSyncSurface(mVADisplay, output->renderBuffer.surface); @@ -767,7 +766,6 @@ exit: Decode_Status VideoDecoderBase::setupVA(uint32_t numSurface, VAProfile profile, uint32_t numExtraSurface) { VAStatus vaStatus = VA_STATUS_SUCCESS; Decode_Status status; - VAConfigAttrib attrib; if (mVAStarted) { return DECODE_SUCCESS; @@ -846,6 +844,7 @@ Decode_Status VideoDecoderBase::setupVA(uint32_t numSurface, VAProfile profile, status = getCodecSpecificConfigs(profile, &mVAConfig); CHECK_STATUS("getCodecSpecificAttributes"); #else + VAConfigAttrib attrib; //We are requesting RT attributes attrib.type = VAConfigAttribRTFormat; attrib.value = VA_RT_FORMAT_YUV420; @@ -1147,7 +1146,6 @@ Decode_Status VideoDecoderBase::getRawDataFromSurface(VideoRenderBuffer *renderB } VAStatus vaStatus; - VAImageFormat imageFormat; VAImage vaImage; vaStatus = vaSyncSurface(renderBuffer->display, renderBuffer->surface); CHECK_VA_STATUS("vaSyncSurface"); diff --git a/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp b/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp index 4260f30..dd30ae4 100644 --- a/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp +++ b/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp @@ -233,7 +233,6 @@ Decode_Status VideoDecoderAVCSecure::processClassicInputBuffer(VideoDecodeBuffer uint8_t naluType = 0; int32_t num_nalus; - int32_t nalu_offset; int32_t offset; uint8_t *data_src; uint8_t *nalu_data; |