Enable VP9 in MP4 by default

media/formats/mp4/box_definitions.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/box_definitions.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 786 matching lines @@
           make_scoped_refptr(new HEVCBitstreamConverter(std::move(hevcConfig)));
       DVLOG(2) << __func__ << " reading DolbyVisionConfiguration (dvcC)";
       DolbyVisionConfiguration dvccConfig;
       RCHECK(reader->ReadChild(&dvccConfig));
       video_codec = kCodecDolbyVision;
       video_codec_profile = dvccConfig.codec_profile;
       break;
     }
 #endif  // BUILDFLAG(ENABLE_HEVC_DEMUXING)
 #endif  // BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
-    case FOURCC_VP09:
-      if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kEnableVp9InMp4)) {
-        DVLOG(2) << __func__ << " parsing VPCodecConfigurationRecord (vpcC)";
-        std::unique_ptr<VPCodecConfigurationRecord> vp_config(
-            new VPCodecConfigurationRecord());
-        RCHECK(reader->ReadChild(vp_config.get()));
-        frame_bitstream_converter = nullptr;
-        video_codec = kCodecVP9;
-        video_codec_profile = vp_config->profile;
-      } else {
-        MEDIA_LOG(ERROR, reader->media_log()) << "VP9 in MP4 is not enabled.";
-        return false;
-      }
+    case FOURCC_VP09: {
+      DVLOG(2) << __func__ << " parsing VPCodecConfigurationRecord (vpcC)";
+      std::unique_ptr<VPCodecConfigurationRecord> vp_config(
+          new VPCodecConfigurationRecord());
+      RCHECK(reader->ReadChild(vp_config.get()));
+      frame_bitstream_converter = nullptr;
+      video_codec = kCodecVP9;
+      video_codec_profile = vp_config->profile;
       break;
+    }
     default:
       // Unknown/unsupported format
       MEDIA_LOG(ERROR, reader->media_log()) << __func__
                                             << " unsupported video format "
                                             << FourCCToString(actual_format);
       return false;
   }
 
   return true;
 }
 
 bool VideoSampleEntry::IsFormatValid() const {
   const FourCC actual_format =
       format == FOURCC_ENCV ? sinf.format.format : format;
   switch (actual_format) {
     case FOURCC_AVC1:
     case FOURCC_AVC3:
 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
     case FOURCC_HEV1:
     case FOURCC_HVC1:
 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
     case FOURCC_DVH1:
     case FOURCC_DVHE:
 #endif  // BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
 #endif  // BUILDFLAG(ENABLE_HEVC_DEMUXING)
 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
     case FOURCC_DVA1:
     case FOURCC_DVAV:
 #endif  // BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
+    case FOURCC_VP09:
       return true;
-    case FOURCC_VP09:
-      return base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableVp9InMp4);
     default:
       return false;
   }
 }
 
 ElementaryStreamDescriptor::ElementaryStreamDescriptor()
     : object_type(kForbidden) {}
 
 ElementaryStreamDescriptor::ElementaryStreamDescriptor(
     const ElementaryStreamDescriptor& other) = default;
@@ skipping 597 matching lines @@
 SampleDependsOn IndependentAndDisposableSamples::sample_depends_on(
     size_t i) const {
   if (i >= sample_depends_on_.size())
     return kSampleDependsOnUnknown;
 
   return sample_depends_on_[i];
 }
 
 }  // namespace mp4
 }  // namespace media