commit ba248a45ff2541faddbff8192545abb098cf6ccc
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 13 00:29:28 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 13 00:29:28 2017 +0000
tree d2450fdd8dafc5532f00f3e4aa1bbbf6ef84287f
parent 621faa7cb967a6bfa396ef59dac3d1d18eabadb4
parent c71189ed86d59aebca802e2490117b42be8e8472

Merge "media_codecs: limit platform AVC decoder to 4080x4080 resolution" into oc-mr1-dev

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 3cdb49e..99398ec 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -1576,6 +1576,19 @@
                     }
                     setState(CONFIGURED);
                     (new AMessage)->postReply(mReplyID);
+
+                    // augment our media metrics info, now that we know more things
+                    if (mAnalyticsItem != NULL) {
+                        sp<AMessage> format;
+                        if (mConfigureMsg != NULL &&
+                            mConfigureMsg->findMessage("format", &format)) {
+                                // format includes: mime
+                                AString mime;
+                                if (format->findString("mime", &mime)) {
+                                    mAnalyticsItem->setCString(kCodecMime, mime.c_str());
+                                }
+                            }
+                    }
                     break;
                 }