diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2013-08-11 12:20:58 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-11 12:20:58 -0700 |
commit | 097046ae28c41d2c6a066d3ad864d738d9dbb794 (patch) | |
tree | 2b245785c9893ec141d84a406b401d2cd2ddba8e /vp9/decoder | |
parent | 3c43ec206ca9994ff1e4a3ec3c4365e959e39314 (diff) | |
parent | 67fe9d17cba8c8ddeeba265bcd6779db5b36e777 (diff) | |
download | libvpx-097046ae28c41d2c6a066d3ad864d738d9dbb794.tar libvpx-097046ae28c41d2c6a066d3ad864d738d9dbb794.tar.gz libvpx-097046ae28c41d2c6a066d3ad864d738d9dbb794.tar.bz2 libvpx-097046ae28c41d2c6a066d3ad864d738d9dbb794.zip |
Merge "Removing redundant code and function arguments."
Diffstat (limited to 'vp9/decoder')
-rw-r--r-- | vp9/decoder/vp9_onyxd_if.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/vp9/decoder/vp9_onyxd_if.c b/vp9/decoder/vp9_onyxd_if.c index db4a5bb28..e20994add 100644 --- a/vp9/decoder/vp9_onyxd_if.c +++ b/vp9/decoder/vp9_onyxd_if.c @@ -110,35 +110,36 @@ void vp9_initialize_dec() { VP9D_PTR vp9_create_decompressor(VP9D_CONFIG *oxcf) { VP9D_COMP *const pbi = vpx_memalign(32, sizeof(VP9D_COMP)); + VP9_COMMON *const cm = pbi ? &pbi->common : NULL; - if (!pbi) + if (!cm) return NULL; vp9_zero(*pbi); - if (setjmp(pbi->common.error.jmp)) { - pbi->common.error.setjmp = 0; + if (setjmp(cm->error.jmp)) { + cm->error.setjmp = 0; vp9_remove_decompressor(pbi); return NULL; } - pbi->common.error.setjmp = 1; + cm->error.setjmp = 1; vp9_initialize_dec(); - vp9_create_common(&pbi->common); + vp9_create_common(cm); pbi->oxcf = *oxcf; - pbi->common.current_video_frame = 0; pbi->ready_for_new_data = 1; + cm->current_video_frame = 0; // vp9_init_dequantizer() is first called here. Add check in // frame_init_dequantizer() to avoid unnecessary calling of // vp9_init_dequantizer() for every frame. - vp9_init_dequantizer(&pbi->common); + vp9_init_dequantizer(cm); - vp9_loop_filter_init(&pbi->common, &pbi->common.lf); + vp9_loop_filter_init(cm); - pbi->common.error.setjmp = 0; + cm->error.setjmp = 0; pbi->decoded_key_frame = 0; if (pbi->oxcf.max_threads > 1) { @@ -424,7 +425,7 @@ int vp9_get_raw_frame(VP9D_PTR ptr, YV12_BUFFER_CONFIG *sd, *time_end_stamp = 0; #if CONFIG_POSTPROC - ret = vp9_post_proc_frame(&pbi->common, &pbi->common.lf, sd, flags); + ret = vp9_post_proc_frame(&pbi->common, sd, flags); #else if (pbi->common.frame_to_show) { |