← Back to branch summary

~ubuntu-branches/ubuntu/maverick/x264/maverick-updates

« back to all changes in this revision

Viewing changes to common/common.h

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2010-02-18 07:39:51 UTC
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: james.westby@ubuntu.com-20100218073951-9jgsvskb976rfbvq
Tags: upstream-0.85.1442.1+git781d30
Import upstream version 0.85.1442.1+git781d30

Show diffs side-by-side

added added

removed removed

Lines of Context:
common/common.h
484
484
        int     b_chroma_me;
485
485
        int     b_trellis;
486
486
        int     b_noise_reduction;
 
487
        int     b_dct_decimate;
487
488
        int     i_psy_rd; /* Psy RD strength--fixed point value*/
488
489
        int     i_psy_trellis; /* Psy trellis strength--fixed point value*/
489
490
 
653
654
        int     i_chroma_lambda2_offset;
654
655
 
655
656
        /* B_direct and weighted prediction */
656
 
        int16_t dist_scale_factor[16][2];
 
657
        int16_t dist_scale_factor_buf[2][16][2];
 
658
        int16_t (*dist_scale_factor)[2];
657
659
        int8_t bipred_weight_buf[2][32][4];
658
660
        int8_t (*bipred_weight)[4];
659
661
        /* maps fref1[0]'s ref indices into the current list0 */
660
 
#define map_col_to_list0(col) h->mb.map_col_to_list0[col+2]
 
662
#define map_col_to_list0(col) h->mb.map_col_to_list0[(col)+2]
661
663
        int8_t  map_col_to_list0[18];
662
664
        int ref_blind_dupe; /* The index of the blind reference frame duplicate. */
663
665
    } mb;