commit 1e2a0e6adc3d70879b00e5295c54a74209b71e1b
author Robert Shih <robertshih@google.com> Fri Apr 24 16:56:53 2015 -0700
committer Robert Shih <robertshih@google.com> Tue Apr 28 17:24:20 2015 -0700
tree 39d76943dc23724b6e2ff7b6118ebede5b77534e
parent f105b28e94c50802cab61ec4cdf4986e9dd3c097

MatroskaExtractor: skip track when codec id is NULL in addTracks

This is a more thorough version of commit
ea9ac8bf7f6a7ae1424c6cade64b004caa7c3681
in that it applies to both video and audio.

Bug: 17702053
Bug: 18872598
Change-Id: Idcea77bb7133ea0d02da8c484b4a0791db42740e

media/libstagefright/matroska/MatroskaExtractor.cpp

diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp
index ddca437..70d2c69 100644
--- a/media/libstagefright/matroska/MatroskaExtractor.cpp
+++ b/media/libstagefright/matroska/MatroskaExtractor.cpp
@@ -925,6 +925,11 @@
         ALOGV("codec id = %s", codecID);
         ALOGV("codec name = %s", track->GetCodecNameAsUTF8());
 
+        if (codecID == NULL) {
+            ALOGW("unknown codecID is not supported.");
+            continue;
+        }
+
         size_t codecPrivateSize;
         const unsigned char *codecPrivate =
             track->GetCodecPrivate(codecPrivateSize);
@@ -941,10 +946,7 @@
                 const mkvparser::VideoTrack *vtrack =
                     static_cast<const mkvparser::VideoTrack *>(track);
 
-                if (codecID == NULL) {
-                    ALOGW("unknown codecID is not supported.");
-                    continue;
-                } else if (!strcmp("V_MPEG4/ISO/AVC", codecID)) {
+                if (!strcmp("V_MPEG4/ISO/AVC", codecID)) {
                     meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_AVC);
                     meta->setData(kKeyAVCC, 0, codecPrivate, codecPrivateSize);
                 } else if (!strcmp("V_MPEG4/ISO/ASP", codecID)) {