History

Fix show_index in vp9_extrc_encodeframe_decision()

Angie Chiang committed 5 years ago

Commit 3a38ede1 parent 67b1d7f2 files · +6 −1Browse files

Unified · Split

2 files
  1. test/vp9_ext_ratectrl_test.cc +3 −0
  2. vp9/encoder/vp9_encoder.c +3 −1
test/vp9_ext_ratectrl_test.cc+3−0
@@ -73,6 +73,7 @@ vpx_rc_status_t rc_get_encodeframe_decision( · 72 unmodified lines
73 EXPECT_EQ(encode_frame_info->coding_index, toy_rate_ctrl->coding_index);73 EXPECT_EQ(encode_frame_info->coding_index, toy_rate_ctrl->coding_index);
74 74
75 if (encode_frame_info->coding_index == 0) {75 if (encode_frame_info->coding_index == 0) {
76 EXPECT_EQ(encode_frame_info->show_index, 0);
76 EXPECT_EQ(encode_frame_info->gop_index, 0);77 EXPECT_EQ(encode_frame_info->gop_index, 0);
77 EXPECT_EQ(encode_frame_info->frame_type, 0 /*kFrameTypeKey*/);78 EXPECT_EQ(encode_frame_info->frame_type, 0 /*kFrameTypeKey*/);
78 EXPECT_EQ(encode_frame_info->ref_frame_valid_list[0],79 EXPECT_EQ(encode_frame_info->ref_frame_valid_list[0],
@@ -84,6 +85,7 @@ vpx_rc_status_t rc_get_encodeframe_decision( · 5 unmodified lines
84 }85 }
85 86
86 if (encode_frame_info->coding_index == 1) {87 if (encode_frame_info->coding_index == 1) {
88 EXPECT_EQ(encode_frame_info->show_index, 4);
87 EXPECT_EQ(encode_frame_info->gop_index, 1);89 EXPECT_EQ(encode_frame_info->gop_index, 1);
88 EXPECT_EQ(encode_frame_info->frame_type, 2 /*kFrameTypeAltRef*/);90 EXPECT_EQ(encode_frame_info->frame_type, 2 /*kFrameTypeAltRef*/);
89 EXPECT_EQ(encode_frame_info->ref_frame_valid_list[0],91 EXPECT_EQ(encode_frame_info->ref_frame_valid_list[0],
@@ -104,6 +106,7 @@ vpx_rc_status_t rc_get_encodeframe_decision( · 14 unmodified lines
104 }106 }
105 107
106 if (encode_frame_info->coding_index == 5) {108 if (encode_frame_info->coding_index == 5) {
109 EXPECT_EQ(encode_frame_info->show_index, 4);
107 EXPECT_EQ(encode_frame_info->gop_index, 0);110 EXPECT_EQ(encode_frame_info->gop_index, 0);
108 EXPECT_EQ(encode_frame_info->frame_type, 3 /*kFrameTypeOverlay*/);111 EXPECT_EQ(encode_frame_info->frame_type, 3 /*kFrameTypeOverlay*/);
109 EXPECT_EQ(encode_frame_info->ref_frame_valid_list[0],112 EXPECT_EQ(encode_frame_info->ref_frame_valid_list[0],
vp9/encoder/vp9_encoder.c+3−1
@@ -4508,9 +4508,11 @@ static void encode_with_recode_loop(VP9_COMP *cpi, size_t *size, uint8_t *dest · 4507 unmodified lines
4508 FRAME_UPDATE_TYPE update_type = gf_group->update_type[gf_group->index];4508 FRAME_UPDATE_TYPE update_type = gf_group->update_type[gf_group->index];
4509 const int ref_frame_flags = get_ref_frame_flags(cpi);4509 const int ref_frame_flags = get_ref_frame_flags(cpi);
4510 RefCntBuffer *ref_frame_bufs[MAX_INTER_REF_FRAMES];4510 RefCntBuffer *ref_frame_bufs[MAX_INTER_REF_FRAMES];
4511 const RefCntBuffer *curr_frame_buf =
4512 get_ref_cnt_buffer(cm, cm->new_fb_idx);
4511 get_ref_frame_bufs(cpi, ref_frame_bufs);4513 get_ref_frame_bufs(cpi, ref_frame_bufs);
4512 vp9_extrc_get_encodeframe_decision(4514 vp9_extrc_get_encodeframe_decision(
4513 &cpi->ext_ratectrl, cm->current_video_frame,4515 &cpi->ext_ratectrl, curr_frame_buf->frame_index,
4514 cm->current_frame_coding_index, gf_group->index, update_type,4516 cm->current_frame_coding_index, gf_group->index, update_type,
4515 ref_frame_bufs, ref_frame_flags, &encode_frame_decision);4517 ref_frame_bufs, ref_frame_flags, &encode_frame_decision);
4516 q = encode_frame_decision.q_index;4518 q = encode_frame_decision.q_index;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t