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

Commit 04476645 authored by Ram Mohan's avatar Ram Mohan Committed by android-build-merger
Browse files

Merge "configure port format" into oc-dev 

am: 5159e13a

Change-Id: I6e89b82b744c443ca4419fc2b8f5e1454f1ff6bb
parents c1c9b132 5159e13a

media/libstagefright/codecs/aacenc/SoftAACEncoder.cpp

+0 −4
Original line number Diff line number Diff line
@@ -266,10 +266,6 @@ OMX_ERRORTYPE SoftAACEncoder::internalSetParameter( 
                return OMX_ErrorUndefined;

            }



            if (formatParams->nIndex > 0) {

                return OMX_ErrorNoMore;

            }



            if ((formatParams->nPortIndex == 0

                        && formatParams->eEncoding != OMX_AUDIO_CodingPCM)

                || (formatParams->nPortIndex == 1

media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp

+0 −4
Original line number Diff line number Diff line
@@ -305,10 +305,6 @@ OMX_ERRORTYPE SoftAACEncoder2::internalSetParameter( 
                return OMX_ErrorUndefined;

            }



            if (formatParams->nIndex > 0) {

                return OMX_ErrorNoMore;

            }



            if ((formatParams->nPortIndex == 0

                        && formatParams->eEncoding != OMX_AUDIO_CodingPCM)

                || (formatParams->nPortIndex == 1

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

+0 −4
Original line number Diff line number Diff line
@@ -226,10 +226,6 @@ OMX_ERRORTYPE SoftAMRNBEncoder::internalSetParameter( 
                return OMX_ErrorUndefined;

            }



            if (formatParams->nIndex > 0) {

                return OMX_ErrorNoMore;

            }



            if ((formatParams->nPortIndex == 0

                        && formatParams->eEncoding != OMX_AUDIO_CodingPCM)

                || (formatParams->nPortIndex == 1

media/libstagefright/codecs/amrwbenc/SoftAMRWBEncoder.cpp

+0 −4
Original line number Diff line number Diff line
@@ -264,10 +264,6 @@ OMX_ERRORTYPE SoftAMRWBEncoder::internalSetParameter( 
                return OMX_ErrorUndefined;

            }



            if (formatParams->nIndex > 0) {

                return OMX_ErrorNoMore;

            }



            if ((formatParams->nPortIndex == 0

                        && formatParams->eEncoding != OMX_AUDIO_CodingPCM)

                || (formatParams->nPortIndex == 1

media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp

+0 −4
Original line number Diff line number Diff line
@@ -430,10 +430,6 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::internalSetParameter( 
                return OMX_ErrorBadPortIndex;

            }



            if (formatParams->nIndex != 0) {

                return OMX_ErrorNoMore;

            }



            if (formatParams->nPortIndex == kInputPortIndex) {

                if (formatParams->eCompressionFormat != mCodingType

                        || formatParams->eColorFormat != OMX_COLOR_FormatUnused) {