diff options
author | Andreas Gampe <agampe@google.com> | 2014-12-12 20:22:34 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-12 20:22:34 +0000 |
commit | b5f48be6d042a0259f1127683e206690d18142e0 (patch) | |
tree | 185bfe0c4c5a7cea7941c59966e1330f0dfa1961 | |
parent | bf62564a2a39a9bfb439e7919c7cc1b5ad1b2832 (diff) | |
parent | 6cc2764fdd7140d7c81265e86cc7c5dca3fe6623 (diff) | |
download | libmix-b5f48be6d042a0259f1127683e206690d18142e0.tar.gz |
am 6cc2764f: am 661c5a76: Libmix: Remove unused variables
* commit '6cc2764fdd7140d7c81265e86cc7c5dca3fe6623':
Libmix: Remove unused variables
-rw-r--r-- | videodecoder/VideoDecoderBase.cpp | 8 | ||||
-rw-r--r-- | videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp | 1 | ||||
-rw-r--r-- | videoencoder/VideoEncoderAVC.cpp | 4 | ||||
-rw-r--r-- | videoencoder/VideoEncoderBase.cpp | 4 | ||||
-rw-r--r-- | videoencoder/VideoEncoderUtils.cpp | 2 | ||||
-rw-r--r-- | videoencoder/VideoEncoderVP8.cpp | 37 |
6 files changed, 24 insertions, 32 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; diff --git a/videoencoder/VideoEncoderAVC.cpp b/videoencoder/VideoEncoderAVC.cpp index b5eab88..dfb226b 100644 --- a/videoencoder/VideoEncoderAVC.cpp +++ b/videoencoder/VideoEncoderAVC.cpp @@ -1096,7 +1096,7 @@ Encode_Status VideoEncoderAVC::renderPackedSequenceParams(EncodeTask *) { VAEncSequenceParameterBufferH264 *avcSeqParams; VAEncPackedHeaderParameterBuffer packed_header_param_buffer; unsigned char *packed_seq_buffer = NULL; - unsigned int length_in_bits, offset_in_bytes; + unsigned int length_in_bits; LOG_V("Begin\n"); @@ -1215,7 +1215,7 @@ Encode_Status VideoEncoderAVC::renderPackedPictureParams(EncodeTask *) { VAEncPictureParameterBufferH264 *avcPicParams; VAEncPackedHeaderParameterBuffer packed_header_param_buffer; unsigned char *packed_pic_buffer = NULL; - unsigned int length_in_bits, offset_in_bytes; + unsigned int length_in_bits; LOG_V("Begin\n"); diff --git a/videoencoder/VideoEncoderBase.cpp b/videoencoder/VideoEncoderBase.cpp index f383253..268e79e 100644 --- a/videoencoder/VideoEncoderBase.cpp +++ b/videoencoder/VideoEncoderBase.cpp @@ -825,6 +825,8 @@ Encode_Status VideoEncoderBase::queryAutoReferenceConfig(VAProfile profile) { attrib_list.value = VA_ATTRIB_NOT_SUPPORTED; vaStatus = vaGetConfigAttributes(mVADisplay, profile, VAEntrypointEncSlice, &attrib_list, 1); + CHECK_VA_STATUS_RETURN("vaQueryConfigAttributes"); + if(attrib_list.value == VA_ATTRIB_NOT_SUPPORTED ) mAutoReference = false; else @@ -1190,7 +1192,7 @@ Encode_Status VideoEncoderBase::getParameters( } } - return ENCODE_SUCCESS; + return ret; } Encode_Status VideoEncoderBase::setConfig(VideoParamConfigSet *videoEncConfig) { diff --git a/videoencoder/VideoEncoderUtils.cpp b/videoencoder/VideoEncoderUtils.cpp index 6eda981..5f78879 100644 --- a/videoencoder/VideoEncoderUtils.cpp +++ b/videoencoder/VideoEncoderUtils.cpp @@ -427,7 +427,6 @@ Encode_Status VASurfaceMap::MappingToVASurface() { Encode_Status VASurfaceMap::MappingSurfaceID(intptr_t value) { VAStatus vaStatus = VA_STATUS_SUCCESS; - VASurfaceID surface; //try to get kbufhandle from SurfaceID uint32_t fourCC = 0; @@ -627,7 +626,6 @@ Encode_Status VASurfaceMap::doActionCopy() { } uint8_t *srcY, *dstY; - uint8_t *srcU, *srcV; uint8_t *srcUV, *dstUV; srcY = pSrcBuffer + srcY_offset; diff --git a/videoencoder/VideoEncoderVP8.cpp b/videoencoder/VideoEncoderVP8.cpp index d65b385..4e79361 100644 --- a/videoencoder/VideoEncoderVP8.cpp +++ b/videoencoder/VideoEncoderVP8.cpp @@ -103,7 +103,7 @@ Encode_Status VideoEncoderVP8::renderSequenceParams() { CHECK_VA_STATUS_RETURN("vaRenderPicture"); LOG_V( "End\n"); - return ret; + return ret; } Encode_Status VideoEncoderVP8::renderPictureParams(EncodeTask *task) { @@ -287,9 +287,9 @@ Encode_Status VideoEncoderVP8::renderLayerStructureParam(void) uint32_t i; vaStatus = vaCreateBuffer(mVADisplay, mVAContext, - VAEncMiscParameterBufferType, - sizeof(VAEncMiscParameterBuffer) + sizeof(VAEncMiscParameterTemporalLayerStructure), - 1, NULL, &layer_struc_buf); + VAEncMiscParameterBufferType, + sizeof(VAEncMiscParameterBuffer) + sizeof(VAEncMiscParameterTemporalLayerStructure), + 1, NULL, &layer_struc_buf); CHECK_VA_STATUS_RETURN("vaCreateBuffer"); vaMapBuffer(mVADisplay, layer_struc_buf, (void **)&misc_param); @@ -379,24 +379,24 @@ Encode_Status VideoEncoderVP8::sendEncodeCommand(EncodeTask *task) { Encode_Status VideoEncoderVP8::derivedSetParams(VideoParamConfigSet *videoEncParams) { - CHECK_NULL_RETURN_IFFAIL(videoEncParams); - VideoParamsVP8 *encParamsVP8 = reinterpret_cast <VideoParamsVP8*> (videoEncParams); + CHECK_NULL_RETURN_IFFAIL(videoEncParams); + VideoParamsVP8 *encParamsVP8 = reinterpret_cast <VideoParamsVP8*> (videoEncParams); - if (encParamsVP8->size != sizeof(VideoParamsVP8)) { - return ENCODE_INVALID_PARAMS; - } + if (encParamsVP8->size != sizeof(VideoParamsVP8)) { + return ENCODE_INVALID_PARAMS; + } - mVideoParamsVP8 = *encParamsVP8; - return ENCODE_SUCCESS; + mVideoParamsVP8 = *encParamsVP8; + return ENCODE_SUCCESS; } Encode_Status VideoEncoderVP8::derivedGetParams(VideoParamConfigSet *videoEncParams) { - CHECK_NULL_RETURN_IFFAIL(videoEncParams); - VideoParamsVP8 *encParamsVP8 = reinterpret_cast <VideoParamsVP8*> (videoEncParams); + CHECK_NULL_RETURN_IFFAIL(videoEncParams); + VideoParamsVP8 *encParamsVP8 = reinterpret_cast <VideoParamsVP8*> (videoEncParams); - if (encParamsVP8->size != sizeof(VideoParamsVP8)) { - return ENCODE_INVALID_PARAMS; + if (encParamsVP8->size != sizeof(VideoParamsVP8)) { + return ENCODE_INVALID_PARAMS; } *encParamsVP8 = mVideoParamsVP8; @@ -405,7 +405,6 @@ Encode_Status VideoEncoderVP8::derivedGetParams(VideoParamConfigSet *videoEncPar Encode_Status VideoEncoderVP8::derivedGetConfig(VideoParamConfigSet *videoEncConfig) { - int layer_id; CHECK_NULL_RETURN_IFFAIL(videoEncConfig); switch (videoEncConfig->type) @@ -460,7 +459,6 @@ Encode_Status VideoEncoderVP8::derivedGetConfig(VideoParamConfigSet *videoEncCon Encode_Status VideoEncoderVP8::derivedSetConfig(VideoParamConfigSet *videoEncConfig) { - int layer_id; CHECK_NULL_RETURN_IFFAIL(videoEncConfig); switch (videoEncConfig->type) @@ -500,13 +498,10 @@ Encode_Status VideoEncoderVP8::derivedSetConfig(VideoParamConfigSet *videoEncCon mVideoParamsVP8.max_frame_size_ratio = encConfigVP8MaxFrameSizeRatio->max_frame_size_ratio; mRenderMaxFrameSize = true; - } + } break; case VideoConfigTypeIDRRequest:{ - VideoParamConfigSet *encConfigVP8KFrameRequest = - reinterpret_cast<VideoParamConfigSet*> (videoEncConfig); - mVideoConfigVP8.force_kf = 1; mForceKFrame = true; } |