WebM support for new multipart VP9 string.

media/filters/stream_parser_factory.cc

 // Copyright (c) 2013 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/filters/stream_parser_factory.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 63 matching lines @@
     const scoped_refptr<MediaLog>& media_log);
 
 struct SupportedTypeInfo {
   const char* type;
   const ParserFactoryFunction factory_function;
   const CodecInfo** codecs;
 };
 
 static const CodecInfo kVP8CodecInfo = { "vp8", CodecInfo::VIDEO, NULL,
                                          CodecInfo::HISTOGRAM_VP8 };
-static const CodecInfo kVP9CodecInfo = { "vp9", CodecInfo::VIDEO, NULL,
-                                         CodecInfo::HISTOGRAM_VP9 };
+static const CodecInfo kLegacyVP9CodecInfo = {"vp9", CodecInfo::VIDEO, NULL,
+                                              CodecInfo::HISTOGRAM_VP9};
+static const CodecInfo kVP9CodecInfo = {"vp09.*", CodecInfo::VIDEO, NULL,
+                                        CodecInfo::HISTOGRAM_VP9};
 static const CodecInfo kVorbisCodecInfo = { "vorbis", CodecInfo::AUDIO, NULL,
                                             CodecInfo::HISTOGRAM_VORBIS };
 static const CodecInfo kOpusCodecInfo = { "opus", CodecInfo::AUDIO, NULL,
                                           CodecInfo::HISTOGRAM_OPUS };
 
 static const CodecInfo* kVideoWebMCodecs[] = {
-  &kVP8CodecInfo,
-  &kVP9CodecInfo,
-  &kVorbisCodecInfo,
-  &kOpusCodecInfo,
-  NULL
-};
+    &kVP8CodecInfo,    &kLegacyVP9CodecInfo, &kVP9CodecInfo,
+    &kVorbisCodecInfo, &kOpusCodecInfo,      NULL};
 
 static const CodecInfo* kAudioWebMCodecs[] = {
   &kVorbisCodecInfo,
   &kOpusCodecInfo,
   NULL
 };
 
 static StreamParser* BuildWebMParser(const std::vector<std::string>& codecs,
                                      const scoped_refptr<MediaLog>& media_log) {
   return new WebMStreamParser();
@@ skipping 356 matching lines @@
                                 CodecInfo::HISTOGRAM_MAX + 1);
     }
 
     stream_parser.reset(factory_function(codecs, media_log));
   }
 
   return stream_parser;
 }
 
 }  // namespace media