qsvdec: move reading the user-provided session to qsv_decode_init()

[ffmpeg] / libavcodec / vp9.h

diff --git a/libavcodec/vp9.h b/libavcodec/vp9.h
index 0a6c6eed42414c7b14b483ba53ac593b091221a6..b83bd618d4a4b0fac81aa80f51a442ced2e165aa 100644 (file)
--- a/libavcodec/vp9.h
+++ b/libavcodec/vp9.h
@@ -141,7 +141,7 @@ typedef struct VP9DSPContext {
      */
     // FIXME(rbultje) maybe replace left/top pointers with HAVE_TOP/
     // HAVE_LEFT/HAVE_TOPRIGHT flags instead, and then handle it in-place?
-    // also needs to fit in with what h264/vp8/etc do
+    // also needs to fit in with what H.264/VP8/etc do
     void (*intra_pred[N_TXFM_SIZES][N_INTRA_PRED_MODES])(uint8_t *dst,
                                                          ptrdiff_t stride,
                                                          const uint8_t *left,
@@ -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;
@@ -313,6 +315,7 @@ typedef struct VP9Context {
         uint8_t temporal;
         uint8_t absolute_vals;
         uint8_t update_map;
+        #define MAX_SEGMENT 8
         struct {
             uint8_t q_enabled;
             uint8_t lf_enabled;
@@ -323,7 +326,7 @@ typedef struct VP9Context {
             int8_t lf_val;
             int16_t qmul[2][2];
             uint8_t lflvl[4][2];
-        } feat[8];
+        } feat[MAX_SEGMENT];
     } segmentation;
     struct {
         unsigned log2_tile_cols, log2_tile_rows;