diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-04-25 09:13:41 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-04-25 09:13:41 -0400 |
| commit | 308e31a3ef97fa7a5bf9a232b15587955e5ec89f (patch) | |
| tree | 5cdcdd3b0df930034695d491c722bd57b1a48a3e /vp8/decoder/onyxd_if.c | |
| parent | 1cf1ea94704b759aad8bacab0b7fa833ac7e452e (diff) | |
| parent | 5227798c570af08d08dd6fdd7a3e96d5dc96977b (diff) | |
| download | libvpx-308e31a3ef97fa7a5bf9a232b15587955e5ec89f.tar libvpx-308e31a3ef97fa7a5bf9a232b15587955e5ec89f.tar.gz libvpx-308e31a3ef97fa7a5bf9a232b15587955e5ec89f.tar.bz2 libvpx-308e31a3ef97fa7a5bf9a232b15587955e5ec89f.zip | |
Merge remote branch 'internal/upstream-experimental' into HEAD
Conflicts:
vp8/decoder/onyxd_int.h
Change-Id: Icf445b589c2bc61d93d8c977379bbd84387d0488
Diffstat (limited to 'vp8/decoder/onyxd_if.c')
| -rw-r--r-- | vp8/decoder/onyxd_if.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index 4225798f4..1744354e3 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -75,7 +75,6 @@ VP8D_PTR vp8dx_create_decompressor(VP8D_CONFIG *oxcf) pbi->common.current_video_frame = 0; pbi->ready_for_new_data = 1; - pbi->CPUFreq = 0; /*vp8_get_processor_freq();*/ #if CONFIG_MULTITHREAD pbi->max_threads = oxcf->max_threads; vp8_decoder_create_threads(pbi); @@ -255,7 +254,6 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign VP8D_COMP *pbi = (VP8D_COMP *) ptr; VP8_COMMON *cm = &pbi->common; int retcode = 0; - struct vpx_usec_timer timer; /*if(pbi->ready_for_new_data == 0) return -1;*/ @@ -320,8 +318,6 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign pbi->common.error.setjmp = 1; - vpx_usec_timer_start(&timer); - /*cm->current_video_frame++;*/ pbi->Source = source; pbi->source_sz = size; @@ -382,15 +378,9 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign if(pbi->common.filter_level) { - struct vpx_usec_timer lpftimer; - vpx_usec_timer_start(&lpftimer); /* Apply the loop filter if appropriate. */ - vp8_loop_filter_frame(cm, &pbi->mb, cm->filter_level); - vpx_usec_timer_mark(&lpftimer); - pbi->time_loop_filtering += vpx_usec_timer_elapsed(&lpftimer); - cm->last_frame_type = cm->frame_type; cm->last_filter_type = cm->filter_type; cm->last_sharpness_level = cm->sharpness_level; @@ -403,11 +393,6 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign vp8_clear_system_state(); - vpx_usec_timer_mark(&timer); - pbi->decode_microseconds = vpx_usec_timer_elapsed(&timer); - - pbi->time_decoding += pbi->decode_microseconds; - /*vp8_print_modes_and_motion_vectors( cm->mi, cm->mb_rows,cm->mb_cols, cm->current_video_frame);*/ if (cm->show_frame) |