X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcbs_vp9.h;h=4c9b2f880d32ed33827b00d15ee87a9871b0d0d4;hb=c2631dfd0a0a12050cc1765fd41702c5e93abee5;hp=5b99c90c2e68ebd5896e354db6b54d42c3fd5d35;hpb=73d193d1d0ff62a029a905d1404c0fd357f4c880;p=ffmpeg diff --git a/libavcodec/cbs_vp9.h b/libavcodec/cbs_vp9.h index 5b99c90c2e6..4c9b2f880d3 100644 --- a/libavcodec/cbs_vp9.h +++ b/libavcodec/cbs_vp9.h @@ -84,7 +84,6 @@ typedef struct VP9RawFrameHeader { uint8_t frame_marker; uint8_t profile_low_bit; uint8_t profile_high_bit; - uint8_t profile_reserved_zero; uint8_t show_existing_frame; uint8_t frame_to_show_map_idx; @@ -99,7 +98,6 @@ typedef struct VP9RawFrameHeader { uint8_t color_range; uint8_t subsampling_x; uint8_t subsampling_y; - uint8_t color_config_reserved_zero; uint8_t refresh_frame_flags; @@ -183,8 +181,17 @@ typedef struct VP9RawSuperframe { VP9RawSuperframeIndex index; } VP9RawSuperframe; +typedef struct VP9ReferenceFrameState { + int frame_width; // RefFrameWidth + int frame_height; // RefFrameHeight + int subsampling_x; // RefSubsamplingX + int subsampling_y; // RefSubsamplingY + int bit_depth; // RefBitDepth +} VP9ReferenceFrameState; typedef struct CodedBitstreamVP9Context { + int profile; + // Frame dimensions in 8x8 mode info blocks. uint16_t mi_cols; uint16_t mi_rows; @@ -192,6 +199,15 @@ typedef struct CodedBitstreamVP9Context { uint16_t sb64_cols; uint16_t sb64_rows; + int frame_width; + int frame_height; + + uint8_t subsampling_x; + uint8_t subsampling_y; + int bit_depth; + + VP9ReferenceFrameState ref[VP9_NUM_REF_FRAMES]; + // Write buffer. uint8_t *write_buffer; size_t write_buffer_size;