From cccadd245cbf9efed32e4fe5dad86110af28af43 Mon Sep 17 00:00:00 2001
From: Dmitry Kovalev <dkovalev@google.com>
Date: Wed, 15 Jan 2014 14:01:38 -0800
Subject: [PATCH] Removing VP8_FOURCC_MASK & VP9_FOURCC_MASK.

There is no reason to have fourcc masks, everything just works without
them.

Change-Id: I1d48100e7b7d5ef55ec49a708ba6adcb9ab4ecd8
---
 tools_common.h | 6 ++----
 vpxdec.c       | 7 +++----
 webmdec.c      | 4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/tools_common.h b/tools_common.h
index 7500523e8..1d70ab5e8 100644
--- a/tools_common.h
+++ b/tools_common.h
@@ -63,10 +63,8 @@ typedef long off_t;  /* NOLINT */
 
 #define RAW_FRAME_HDR_SZ sizeof(uint32_t)
 
-#define VP8_FOURCC (0x30385056)
-#define VP9_FOURCC (0x30395056)
-#define VP8_FOURCC_MASK (0x00385056)
-#define VP9_FOURCC_MASK (0x00395056)
+#define VP8_FOURCC 0x30385056
+#define VP9_FOURCC 0x30395056
 
 enum VideoFileType {
   FILE_TYPE_RAW,
diff --git a/vpxdec.c b/vpxdec.c
index e6384fe0f..420497914 100644
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -40,13 +40,12 @@ static const struct {
   char const *name;
   const vpx_codec_iface_t *(*iface)(void);
   uint32_t fourcc;
-  uint32_t fourcc_mask;
 } ifaces[] = {
 #if CONFIG_VP8_DECODER
-  {"vp8",  vpx_codec_vp8_dx,   VP8_FOURCC_MASK, 0x00FFFFFF},
+  {"vp8",  vpx_codec_vp8_dx,   VP8_FOURCC},
 #endif
 #if CONFIG_VP9_DECODER
-  {"vp9",  vpx_codec_vp9_dx,   VP9_FOURCC_MASK, 0x00FFFFFF},
+  {"vp9",  vpx_codec_vp9_dx,   VP9_FOURCC},
 #endif
 };
 
@@ -670,7 +669,7 @@ int main_loop(int argc, const char **argv_) {
 
   /* Try to determine the codec from the fourcc. */
   for (i = 0; i < sizeof(ifaces) / sizeof(ifaces[0]); i++)
-    if ((vpx_input_ctx.fourcc & ifaces[i].fourcc_mask) == ifaces[i].fourcc) {
+    if (vpx_input_ctx.fourcc == ifaces[i].fourcc) {
       vpx_codec_iface_t *vpx_iface = ifaces[i].iface();
 
       if (iface && iface != vpx_iface)
diff --git a/webmdec.c b/webmdec.c
index 0c75d7a2c..fdcf3a572 100644
--- a/webmdec.c
+++ b/webmdec.c
@@ -82,9 +82,9 @@ int file_is_webm(struct WebmInputContext *webm_ctx,
 
   codec_id = nestegg_track_codec_id(webm_ctx->nestegg_ctx, i);
   if (codec_id == NESTEGG_CODEC_VP8) {
-    vpx_ctx->fourcc = VP8_FOURCC_MASK;
+    vpx_ctx->fourcc = VP8_FOURCC;
   } else if (codec_id == NESTEGG_CODEC_VP9) {
-    vpx_ctx->fourcc = VP9_FOURCC_MASK;
+    vpx_ctx->fourcc = VP9_FOURCC;
   } else {
     fatal("Not VPx video, quitting.\n");
   }
-- 
2.40.0