diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-02-27 22:23:38 +0000 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2012-02-28 17:55:42 +0000 |
| commit | b6f02c85926b928f29b428e620b1c1ec70dd9d42 (patch) | |
| tree | ffe51bf8579237dcc57772ec70585b809f61061f /vp8/common | |
| parent | eb87b56eab32116536cd33866592e6d23b888299 (diff) | |
| download | libvpx-b6f02c85926b928f29b428e620b1c1ec70dd9d42.tar libvpx-b6f02c85926b928f29b428e620b1c1ec70dd9d42.tar.gz libvpx-b6f02c85926b928f29b428e620b1c1ec70dd9d42.tar.bz2 libvpx-b6f02c85926b928f29b428e620b1c1ec70dd9d42.zip | |
Code Simplification
Removal of code relating to token partitioning
Change-Id: Iaf3c88d6758639a55bd92c3be5c51e6bed407a3c
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/alloccommon.c | 1 | ||||
| -rw-r--r-- | vp8/common/onyx.h | 2 | ||||
| -rw-r--r-- | vp8/common/onyxc_int.h | 10 |
3 files changed, 0 insertions, 13 deletions
diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c index 0f5c48d91..38c09bf7d 100644 --- a/vp8/common/alloccommon.c +++ b/vp8/common/alloccommon.c @@ -218,7 +218,6 @@ void vp8_create_common(VP8_COMMON *oci) oci->filter_type = NORMAL_LOOPFILTER; oci->use_bilinear_mc_filter = 0; oci->full_pixel = 0; - oci->multi_token_partition = ONE_PARTITION; oci->clr_type = REG_YUV; oci->clamp_type = RECON_CLAMP_REQUIRED; diff --git a/vp8/common/onyx.h b/vp8/common/onyx.h index 53a3d23cc..574c8bfb5 100644 --- a/vp8/common/onyx.h +++ b/vp8/common/onyx.h @@ -166,8 +166,6 @@ extern "C" int play_alternate; int alt_freq; - int multi_threaded; // how many threads to run the encoder on - int token_partitions; // how many token partitions to create for multi core decoding int encode_breakout; // early breakout encode threshold : for video conf recommend 800 int arnr_max_frames; diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index 233fd2fa9..41d15f58f 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h @@ -64,14 +64,6 @@ typedef struct frame_contexts typedef enum { - ONE_PARTITION = 0, - TWO_PARTITION = 1, - FOUR_PARTITION = 2, - EIGHT_PARTITION = 3 -} TOKEN_PARTITION; - -typedef enum -{ RECON_CLAMP_REQUIRED = 0, RECON_CLAMP_NOTREQUIRED = 1 } CLAMP_TYPE; @@ -259,8 +251,6 @@ typedef struct VP8Common int near_boffset[3]; int version; - TOKEN_PARTITION multi_token_partition; - #ifdef PACKET_TESTING VP8_HEADER oh; #endif |