commit 31ee4ea716ad3aaeee534123584aabdff42d0b62
author Peng Bin <binpengsmail@gmail.com> Tue Aug 28 17:11:31 2018 +0800
committer Bin Peng <binpengsmail@gmail.com> Wed Aug 29 01:57:50 2018 +0000
tree 19fa36c3276fe8d711e34eb04fdd7bf2136ea397
parent 5d96b94cfa32f811c90cf0e42eae39e6d705c8ac

Add webm support in video_reader.c

Add webm support in video_reader.c, so that tools
such as inspect.c can parse webm files too.

Change-Id: I52766053c86e4e95acf350908766705576c488b1

common/video_reader.c

diff --git a/common/video_reader.c b/common/video_reader.c
index b54c250..47ad6e1 100644
--- a/common/video_reader.c
+++ b/common/video_reader.c
@@ -17,11 +17,13 @@
 #include "common/obudec.h"
 #include "common/tools_common.h"
 #include "common/video_reader.h"
+#include "common/webmdec.h"
 
 struct AvxVideoReaderStruct {
   AvxVideoInfo info;
   struct AvxInputContext input_ctx;
   struct ObuDecInputContext obu_ctx;
+  struct WebmInputContext webm_ctx;
   uint8_t *buffer;
   size_t buffer_size;
   size_t frame_size;
@@ -49,6 +51,13 @@
     reader->info.codec_fourcc = reader->input_ctx.fourcc;
     reader->info.frame_width = reader->input_ctx.width;
     reader->info.frame_height = reader->input_ctx.height;
+#if CONFIG_WEBM_IO
+  } else if (file_is_webm(&reader->webm_ctx, &reader->input_ctx)) {
+    reader->input_ctx.file_type = FILE_TYPE_WEBM;
+    reader->info.codec_fourcc = reader->input_ctx.fourcc;
+    reader->info.frame_width = reader->input_ctx.width;
+    reader->info.frame_height = reader->input_ctx.height;
+#endif
   } else if (file_is_obu(&reader->obu_ctx)) {
     reader->input_ctx.file_type = FILE_TYPE_OBU;
     // assume AV1
@@ -83,6 +92,11 @@
     return !obudec_read_temporal_unit(&reader->obu_ctx, &reader->buffer,
                                       &reader->frame_size,
                                       &reader->buffer_size);
+#if CONFIG_WEBM_IO
+  } else if (reader->input_ctx.file_type == FILE_TYPE_WEBM) {
+    return !webm_read_frame(&reader->webm_ctx, &reader->buffer,
+                            &reader->frame_size, &reader->buffer_size);
+#endif
   } else {
     assert(0);
     return 0;