RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/cbs_vp9: store profile in the private context

Browse Source 
Derived from profile_low_bit and profile_high_bit.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-10-30 15:41:21 -03:00
parent ec440339b2
commit 7aaf092f8c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/cbs_vp9.h
View File

@ -190,6 +190,8 @@ typedef struct VP9ReferenceFrameState {
} VP9ReferenceFrameState; } VP9ReferenceFrameState;
typedef struct CodedBitstreamVP9Context { typedef struct CodedBitstreamVP9Context {
int profile;
// Frame dimensions in 8x8 mode info blocks. // Frame dimensions in 8x8 mode info blocks.
uint16_t mi_cols; uint16_t mi_cols;
uint16_t mi_rows; uint16_t mi_rows;

13
libavcodec/cbs_vp9_syntax_template.c
View File

@ -278,15 +278,14 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw,
VP9RawFrameHeader *current) VP9RawFrameHeader *current)
{ {
CodedBitstreamVP9Context *vp9 = ctx->priv_data; CodedBitstreamVP9Context *vp9 = ctx->priv_data;
int profile, i; int err, i;
int err;
f(2, frame_marker); f(2, frame_marker);
f(1, profile_low_bit); f(1, profile_low_bit);
f(1, profile_high_bit); f(1, profile_high_bit);
profile = (current->profile_high_bit << 1) + current->profile_low_bit; vp9->profile = (current->profile_high_bit << 1) + current->profile_low_bit;
if (profile == 3) if (vp9->profile == 3)
fixed(1, reserved_zero, 0); fixed(1, reserved_zero, 0);
f(1, show_existing_frame); f(1, show_existing_frame);
@ -304,7 +303,7 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw,
if (current->frame_type == VP9_KEY_FRAME) { if (current->frame_type == VP9_KEY_FRAME) {
CHECK(FUNC(frame_sync_code)(ctx, rw, current)); CHECK(FUNC(frame_sync_code)(ctx, rw, current));
CHECK(FUNC(color_config)(ctx, rw, current, profile)); CHECK(FUNC(color_config)(ctx, rw, current, vp9->profile));
CHECK(FUNC(frame_size)(ctx, rw, current)); CHECK(FUNC(frame_size)(ctx, rw, current));
CHECK(FUNC(render_size)(ctx, rw, current)); CHECK(FUNC(render_size)(ctx, rw, current));
@ -324,8 +323,8 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw,
if (current->intra_only == 1) { if (current->intra_only == 1) {
CHECK(FUNC(frame_sync_code)(ctx, rw, current)); CHECK(FUNC(frame_sync_code)(ctx, rw, current));
if (profile > 0) { if (vp9->profile > 0) {
CHECK(FUNC(color_config)(ctx, rw, current, profile)); CHECK(FUNC(color_config)(ctx, rw, current, vp9->profile));
} else { } else {
infer(color_space, 1); infer(color_space, 1);
infer(subsampling_x, 1); infer(subsampling_x, 1);