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

Commit 1d73f2b8 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "stagefright: more exynos4 enhancements" into ics

parents 43ea350b a19e5afa

media/libstagefright/CameraSource.cpp

+5 −0
Original line number Diff line number Diff line
@@ -100,7 +100,12 @@ static int32_t getColorFormat(const char* colorFormat) { 
    }



    if (!strcmp(colorFormat, CameraParameters::PIXEL_FORMAT_YUV420SP)) {

#ifdef EXYNOS4210_ENHANCEMENTS

        static const int OMX_SEC_COLOR_FormatNV12LPhysicalAddress = 0x7F000002;

        return OMX_SEC_COLOR_FormatNV12LPhysicalAddress;

#else

        return OMX_COLOR_FormatYUV420SemiPlanar;

#endif

    }



    if (!strcmp(colorFormat, CameraParameters::PIXEL_FORMAT_YUV422I)) {

media/libstagefright/OMXCodec.cpp

+4 −9
Original line number Diff line number Diff line
@@ -1852,10 +1852,7 @@ status_t OMXCodec::setVideoOutputFormat( 
#endif

               );

#ifdef SAMSUNG_CODEC_SUPPORT

        if (!strcmp("OMX.SEC.FP.AVC.Decoder", mComponentName) ||

            !strcmp("OMX.SEC.AVC.Decoder", mComponentName) ||

            !strcmp("OMX.SEC.MPEG4.Decoder", mComponentName) ||

            !strcmp("OMX.SEC.H263.Decoder", mComponentName)) {

        if (!strncmp("OMX.SEC.", mComponentName, 8)) {

            if (mNativeWindow == NULL)

                format.eColorFormat = OMX_COLOR_FormatYUV420Planar;

            else
@@ -1884,12 +1881,10 @@ status_t OMXCodec::setVideoOutputFormat( 


    CHECK_EQ(err, (status_t)OK);



#if 1

    // XXX Need a (much) better heuristic to compute input buffer sizes.

#ifdef EXYNOS4210_ENHANCEMENTS

    const size_t X = 64 * 8 * 1024;  // const size_t X = 64 * 1024;

#else

    const size_t X = 64 * 1024;

    if (def.nBufferSize < X) {

        def.nBufferSize = X;

    }

#endif



    CHECK_EQ((int)def.eDomain, (int)OMX_PortDomainVideo);