Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51b3ea2b authored by Glenn Kasten's avatar Glenn Kasten Committed by Gerrit Code Review
Browse files

Merge "64-bit: Correction to OMX_U32 and OMX_S32"

parents 93bbc834 66fe2e9e

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+2 −2
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 portIndex) { 
                bool signalError = false;

                if (inHeader->nFilledLen < 7) {

                    ALOGE("Audio data too short to contain even the ADTS header. "

                          "Got %ld bytes.", inHeader->nFilledLen);

                          "Got %d bytes.", inHeader->nFilledLen);

                    hexdump(adtsHeader, inHeader->nFilledLen);

                    signalError = true;

                } else {
@@ -397,7 +397,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 portIndex) { 


                    if (inHeader->nFilledLen < aac_frame_length) {

                        ALOGE("Not enough audio data for the complete frame. "

                              "Got %ld bytes, frame size according to the ADTS "

                              "Got %d bytes, frame size according to the ADTS "

                              "header is %u bytes.",

                              inHeader->nFilledLen, aac_frame_length);

                        hexdump(adtsHeader, inHeader->nFilledLen);

media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp

+2 −2
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ status_t SoftAACEncoder2::setAudioParams() { 
    // We call this whenever sample rate, number of channels or bitrate change

    // in reponse to setParameter calls.



    ALOGV("setAudioParams: %lu Hz, %lu channels, %lu bps",

    ALOGV("setAudioParams: %u Hz, %u channels, %u bps",

         mSampleRate, mNumChannels, mBitRate);



    if (AACENC_OK != aacEncoder_SetParam(mAACEncoder, AACENC_AOT,
@@ -364,7 +364,7 @@ void SoftAACEncoder2::onQueueFilled(OMX_U32 portIndex) { 


        OMX_U32 actualBitRate  = aacEncoder_GetParam(mAACEncoder, AACENC_BITRATE);

        if (mBitRate != actualBitRate) {

            ALOGW("Requested bitrate %lu unsupported, using %lu", mBitRate, actualBitRate);

            ALOGW("Requested bitrate %u unsupported, using %u", mBitRate, actualBitRate);

        }



        AACENC_InfoStruct encInfo;

media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ void SoftAVCEncoder::onQueueFilled(OMX_U32 portIndex) { 
                if (mStoreMetaDataInBuffers) {

                    if (inHeader->nFilledLen != 8) {

                        ALOGE("MetaData buffer is wrong size! "

                                "(got %lu bytes, expected 8)", inHeader->nFilledLen);

                                "(got %u bytes, expected 8)", inHeader->nFilledLen);

                        mSignalledError = true;

                        notify(OMX_EventError, OMX_ErrorUndefined, 0, 0);

                        return;
@@ -981,7 +981,7 @@ uint8_t *SoftAVCEncoder::extractGrallocData(void *data, buffer_handle_t *buffer) 
    status_t res;

    if (type != kMetadataBufferTypeGrallocSource) {

        ALOGE("Data passed in with metadata mode does not have type "

                "kMetadataBufferTypeGrallocSource (%d), has type %ld instead",

                "kMetadataBufferTypeGrallocSource (%d), has type %d instead",

                kMetadataBufferTypeGrallocSource, type);

        return NULL;

    }

media/libstagefright/codecs/flac/enc/SoftFlacEncoder.cpp

+5 −5
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ OMX_ERRORTYPE SoftFlacEncoder::internalSetParameter( 


            mNumChannels = pcmParams->nChannels;

            mSampleRate = pcmParams->nSamplingRate;

            ALOGV("will encode %ld channels at %ldHz", mNumChannels, mSampleRate);

            ALOGV("will encode %d channels at %dHz", mNumChannels, mSampleRate);



            return configureEncoder();

        }
@@ -257,8 +257,8 @@ OMX_ERRORTYPE SoftFlacEncoder::internalSetParameter( 
}



void SoftFlacEncoder::onQueueFilled(OMX_U32 portIndex) {



    ALOGV("SoftFlacEncoder::onQueueFilled(portIndex=%ld)", portIndex);

    //UNUSED_UNLESS_VERBOSE(portIndex);

    ALOGV("SoftFlacEncoder::onQueueFilled(portIndex=%d)", portIndex);



    if (mSignalledError) {

        return;
@@ -290,7 +290,7 @@ void SoftFlacEncoder::onQueueFilled(OMX_U32 portIndex) { 
        }



        if (inHeader->nFilledLen > kMaxInputBufferSize) {

            ALOGE("input buffer too large (%ld).", inHeader->nFilledLen);

            ALOGE("input buffer too large (%d).", inHeader->nFilledLen);

            mSignalledError = true;

            notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

            return;
@@ -405,7 +405,7 @@ FLAC__StreamEncoderWriteStatus SoftFlacEncoder::onEncodedFlacAvailable( 




OMX_ERRORTYPE SoftFlacEncoder::configureEncoder() {

    ALOGV("SoftFlacEncoder::configureEncoder() numChannel=%ld, sampleRate=%ld",

    ALOGV("SoftFlacEncoder::configureEncoder() numChannel=%d, sampleRate=%d",

            mNumChannels, mSampleRate);



    if (mSignalledError || (mFlacStreamEncoder == NULL)) {

media/libstagefright/codecs/g711/dec/SoftG711.cpp

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ void SoftG711::onQueueFilled(OMX_U32 portIndex) { 
        }



        if (inHeader->nFilledLen > kMaxNumSamplesPerFrame) {

            ALOGE("input buffer too large (%ld).", inHeader->nFilledLen);

            ALOGE("input buffer too large (%d).", inHeader->nFilledLen);



            notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

            mSignalledError = true;