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

Merge "[two pass temporal svc]Fix crash issue in transcoder app caused by last fix."

Browse Source
This commit is contained in:
Minghai Shang 2015-01-16 15:00:20 -08:00 committed by Gerrit Code Review
commit 31614c7fdb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vp9/encoder/vp9_svc_layercontext.c
View File

@ -344,7 +344,8 @@ int vp9_svc_start_frame(VP9_COMP *const cpi) {
buf = vp9_lookahead_peek(cpi->lookahead, 0); buf = vp9_lookahead_peek(cpi->lookahead, 0);
if (cpi->oxcf.error_resilient_mode == 0 && cpi->oxcf.pass == 2 && if (cpi->oxcf.error_resilient_mode == 0 && cpi->oxcf.pass == 2 &&
cpi->svc.encode_empty_frame_state == NEED_TO_ENCODE && cpi->svc.encode_empty_frame_state == NEED_TO_ENCODE &&
lc->rc.frames_to_key != 0 && !(buf->flags & VPX_EFLAG_FORCE_KF)) { lc->rc.frames_to_key != 0 &&
!(buf != NULL && (buf->flags & VPX_EFLAG_FORCE_KF))) {
if ((cpi->svc.number_temporal_layers > 1 && if ((cpi->svc.number_temporal_layers > 1 &&
cpi->svc.temporal_layer_id < cpi->svc.number_temporal_layers - 1) || cpi->svc.temporal_layer_id < cpi->svc.number_temporal_layers - 1) ||
(cpi->svc.number_spatial_layers > 1 && (cpi->svc.number_spatial_layers > 1 &&