diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2012-10-10 09:08:03 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-10 09:08:03 -0700 |
| commit | 239b6a8f3080866de592dcccedf82e694a3a21f3 (patch) | |
| tree | 881227800b956330a8f4d43770f9a9a1209b6ac0 | |
| parent | 9581bf46dc76c2c38844c35c5cee50f1136fb519 (diff) | |
| parent | f56d0679f316debd09d418ce5aa4cd90145a617c (diff) | |
| download | libvpx-239b6a8f3080866de592dcccedf82e694a3a21f3.tar libvpx-239b6a8f3080866de592dcccedf82e694a3a21f3.tar.gz libvpx-239b6a8f3080866de592dcccedf82e694a3a21f3.tar.bz2 libvpx-239b6a8f3080866de592dcccedf82e694a3a21f3.zip | |
Merge "Removing dr[16] from VP8D_COMP" into experimental
| -rw-r--r-- | vp8/decoder/onyxd_if.c | 32 | ||||
| -rw-r--r-- | vp8/decoder/onyxd_int.h | 7 |
2 files changed, 0 insertions, 39 deletions
diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index 2e1364817..aa3ef81b3 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -471,38 +471,6 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign pbi->last_time_stamp = time_stamp; pbi->source_sz = 0; -#if 0 - { - int i; - int64_t earliest_time = pbi->dr[0].time_stamp; - int64_t latest_time = pbi->dr[0].time_stamp; - int64_t time_diff = 0; - int bytes = 0; - - pbi->dr[pbi->common.current_video_frame & 0xf].size = pbi->bc.pos + pbi->bc2.pos + 4;; - pbi->dr[pbi->common.current_video_frame & 0xf].time_stamp = time_stamp; - - for (i = 0; i < 16; i++) { - - bytes += pbi->dr[i].size; - - if (pbi->dr[i].time_stamp < earliest_time) - earliest_time = pbi->dr[i].time_stamp; - - if (pbi->dr[i].time_stamp > latest_time) - latest_time = pbi->dr[i].time_stamp; - } - - time_diff = latest_time - earliest_time; - - if (time_diff > 0) { - pbi->common.bitrate = 80000.00 * bytes / time_diff; - pbi->common.framerate = 160000000.00 / time_diff; - } - - } -#endif - #if HAVE_ARMV7 #if CONFIG_RUNTIME_CPU_DETECT if (cm->rtcd.flags & HAS_NEON) diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h index 0cb00a4c5..68d329f7b 100644 --- a/vp8/decoder/onyxd_int.h +++ b/vp8/decoder/onyxd_int.h @@ -33,11 +33,6 @@ typedef struct { } MB_ROW_DEC; typedef struct { - int64_t time_stamp; - int size; -} DATARATE; - -typedef struct { int const *scan; int const *scan_8x8; UINT8 const *ptr_block2leftabove; @@ -79,8 +74,6 @@ typedef struct VP8Decompressor { int64_t last_time_stamp; int ready_for_new_data; - DATARATE dr[16]; - DETOK detoken; #if CONFIG_RUNTIME_CPU_DETECT |