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

Merge "VP9-SVC: Allow frame dropping due to overshoot for spatial layers."

Browse Source
This commit is contained in:
Marco Paniconi 2015-10-28 21:59:17 +00:00 committed by Gerrit Code Review
commit 9645cd4826
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vp9/encoder/vp9_encoder.c
View File

@ -3797,14 +3797,17 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
} }
// For 1 pass CBR, check if we are dropping this frame. // For 1 pass CBR, check if we are dropping this frame.
// Never drop on key frame. // For spatial layers, for now only check for frame-dropping on first spatial
// layer, and if decision is to drop, we drop whole super-frame.
if (oxcf->pass == 0 && if (oxcf->pass == 0 &&
oxcf->rc_mode == VPX_CBR && oxcf->rc_mode == VPX_CBR &&
cm->frame_type != KEY_FRAME) { cm->frame_type != KEY_FRAME) {
if (vp9_rc_drop_frame(cpi)) { if (vp9_rc_drop_frame(cpi) ||
(is_one_pass_cbr_svc(cpi) && cpi->svc.rc_drop_superframe == 1)) {
vp9_rc_postencode_update_drop_frame(cpi); vp9_rc_postencode_update_drop_frame(cpi);
++cm->current_video_frame; ++cm->current_video_frame;
cpi->ext_refresh_frame_flags_pending = 0; cpi->ext_refresh_frame_flags_pending = 0;
cpi->svc.rc_drop_superframe = 1;
return; return;
} }
} }

5
vp9/encoder/vp9_ratectrl.c
View File

@ -370,8 +370,9 @@ void vp9_rc_init(const VP9EncoderConfig *oxcf, int pass, RATE_CONTROL *rc) {
int vp9_rc_drop_frame(VP9_COMP *cpi) { int vp9_rc_drop_frame(VP9_COMP *cpi) {
const VP9EncoderConfig *oxcf = &cpi->oxcf; const VP9EncoderConfig *oxcf = &cpi->oxcf;
RATE_CONTROL *const rc = &cpi->rc; RATE_CONTROL *const rc = &cpi->rc;
if (!oxcf->drop_frames_water_mark ||
if (!oxcf->drop_frames_water_mark) { (is_one_pass_cbr_svc(cpi) &&
cpi->svc.spatial_layer_id > cpi->svc.first_spatial_layer_to_encode)) {
return 0; return 0;
} else { } else {
if (rc->buffer_level < 0) { if (rc->buffer_level < 0) {

4
vp9/encoder/vp9_svc_layercontext.c
View File

@ -31,6 +31,7 @@ void vp9_init_layer_context(VP9_COMP *const cpi) {
svc->spatial_layer_id = 0; svc->spatial_layer_id = 0;
svc->temporal_layer_id = 0; svc->temporal_layer_id = 0;
svc->first_spatial_layer_to_encode = 0; svc->first_spatial_layer_to_encode = 0;
svc->rc_drop_superframe = 0;
if (cpi->oxcf.error_resilient_mode == 0 && cpi->oxcf.pass == 2) { if (cpi->oxcf.error_resilient_mode == 0 && cpi->oxcf.pass == 2) {
if (vpx_realloc_frame_buffer(&cpi->svc.empty_frame.img, if (vpx_realloc_frame_buffer(&cpi->svc.empty_frame.img,
@ -568,6 +569,9 @@ int vp9_one_pass_cbr_svc_start_layer(VP9_COMP *const cpi) {
} }
} }
if (cpi->svc.spatial_layer_id == cpi->svc.first_spatial_layer_to_encode)
cpi->svc.rc_drop_superframe = 0;
lc = &cpi->svc.layer_context[cpi->svc.spatial_layer_id * lc = &cpi->svc.layer_context[cpi->svc.spatial_layer_id *
cpi->svc.number_temporal_layers + cpi->svc.number_temporal_layers +
cpi->svc.temporal_layer_id]; cpi->svc.temporal_layer_id];

1
vp9/encoder/vp9_svc_layercontext.h
View File

@ -56,6 +56,7 @@ typedef struct {
int spatial_layer_to_encode; int spatial_layer_to_encode;
int first_spatial_layer_to_encode; int first_spatial_layer_to_encode;
int rc_drop_superframe;
// Workaround for multiple frame contexts // Workaround for multiple frame contexts
enum { enum {

1
vpx/src/svc_encodeframe.c
View File

@ -485,6 +485,7 @@ vpx_codec_err_t vpx_svc_init(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx,
enc_cfg->rc_buf_initial_sz = 500; enc_cfg->rc_buf_initial_sz = 500;
enc_cfg->rc_buf_optimal_sz = 600; enc_cfg->rc_buf_optimal_sz = 600;
enc_cfg->rc_buf_sz = 1000; enc_cfg->rc_buf_sz = 1000;
enc_cfg->rc_dropframe_thresh = 0;
} }
if (enc_cfg->g_error_resilient == 0 && si->use_multiple_frame_contexts == 0) if (enc_cfg->g_error_resilient == 0 && si->use_multiple_frame_contexts == 0)