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

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

am 201511cf: Calculate proper output buffer size for some more 16-bit RGB color spaces. 

Merge commit '201511cf8a004d386ec9f592041ad3e3d4107184' into eclair-plus-aosp

* commit '201511cf8a004d386ec9f592041ad3e3d4107184':
  Calculate proper output buffer size for some more 16-bit RGB color spaces.
parents c32e8762 195ea1e0

media/libstagefright/OMXCodec.cpp

+9 −0
Original line number Diff line number Diff line
@@ -1659,6 +1659,15 @@ void OMXCodec::setImageOutputFormat( 
            break;

        }



        case OMX_COLOR_Format16bitARGB4444:

        case OMX_COLOR_Format16bitARGB1555:

        case OMX_COLOR_Format16bitRGB565:

        case OMX_COLOR_Format16bitBGR565:

        {

            def.nBufferSize = width * height * 2;

            break;

        }



        default:

            CHECK(!"Should not be here. Unknown color format.");

            break;