Reland of Implement support for vp9 in ISO-BMFF

media/formats/mp4/mp4_stream_parser.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/formats/mp4/mp4_stream_parser.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <memory>
@@ skipping 531 matching lines @@
     decrypt_config = runs_->GetDecryptConfig();
     if (!decrypt_config) {
       *err = true;
       return false;
     }
     subsamples = decrypt_config->subsamples();
   }
 
   std::vector<uint8_t> frame_buf(buf, buf + runs_->sample_size());
   if (video) {
-    DCHECK(runs_->video_description().frame_bitstream_converter);
-    if (!runs_->video_description().frame_bitstream_converter->ConvertFrame(
-        &frame_buf, runs_->is_keyframe(), &subsamples)) {
-      MEDIA_LOG(ERROR, media_log_)
-          << "Failed to prepare video sample for decode";
-      *err = true;
-      return false;
+    if (runs_->video_description().video_codec == kCodecH264 ||
+        runs_->video_description().video_codec == kCodecHEVC) {
+      DCHECK(runs_->video_description().frame_bitstream_converter);
+      if (!runs_->video_description().frame_bitstream_converter->ConvertFrame(
+              &frame_buf, runs_->is_keyframe(), &subsamples)) {
+        MEDIA_LOG(ERROR, media_log_)
+            << "Failed to prepare video sample for decode";
+        *err = true;
+        return false;
+      }
     }
   }
 
   if (audio) {
     if (ESDescriptor::IsAAC(runs_->audio_description().esds.object_type) &&
         !PrepareAACBuffer(runs_->audio_description().esds.aac,
                           &frame_buf, &subsamples)) {
       MEDIA_LOG(ERROR, media_log_) << "Failed to prepare AAC sample for decode";
       *err = true;
       return false;
@@ skipping 126 matching lines @@
       runs.AdvanceSample();
     }
     runs.AdvanceRun();
   }
 
   return true;
 }
 
 }  // namespace mp4
 }  // namespace media