commit 08b43fef3a72c3b1790d66b2410b7fa71677c1a4
author John Koleszar <jkoleszar@google.com> Tue Nov 13 12:14:28 2012 -0800
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Thu Nov 15 15:07:27 2012 -0800
tree f811b08f38d1ca29805aaed9d88ab5b9637191e4
parent a3384f00a32fdc33b8d96d43a29d9720f0641d34

webm: add support for V_VP9

Tags VP9 tracks with the V_VP9 video type when writing to .webm files,
and supports decoding both from vpxdec without specifying --codec.

Change-Id: I0ef61dee06f4db2a74032b142a4b4976c51faf6e

vpxdec.c

diff --git a/vpxdec.c b/vpxdec.c
index aa3f342..f7281a4 100644
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -537,6 +537,7 @@
              unsigned int     *fps_num) {
   unsigned int i, n;
   int          track_type = -1;
+  int          codec_id;
 
   nestegg_io io = {nestegg_read_cb, nestegg_seek_cb, nestegg_tell_cb, 0};
   nestegg_video_params params;
@@ -557,8 +558,13 @@
       goto fail;
   }
 
-  if (nestegg_track_codec_id(input->nestegg_ctx, i) != NESTEGG_CODEC_VP8) {
-    fprintf(stderr, "Not VP8 video, quitting.\n");
+  codec_id = nestegg_track_codec_id(input->nestegg_ctx, i);
+  if (codec_id == NESTEGG_CODEC_VP8) {
+    *fourcc = VP8_FOURCC;
+  } else if (codec_id == NESTEGG_CODEC_VP9) {
+    *fourcc = VP9_FOURCC;
+  } else {
+    fprintf(stderr, "Not VPx video, quitting.\n");
     exit(1);
   }
 
@@ -569,7 +575,6 @@
 
   *fps_den = 0;
   *fps_num = 0;
-  *fourcc = VP8_FOURCC;
   *width = params.width;
   *height = params.height;
   return 1;