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

vp8dx_receive_compressed_data() cleanup

Browse Source 
Change-Id: I6edf0626d00ae177c7c04eec64e1ec0dd861dfbe
This commit is contained in:
Scott LaVarnway 2012-10-31 13:35:13 -07:00
parent 533470c998
commit 8a6a7ae292
2 changed files with 18 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vp8/common/onyxd.h
View File

@ -48,7 +48,9 @@ extern "C"
int vp8dx_get_setting(struct VP8D_COMP* comp, VP8D_SETTING oxst); int vp8dx_get_setting(struct VP8D_COMP* comp, VP8D_SETTING oxst);
int vp8dx_receive_compressed_data(struct VP8D_COMP* comp, unsigned long size, const unsigned char *dest, int64_t time_stamp); int vp8dx_receive_compressed_data(struct VP8D_COMP* comp,
size_t size, const uint8_t *dest,
int64_t time_stamp);
int vp8dx_get_raw_frame(struct VP8D_COMP* comp, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags); int vp8dx_get_raw_frame(struct VP8D_COMP* comp, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags);
vpx_codec_err_t vp8dx_get_reference(struct VP8D_COMP* comp, enum vpx_ref_frame_type ref_frame_flag, YV12_BUFFER_CONFIG *sd); vpx_codec_err_t vp8dx_get_reference(struct VP8D_COMP* comp, enum vpx_ref_frame_type ref_frame_flag, YV12_BUFFER_CONFIG *sd);

81
vp8/decoder/onyxd_if.c
View File

@ -281,13 +281,15 @@ static int swap_frame_buffers (VP8_COMMON *cm)
return err; return err;
} }
int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsigned char *source, int64_t time_stamp) int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size,
const uint8_t *source,
int64_t time_stamp)
{ {
#if HAVE_NEON #if HAVE_NEON
int64_t dx_store_reg[8]; int64_t dx_store_reg[8];
#endif #endif
VP8_COMMON *cm = &pbi->common; VP8_COMMON *cm = &pbi->common;
int retcode = 0; int retcode = -1;
pbi->common.error.error_code = VPX_CODEC_OK; pbi->common.error.error_code = VPX_CODEC_OK;
@ -383,18 +385,6 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi
if (setjmp(pbi->common.error.jmp)) if (setjmp(pbi->common.error.jmp))
{ {
#if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT
if (cm->cpu_caps & HAS_NEON)
#endif
{
vp8_pop_neon(dx_store_reg);
}
#endif
pbi->common.error.setjmp = 0;
pbi->num_fragments = 0;
/* We do not know if the missing frame(s) was supposed to update /* We do not know if the missing frame(s) was supposed to update
* any of the reference buffers, but we act conservative and * any of the reference buffers, but we act conservative and
* mark only the last buffer as corrupted. * mark only the last buffer as corrupted.
@ -403,7 +393,8 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi
if (cm->fb_idx_ref_cnt[cm->new_fb_idx] > 0) if (cm->fb_idx_ref_cnt[cm->new_fb_idx] > 0)
cm->fb_idx_ref_cnt[cm->new_fb_idx]--; cm->fb_idx_ref_cnt[cm->new_fb_idx]--;
return -1;
goto decode_exit;
} }
pbi->common.error.setjmp = 1; pbi->common.error.setjmp = 1;
@ -412,58 +403,17 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi
if (retcode < 0) if (retcode < 0)
{ {
#if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT
if (cm->cpu_caps & HAS_NEON)
#endif
{
vp8_pop_neon(dx_store_reg);
}
#endif
pbi->common.error.error_code = VPX_CODEC_ERROR;
pbi->common.error.setjmp = 0;
pbi->num_fragments = 0;
if (cm->fb_idx_ref_cnt[cm->new_fb_idx] > 0) if (cm->fb_idx_ref_cnt[cm->new_fb_idx] > 0)
cm->fb_idx_ref_cnt[cm->new_fb_idx]--; cm->fb_idx_ref_cnt[cm->new_fb_idx]--;
return retcode;
pbi->common.error.error_code = VPX_CODEC_ERROR;
goto decode_exit;
} }
#if CONFIG_MULTITHREAD if (swap_frame_buffers (cm))
if (pbi->b_multithreaded_rd && cm->multi_token_partition != ONE_PARTITION)
{ {
if (swap_frame_buffers (cm)) pbi->common.error.error_code = VPX_CODEC_ERROR;
{ goto decode_exit;
#if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT
if (cm->cpu_caps & HAS_NEON)
#endif
{
vp8_pop_neon(dx_store_reg);
}
#endif
pbi->common.error.error_code = VPX_CODEC_ERROR;
pbi->common.error.setjmp = 0;
pbi->num_fragments = 0;
return -1;
}
} else
#endif
{
if (swap_frame_buffers (cm))
{
#if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT
if (cm->cpu_caps & HAS_NEON)
#endif
{
vp8_pop_neon(dx_store_reg);
}
#endif
pbi->common.error.error_code = VPX_CODEC_ERROR;
pbi->common.error.setjmp = 0;
pbi->num_fragments = 0;
return -1;
}
} }
vp8_clear_system_state(); vp8_clear_system_state();
@ -490,16 +440,13 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi
} }
#endif #endif
/*vp8_print_modes_and_motion_vectors( cm->mi, cm->mb_rows,cm->mb_cols, cm->current_video_frame);*/
if (cm->show_frame) if (cm->show_frame)
cm->current_video_frame++; cm->current_video_frame++;
pbi->ready_for_new_data = 0; pbi->ready_for_new_data = 0;
pbi->last_time_stamp = time_stamp; pbi->last_time_stamp = time_stamp;
pbi->num_fragments = 0;
decode_exit:
#if HAVE_NEON #if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
if (cm->cpu_caps & HAS_NEON) if (cm->cpu_caps & HAS_NEON)
@ -508,7 +455,9 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi
vp8_pop_neon(dx_store_reg); vp8_pop_neon(dx_store_reg);
} }
#endif #endif
pbi->common.error.setjmp = 0; pbi->common.error.setjmp = 0;
pbi->num_fragments = 0;
return retcode; return retcode;
} }
int vp8dx_get_raw_frame(VP8D_COMP *pbi, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags) int vp8dx_get_raw_frame(VP8D_COMP *pbi, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags)