commit ab70649e2b0ea3d917242814417ec5711f4cb811
author Lajos Molnar <lajos@google.com> Wed Sep 25 17:12:12 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 25 17:12:13 2013 +0000
tree 2a9643062c78edbd048a5e6fb59b0d80f83ca322
parent e56f3c96fa6e7550b67e8b049f999aaa2ada1192
parent 6539f82d55d4457bc84ed23d57967346022c56dc

Merge "MediaCodec: Pass the crop rect to SoftwareRenderer"

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index f412dc8..674e6e5 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -729,6 +729,10 @@
                             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));
@@ -736,6 +740,8 @@
                             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 =