diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-02-03 15:10:44 +0000 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2012-02-06 16:40:57 +0000 |
| commit | 9c9300f56f4788ed5a9aade371c185b33dcb7781 (patch) | |
| tree | 66e8754fa7202faa8b6f315880768ff6d47aee8a /vp8/common/modecont.c | |
| parent | 82b865da9475586341949664d5468a93237867a8 (diff) | |
| download | libvpx-9c9300f56f4788ed5a9aade371c185b33dcb7781.tar libvpx-9c9300f56f4788ed5a9aade371c185b33dcb7781.tar.gz libvpx-9c9300f56f4788ed5a9aade371c185b33dcb7781.tar.bz2 libvpx-9c9300f56f4788ed5a9aade371c185b33dcb7781.zip | |
Merged NEWNEAR experiment
This commit merges the NEWNEAR experiment such that it
is effectively always on.
The fact that there were changes in the threading code again
highlights the need to strip out such features during the
bitstream development phase as trying to maintain this code
(especially as it is not being tested) slows the development cycle.
Change-Id: I8b34950a1333231ced9928aa11cd6d6459984b65
Diffstat (limited to 'vp8/common/modecont.c')
| -rw-r--r-- | vp8/common/modecont.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/vp8/common/modecont.c b/vp8/common/modecont.c index c7f903b16..d80e16ee5 100644 --- a/vp8/common/modecont.c +++ b/vp8/common/modecont.c @@ -10,7 +10,6 @@ #include "entropy.h" -#if CONFIG_NEWNEAR const int default_vp8_mode_contexts[6][4] = { { /* 0 */ @@ -41,32 +40,3 @@ const int default_vp8_mode_contexts_a[6][4] = { /* 5 */ 234, 94, 128, 28}, }; -#else -const int default_vp8_mode_contexts[6][4] = -{ - { - /* 0 */ - 7, 1, 1, 143, - }, - { - /* 1 */ - 14, 18, 14, 107, - }, - { - /* 2 */ - 135, 64, 57, 68, - }, - { - /* 3 */ - 60, 56, 128, 65, - }, - { - /* 4 */ - 159, 134, 128, 34, - }, - { - /* 5 */ - 234, 188, 128, 28, - }, -}; -#endif
\ No newline at end of file |