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

Commit b41c9a03 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am a5761dcb: Fix a number of warnings in stagefright code. 

* commit 'a5761dcb':
  Fix a number of warnings in stagefright code.
parents fb9442ee a5761dcb

media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ void SoftAACEncoder2::onQueueFilled(OMX_U32 portIndex) { 


        void* inBuffer[]        = { (unsigned char *)mInputFrame };

        INT   inBufferIds[]     = { IN_AUDIO_DATA };

        INT   inBufferSize[]    = { numBytesPerInputFrame };

        INT   inBufferSize[]    = { (INT)numBytesPerInputFrame };

        INT   inBufferElSize[]  = { sizeof(int16_t) };



        AACENC_BufDesc inBufDesc;

media/libstagefright/codecs/amrnb/enc/SoftAMRNBEncoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ OMX_ERRORTYPE SoftAMRNBEncoder::internalSetParameter( 
            }



            if (pcmParams->nChannels != 1

                    || pcmParams->nSamplingRate != kSampleRate) {

                    || pcmParams->nSamplingRate != (OMX_U32)kSampleRate) {

                return OMX_ErrorUndefined;

            }

media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp

+2 −1
Original line number Diff line number Diff line
@@ -655,7 +655,8 @@ void SoftVPXEncoder::onQueueFilled(OMX_U32 portIndex) { 
        vpx_codec_iter_t encoded_packet_iterator = NULL;

        const vpx_codec_cx_pkt_t* encoded_packet;



        while (encoded_packet = vpx_codec_get_cx_data(mCodecContext, &encoded_packet_iterator)) {

        while ((encoded_packet = vpx_codec_get_cx_data(

                        mCodecContext, &encoded_packet_iterator))) {

            if (encoded_packet->kind == VPX_CODEC_CX_FRAME_PKT) {

                outputBufferHeader->nTimeStamp = encoded_packet->data.frame.pts;

                outputBufferHeader->nFlags = 0;