diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-07-10 12:29:43 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-07-11 11:57:57 -0700 |
| commit | c4ad3273c7af292df189a095a64b9139cbed5285 (patch) | |
| tree | fc4a872bcba7fa9677d2bad979734f852839f5f8 /vp9/encoder/vp9_ratectrl.c | |
| parent | f70c021d368e5f7284aa0d0499d9987989de06a2 (diff) | |
| download | libvpx-c4ad3273c7af292df189a095a64b9139cbed5285.tar libvpx-c4ad3273c7af292df189a095a64b9139cbed5285.tar.gz libvpx-c4ad3273c7af292df189a095a64b9139cbed5285.tar.bz2 libvpx-c4ad3273c7af292df189a095a64b9139cbed5285.zip | |
Moving segmentation related vars into separate struct.
Adding segmentation struct to vp9_seg_common.h. Struct members are from
macroblockd and VP9Common structs. Moving segmentation related constants
and enums to vp9_seg_common.h.
Change-Id: I23fabc33f11a359249f5f80d161daf569d02ec03
Diffstat (limited to 'vp9/encoder/vp9_ratectrl.c')
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 93f8bb56d..733932821 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -127,7 +127,7 @@ void vp9_save_coding_context(VP9_COMP *cpi) { vp9_copy(cc->uv_mode_prob, cm->fc.uv_mode_prob); vp9_copy(cc->partition_prob, cm->fc.partition_prob); - vp9_copy(cc->segment_pred_probs, cm->segment_pred_probs); + vp9_copy(cc->segment_pred_probs, xd->seg.pred_probs); vp9_copy(cc->intra_inter_prob, cm->fc.intra_inter_prob); vp9_copy(cc->comp_inter_prob, cm->fc.comp_inter_prob); @@ -167,7 +167,7 @@ void vp9_restore_coding_context(VP9_COMP *cpi) { vp9_copy(cm->fc.uv_mode_prob, cc->uv_mode_prob); vp9_copy(cm->fc.partition_prob, cc->partition_prob); - vp9_copy(cm->segment_pred_probs, cc->segment_pred_probs); + vp9_copy(xd->seg.pred_probs, cc->segment_pred_probs); vp9_copy(cm->fc.intra_inter_prob, cc->intra_inter_prob); vp9_copy(cm->fc.comp_inter_prob, cc->comp_inter_prob); |