vp9: Parse subsampling and report missing feature

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 50b84ae97e6a85482e68f747df38606e0d038d5e..b9397f58c5449cd55f05aa61e6a64c6def9e2357 100644 (file)
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -219,7 +219,29 @@ static int decode_frame_header(AVCodecContext *avctx,
             return AVERROR_INVALIDDATA;
         }
         s->fullrange = get_bits1(&s->gb);
-        // for profile 1, here follows the subsampling bits
+
+        // subsampling bits
+        if (s->profile == 1 || s->profile == 3) {
+            s->sub_x = get_bits1(&s->gb);
+            s->sub_y = get_bits1(&s->gb);
+            if (s->sub_x && s->sub_y) {
+                av_log(avctx, AV_LOG_ERROR,
+                       "4:2:0 color not supported in profile 1 or 3\n");
+                return AVERROR_INVALIDDATA;
+            }
+            if (get_bits1(&s->gb)) { // reserved bit
+                av_log(avctx, AV_LOG_ERROR, "Reserved bit should be zero\n");
+                return AVERROR_INVALIDDATA;
+            }
+        } else {
+            s->sub_x = s->sub_y = 1;
+        }
+        if (!s->sub_x || !s->sub_y) {
+            avpriv_report_missing_feature(avctx, "Subsampling %d:%d",
+                                          s->sub_x, s->sub_y);
+            return AVERROR_PATCHWELCOME;
+        }
+
         s->refreshrefmask = 0xff;
         w = get_bits(&s->gb, 16) + 1;
         h = get_bits(&s->gb, 16) + 1;

diff --git a/libavcodec/vp9.h b/libavcodec/vp9.h
index 724288dd3db07127829c6cd50c8f6ef3961cbcbb..c6f395e93aa1b0aa03bf9047f51a90c0a58cad7e 100644 (file)
--- a/libavcodec/vp9.h
+++ b/libavcodec/vp9.h
@@ -277,6 +277,8 @@ typedef struct VP9Context {
     uint8_t use_last_frame_mvs;
     uint8_t errorres;
     uint8_t colorspace;
+    uint8_t sub_x;
+    uint8_t sub_y;
     uint8_t fullrange;
     uint8_t intraonly;
     uint8_t resetctx;