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

Dynamic resize 1 pass mode: fix buffer underflow threshold.

Browse Source 
Remove the use of drop_frames_water_mark, as this is used for
frame dropping control. Use fixed threshold for now on buffer underflow.

Change-Id: If0ddda9f7f6fa96067cdcb0eccb42e17bda37c32
This commit is contained in:
Marco 2015-07-17 11:21:47 -07:00
parent b8ff84b7f8
commit 7501de267c
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_ratectrl.c
View File

@ -1810,13 +1810,12 @@ int vp9_resize_one_pass_cbr(VP9_COMP *cpi) {
cpi->resize_count = 0; cpi->resize_count = 0;
return 0; return 0;
} }
// Resize based on average QP over some window. // Resize based on average buffer underflow and QP over some window.
// Ignore samples close to key frame, since QP is usually high after key. // Ignore samples close to key frame, since QP is usually high after key.
if (cpi->rc.frames_since_key > 2 * cpi->framerate) { if (cpi->rc.frames_since_key > 2 * cpi->framerate) {
const int window = (int)(5 * cpi->framerate); const int window = (int)(5 * cpi->framerate);
cpi->resize_avg_qp += cm->base_qindex; cpi->resize_avg_qp += cm->base_qindex;
if (cpi->rc.buffer_level < (int)(cpi->oxcf.drop_frames_water_mark * if (cpi->rc.buffer_level < (int)(30 * rc->optimal_buffer_level / 100))
rc->optimal_buffer_level / 100))
++cpi->resize_buffer_underflow; ++cpi->resize_buffer_underflow;
++cpi->resize_count; ++cpi->resize_count;
// Check for resize action every "window" frames. // Check for resize action every "window" frames.