diff options
author | Steve Block <steveblock@google.com> | 2012-01-08 10:14:44 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-08 10:14:44 +0000 |
commit | f8bd29c66308c820d579b3efb0942a53a277e2c5 (patch) | |
tree | 83b386db49c12a6ba562c1fec76e08c334cff929 /libvideoeditor/vss | |
parent | e70ff37034fdb93f65d34704aec400ec9123e55c (diff) | |
download | frameworks_av-f8bd29c66308c820d579b3efb0942a53a277e2c5.zip frameworks_av-f8bd29c66308c820d579b3efb0942a53a277e2c5.tar.gz frameworks_av-f8bd29c66308c820d579b3efb0942a53a277e2c5.tar.bz2 |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: I5c54a0185527f6ca3e746d625a007aa06f6f25f9
Diffstat (limited to 'libvideoeditor/vss')
4 files changed, 28 insertions, 28 deletions
diff --git a/libvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c b/libvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c index 91952d0..cc67e72 100755 --- a/libvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c +++ b/libvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c @@ -498,7 +498,7 @@ M4OSA_ERR getAVCProfileAndLevel(M4OSA_UInt8* pDSI, M4OSA_Int32 DSISize, } if ((DSISize <= index) || (pDSI == M4OSA_NULL)) { - LOGE("getAVCProfileAndLevel: DSI is invalid"); + ALOGE("getAVCProfileAndLevel: DSI is invalid"); *pProfile = M4VIDEOEDITING_VIDEO_UNKNOWN_PROFILE; *pLevel = M4VIDEOEDITING_VIDEO_UNKNOWN_LEVEL; return M4ERR_PARAMETER; @@ -596,12 +596,12 @@ M4OSA_ERR getH263ProfileAndLevel(M4OSA_UInt8* pDSI, M4OSA_Int32 DSISize, M4OSA_UInt16 index = 7; /* the 5th and 6th bytes contain the level and profile */ if ((pProfile == M4OSA_NULL) || (pLevel == M4OSA_NULL)) { - LOGE("getH263ProfileAndLevel invalid pointer for pProfile"); + ALOGE("getH263ProfileAndLevel invalid pointer for pProfile"); return M4ERR_PARAMETER; } if ((DSISize < index) || (pDSI == M4OSA_NULL)) { - LOGE("getH263ProfileAndLevel: DSI is invalid"); + ALOGE("getH263ProfileAndLevel: DSI is invalid"); *pProfile = M4VIDEOEDITING_VIDEO_UNKNOWN_PROFILE; *pLevel = M4VIDEOEDITING_VIDEO_UNKNOWN_LEVEL; return M4ERR_PARAMETER; diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp index 95591e9..80a7f0b 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp @@ -40,7 +40,7 @@ /*---------------------*/ /* DEBUG LEVEL SETUP */ /*---------------------*/ -#define LOG1 LOGE /*ERRORS Logging*/ +#define LOG1 ALOGE /*ERRORS Logging*/ #define LOG2 ALOGI /*WARNING Logging*/ #define LOG3 //ALOGV /*COMMENTS Logging*/ @@ -232,14 +232,14 @@ const uint8_t *parseParamSet(AVCCodecSpecificContext* pC, const uint8_t *nextStartCode = &data[length - bytesLeft]; *paramSetLen = nextStartCode - data; if (*paramSetLen == 0) { - LOGE("Param set is malformed, since its length is 0"); + ALOGE("Param set is malformed, since its length is 0"); return NULL; } AVCParamSet paramSet(*paramSetLen, data); if (type == kNalUnitTypeSeqParamSet) { if (*paramSetLen < 4) { - LOGE("Seq parameter set malformed"); + ALOGE("Seq parameter set malformed"); return NULL; } if (pC->mSeqParamSets.empty()) { @@ -267,17 +267,17 @@ status_t buildAVCCodecSpecificData(uint8_t **pOutputData, size_t *pOutputSize, //ALOGV("buildAVCCodecSpecificData"); if ( (pOutputData == NULL) || (pOutputSize == NULL) ) { - LOGE("output is invalid"); + ALOGE("output is invalid"); return ERROR_MALFORMED; } if (*pOutputData != NULL) { - LOGE("Already have codec specific data"); + ALOGE("Already have codec specific data"); return ERROR_MALFORMED; } if (size < 4) { - LOGE("Codec specific data length too short: %d", size); + ALOGE("Codec specific data length too short: %d", size); return ERROR_MALFORMED; } @@ -286,7 +286,7 @@ status_t buildAVCCodecSpecificData(uint8_t **pOutputData, size_t *pOutputSize, // 2 bytes for each of the parameter set length field // plus the 7 bytes for the header if (size < 4 + 7) { - LOGE("Codec specific data length too short: %d", size); + ALOGE("Codec specific data length too short: %d", size); return ERROR_MALFORMED; } @@ -313,7 +313,7 @@ status_t buildAVCCodecSpecificData(uint8_t **pOutputData, size_t *pOutputSize, type = (*(tmp + 4)) & 0x1F; if (type == kNalUnitTypeSeqParamSet) { if (gotPps) { - LOGE("SPS must come before PPS"); + ALOGE("SPS must come before PPS"); return ERROR_MALFORMED; } if (!gotSps) { @@ -323,7 +323,7 @@ status_t buildAVCCodecSpecificData(uint8_t **pOutputData, size_t *pOutputSize, ¶mSetLen); } else if (type == kNalUnitTypePicParamSet) { if (!gotSps) { - LOGE("SPS must come before PPS"); + ALOGE("SPS must come before PPS"); return ERROR_MALFORMED; } if (!gotPps) { @@ -332,7 +332,7 @@ status_t buildAVCCodecSpecificData(uint8_t **pOutputData, size_t *pOutputSize, nextStartCode = parseParamSet(&ctx, tmp + 4, bytesLeft - 4, type, ¶mSetLen); } else { - LOGE("Only SPS and PPS Nal units are expected"); + ALOGE("Only SPS and PPS Nal units are expected"); return ERROR_MALFORMED; } @@ -350,12 +350,12 @@ status_t buildAVCCodecSpecificData(uint8_t **pOutputData, size_t *pOutputSize, // Check on the number of seq parameter sets size_t nSeqParamSets = ctx.mSeqParamSets.size(); if (nSeqParamSets == 0) { - LOGE("Cound not find sequence parameter set"); + ALOGE("Cound not find sequence parameter set"); return ERROR_MALFORMED; } if (nSeqParamSets > 0x1F) { - LOGE("Too many seq parameter sets (%d) found", nSeqParamSets); + ALOGE("Too many seq parameter sets (%d) found", nSeqParamSets); return ERROR_MALFORMED; } } @@ -364,11 +364,11 @@ status_t buildAVCCodecSpecificData(uint8_t **pOutputData, size_t *pOutputSize, // Check on the number of pic parameter sets size_t nPicParamSets = ctx.mPicParamSets.size(); if (nPicParamSets == 0) { - LOGE("Cound not find picture parameter set"); + ALOGE("Cound not find picture parameter set"); return ERROR_MALFORMED; } if (nPicParamSets > 0xFF) { - LOGE("Too many pic parameter sets (%d) found", nPicParamSets); + ALOGE("Too many pic parameter sets (%d) found", nPicParamSets); return ERROR_MALFORMED; } } @@ -402,7 +402,7 @@ status_t buildAVCCodecSpecificData(uint8_t **pOutputData, size_t *pOutputSize, uint16_t seqParamSetLength = it->mLength; header[0] = seqParamSetLength >> 8; header[1] = seqParamSetLength & 0xff; - //LOGE("### SPS %d %d %d", seqParamSetLength, header[0], header[1]); + //ALOGE("### SPS %d %d %d", seqParamSetLength, header[0], header[1]); // SPS NAL unit (sequence parameter length bytes) memcpy(&header[2], it->mData, seqParamSetLength); @@ -419,7 +419,7 @@ status_t buildAVCCodecSpecificData(uint8_t **pOutputData, size_t *pOutputSize, uint16_t picParamSetLength = it->mLength; header[0] = picParamSetLength >> 8; header[1] = picParamSetLength & 0xff; -//LOGE("### PPS %d %d %d", picParamSetLength, header[0], header[1]); +//ALOGE("### PPS %d %d %d", picParamSetLength, header[0], header[1]); // PPS Nal unit (picture parameter set length bytes) memcpy(&header[2], it->mData, picParamSetLength); diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp index 6e2a90f..5f856f9 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp @@ -100,13 +100,13 @@ status_t VideoEditorVideoDecoderSource::start( if (!mStarted) { if (mFormat->findInt32(kKeyMaxInputSize, &mMaxAUSize) == false) { - LOGE("Could not find kKeyMaxInputSize"); + ALOGE("Could not find kKeyMaxInputSize"); return ERROR_MALFORMED; } mGroup = new MediaBufferGroup; if (mGroup == NULL) { - LOGE("FATAL: memory limitation ! "); + ALOGE("FATAL: memory limitation ! "); return NO_MEMORY; } @@ -153,7 +153,7 @@ status_t VideoEditorVideoDecoderSource::read(MediaBuffer** buffer_out, MediaSource::ReadOptions::SeekMode mode; options->getSeekTo(&time_us, &mode); if (mode != MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC) { - LOGE("Unexpected read options"); + ALOGE("Unexpected read options"); return BAD_VALUE; } @@ -171,7 +171,7 @@ status_t VideoEditorVideoDecoderSource::read(MediaBuffer** buffer_out, rapTime -= 40000; if(rapTime < 0) rapTime = 0; } else if (err != OK) { - LOGE("get rap time error = 0x%x\n", (uint32_t)err); + ALOGE("get rap time error = 0x%x\n", (uint32_t)err); return UNKNOWN_ERROR; } @@ -181,7 +181,7 @@ status_t VideoEditorVideoDecoderSource::read(MediaBuffer** buffer_out, &rapTime); if (err != OK) { - LOGE("jump err = 0x%x\n", (uint32_t)err); + ALOGE("jump err = 0x%x\n", (uint32_t)err); return BAD_VALUE; } } @@ -1397,7 +1397,7 @@ M4OSA_ERR VideoEditorVideoDecoder_decode(M4OSA_Context context, } continue; } else if (errStatus != OK) { - LOGE("VideoEditorVideoDecoder_decode ERROR:0x%x(%d)", + ALOGE("VideoEditorVideoDecoder_decode ERROR:0x%x(%d)", errStatus,errStatus); lerr = errStatus; goto VIDEOEDITOR_VideoDecode_cleanUP; @@ -1485,7 +1485,7 @@ static M4OSA_ERR copyBufferToQueue( pDecShellContext->mGivenHeight, // decoderHeight pDecShellContext->mCropRect, // decoderRect tmpDecBuffer->pData /* dstBits */) < 0) { - LOGE("convertDecoderOutputToI420 failed"); + ALOGE("convertDecoderOutputToI420 failed"); lerr = M4ERR_NOT_IMPLEMENTED; } } else if (pDecShellContext->decOuputColorFormat == OMX_COLOR_FormatYUV420Planar) { @@ -1540,7 +1540,7 @@ static M4OSA_ERR copyBufferToQueue( } } } else { - LOGE("VideoDecoder_decode: unexpected color format 0x%X", + ALOGE("VideoDecoder_decode: unexpected color format 0x%X", pDecShellContext->decOuputColorFormat); lerr = M4ERR_PARAMETER; } diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp index 49ac2f1..3ec1a73 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp @@ -992,7 +992,7 @@ M4OSA_ERR VideoEditorVideoEncoder_processInputBuffer( encoderWidth, encoderHeight, encoderRect, (uint8_t*)newBuffer->data() + newBuffer->range_offset()) < 0) { - LOGE("convertI420ToEncoderInput failed"); + ALOGE("convertI420ToEncoderInput failed"); } // switch to new buffer |