diff options
| author | Jingning Han <jingning@google.com> | 2013-05-04 22:09:43 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2013-05-07 09:08:25 -0700 |
| commit | 776c1482a302f5ea42dfe4517f51c0f1e48f2670 (patch) | |
| tree | 50af5bd8efe251aa065f94249f172a1922aae0f2 /vp9/encoder/vp9_ratectrl.c | |
| parent | 8c70a0fcab18ed3ebbdceee43a9e4305251677ae (diff) | |
| download | libvpx-776c1482a302f5ea42dfe4517f51c0f1e48f2670.tar libvpx-776c1482a302f5ea42dfe4517f51c0f1e48f2670.tar.gz libvpx-776c1482a302f5ea42dfe4517f51c0f1e48f2670.tar.bz2 libvpx-776c1482a302f5ea42dfe4517f51c0f1e48f2670.zip | |
Merge SB8X8 into the codebase
Pull sb8x8 out of experimental list. verified via borg run tests.
Fixed unit test failures.
Change-Id: I12a4bbd17395930580c048ab68becad1ffe46e76
Diffstat (limited to 'vp9/encoder/vp9_ratectrl.c')
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 42d339dfb..0f84b1a37 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -138,13 +138,7 @@ void vp9_save_coding_context(VP9_COMP *cpi) { vp9_copy(cc->sb_ymode_prob, cm->fc.sb_ymode_prob); vp9_copy(cc->bmode_prob, cm->fc.bmode_prob); vp9_copy(cc->uv_mode_prob, cm->fc.uv_mode_prob); -#if !CONFIG_SB8X8 - vp9_copy(cc->i8x8_mode_prob, cm->fc.i8x8_mode_prob); -#endif vp9_copy(cc->sub_mv_ref_prob, cm->fc.sub_mv_ref_prob); -#if !CONFIG_SB8X8 - vp9_copy(cc->mbsplit_prob, cm->fc.mbsplit_prob); -#endif vp9_copy(cc->partition_prob, cm->fc.partition_prob); // Stats @@ -202,14 +196,8 @@ void vp9_restore_coding_context(VP9_COMP *cpi) { vp9_copy(cm->fc.ymode_prob, cc->ymode_prob); vp9_copy(cm->fc.sb_ymode_prob, cc->sb_ymode_prob); vp9_copy(cm->fc.bmode_prob, cc->bmode_prob); -#if !CONFIG_SB8X8 - vp9_copy(cm->fc.i8x8_mode_prob, cc->i8x8_mode_prob); -#endif vp9_copy(cm->fc.uv_mode_prob, cc->uv_mode_prob); vp9_copy(cm->fc.sub_mv_ref_prob, cc->sub_mv_ref_prob); -#if !CONFIG_SB8X8 - vp9_copy(cm->fc.mbsplit_prob, cc->mbsplit_prob); -#endif vp9_copy(cm->fc.partition_prob, cc->partition_prob); // Stats |