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

Commit 5f136027 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am faefd08b: Revert "DO NOT MERGE: stagefright: add support for Intel\'s... 

am faefd08b: Revert "DO NOT MERGE: stagefright: add support for Intel\'s YUV420SP format in SoftwareRenderer"

* commit 'faefd08b':
  Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer"
parents 4fc5d758 faefd08b

media/libstagefright/colorconversion/SoftwareRenderer.cpp

+1 −3
Original line number Diff line number Diff line
@@ -101,10 +101,9 @@ void SoftwareRenderer::resetFormatIfChanged(const sp<AMessage> &format) { 
    int halFormat;

    size_t bufWidth, bufHeight;



    switch ((int)mColorFormat) {

    switch (mColorFormat) {

        case OMX_COLOR_FormatYUV420Planar:

        case OMX_TI_COLOR_FormatYUV420PackedSemiPlanar:

        case OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar:

        case OMX_COLOR_FormatYUV420SemiPlanar:

        {

            if (!runningInEmulator()) {
@@ -239,7 +238,6 @@ void SoftwareRenderer::render( 
            dst_v += dst_c_stride;

        }

    } else if (mColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar

            || mColorFormat == OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar

            || mColorFormat == OMX_COLOR_FormatYUV420SemiPlanar) {

        const uint8_t *src_y =

            (const uint8_t *)data;