commit 77a650d3407d4d2ffd698b32c8ee1d24374d080e
author Hangyu Kuang <hkuang@google.com> Wed Jan 11 11:38:59 2017 -0800
committer Hangyu Kuang <hkuang@google.com> Wed Jan 11 11:39:24 2017 -0800
tree 5f68f06b703d768666ac542d195d63a4c58ee0b8
parent 67d0d7eb36e7c36d0a9dec9264c0cab832196d57

media: Fix the camera recording error.

Revert "media: Set the correct display width/height in muxer."

Test: Manual camera recording
Bug:34213028

This reverts commit 776daeee2fd2dc5c5ec383383c401c82bd0a0fb6.

Change-Id: I54e75596baa1547ce70588d71564d3ca2b4da4ca

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index ac15687..716f5d8 100755
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -3260,8 +3260,8 @@
         mOwner->writeInt32(0);
     } else {
         int32_t width, height;
-        bool success = mMeta->findInt32(kKeyDisplayWidth, &width);
-        success = success && mMeta->findInt32(kKeyDisplayHeight, &height);
+        bool success = mMeta->findInt32(kKeyWidth, &width);
+        success = success && mMeta->findInt32(kKeyHeight, &height);
         CHECK(success);
 
         mOwner->writeInt32(width << 16);   // 32-bit fixed-point value