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_tokenize.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_tokenize.c')
| -rw-r--r-- | vp9/encoder/vp9_tokenize.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c index c16bdff35..d526990df 100644 --- a/vp9/encoder/vp9_tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -180,7 +180,7 @@ static void tokenize_b(int plane, int block, BLOCK_SIZE_TYPE bsize, pt = combine_entropy_contexts(above_ec, left_ec); nb = vp9_get_coef_neighbors_handle(scan); - if (vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP)) + if (vp9_segfeature_active(&xd->seg, segment_id, SEG_LVL_SKIP)) seg_eob = 0; c = 0; @@ -274,12 +274,10 @@ void vp9_tokenize_sb(VP9_COMP *cpi, MB_MODE_INFO * const mbmi = &xd->mode_info_context->mbmi; TOKENEXTRA *t_backup = *t; const int mb_skip_context = vp9_get_pred_context_mbskip(cm, xd); - const int segment_id = mbmi->segment_id; - const int skip_inc = !vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP); + const int skip_inc = !vp9_segfeature_active(&xd->seg, mbmi->segment_id, + SEG_LVL_SKIP); const TX_SIZE txfm_size = mbmi->txfm_size; - struct tokenize_b_args arg = { - cpi, xd, t, txfm_size, dry_run - }; + struct tokenize_b_args arg = { cpi, xd, t, txfm_size, dry_run }; mbmi->mb_skip_coeff = vp9_sb_is_skippable(xd, bsize); |