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

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

am 6c63fe0f: am ab70649e: Merge "MediaCodec: Pass the crop rect to SoftwareRenderer" 

* commit '6c63fe0f':
  MediaCodec: Pass the crop rect to SoftwareRenderer
parents 42d4e659 6c63fe0f

media/libstagefright/MediaCodec.cpp

+6 −0
Original line number Diff line number Diff line
@@ -746,6 +746,10 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
                            CHECK(msg->findInt32("width", &width));

                            CHECK(msg->findInt32("height", &height));



                            int32_t cropLeft, cropTop, cropRight, cropBottom;

                            CHECK(msg->findRect("crop",

                                &cropLeft, &cropTop, &cropRight, &cropBottom));



                            int32_t colorFormat;

                            CHECK(msg->findInt32(

                                        "color-format", &colorFormat));
@@ -753,6 +757,8 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
                            sp<MetaData> meta = new MetaData;

                            meta->setInt32(kKeyWidth, width);

                            meta->setInt32(kKeyHeight, height);

                            meta->setRect(kKeyCropRect,

                                cropLeft, cropTop, cropRight, cropBottom);

                            meta->setInt32(kKeyColorFormat, colorFormat);



                            mSoftRenderer =