generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix high bit depth with scaled reference frame" into sandbox/jingning@google.com/decoder_test_suite

Browse Source
This commit is contained in:
Jingning Han 2015-12-11 20:27:56 +00:00 committed by Gerrit Code Review
commit 35b121b0d8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vp9/encoder/vp9_encoder.c
View File

@ -2834,7 +2834,6 @@ void vp9_scale_references(VP9_COMP *cpi) {
if (cm->new_fb_idx == INVALID_IDX)
return;
new_fb_ptr = &pool->frame_bufs[new_fb];
cm->cur_frame = &pool->frame_bufs[new_fb];
vp9_realloc_frame_buffer(&pool->frame_bufs[new_fb].buf,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
@ -3073,9 +3072,9 @@ static void set_frame_size(VP9_COMP *cpi) {
#if CONFIG_INTERNAL_RESIZE
if (oxcf->pass == 2 && oxcf->resize_mode == RESIZE_DYNAMIC) {
if ((cm->current_video_frame % 5) == 2) {
if ((cm->current_video_frame % 15) == 3) {
cpi->resize_pending = 1;
cpi->rc.frame_size_selector = (cm->current_video_frame / 5) & 0x01;
cpi->rc.frame_size_selector = (cm->current_video_frame / 15) & 0x01;
} else {
cpi->resize_pending = 0;
}