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

vp10_cx_iface,encode: remove redundant cpi check

Browse Source 
this is allocated in init(), a NULL pointer on encode() should be
treated as a failure.

Change-Id: I09c206f088982716fd5acc39949ceb25576313fc
This commit is contained in:
James Zern 2016-02-16 17:58:54 -08:00
parent 0b9925ccec
commit b5029a25a8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vp10/vp10_cx_iface.c
View File

@ -892,11 +892,13 @@ static vpx_codec_err_t encoder_encode(vpx_codec_alg_priv_t *ctx,
const vpx_rational_t *const timebase = &ctx->cfg.g_timebase; const vpx_rational_t *const timebase = &ctx->cfg.g_timebase;
size_t data_sz; size_t data_sz;
if (cpi == NULL) return VPX_CODEC_INVALID_PARAM;
if (img != NULL) { if (img != NULL) {
res = validate_img(ctx, img); res = validate_img(ctx, img);
// TODO(jzern) the checks related to cpi's validity should be treated as a // TODO(jzern) the checks related to cpi's validity should be treated as a
// failure condition, encoder setup is done fully in init() currently. // failure condition, encoder setup is done fully in init() currently.
if (res == VPX_CODEC_OK && cpi != NULL) { if (res == VPX_CODEC_OK) {
// There's no codec control for multiple alt-refs so check the encoder // There's no codec control for multiple alt-refs so check the encoder
// instance for its status to determine the compressed data size. // instance for its status to determine the compressed data size.
data_sz = ctx->cfg.g_w * ctx->cfg.g_h * get_image_bps(img) / 8 * data_sz = ctx->cfg.g_w * ctx->cfg.g_h * get_image_bps(img) / 8 *
@ -935,8 +937,7 @@ static vpx_codec_err_t encoder_encode(vpx_codec_alg_priv_t *ctx,
} }
} }
// Initialize the encoder instance on the first frame. if (res == VPX_CODEC_OK) {
if (res == VPX_CODEC_OK && cpi != NULL) {
unsigned int lib_flags = 0; unsigned int lib_flags = 0;
YV12_BUFFER_CONFIG sd; YV12_BUFFER_CONFIG sd;
int64_t dst_time_stamp = timebase_units_to_ticks(timebase, pts); int64_t dst_time_stamp = timebase_units_to_ticks(timebase, pts);