comparison mpegvideo.h @ 7902:8b8be8f2b647 libavcodec

Fix ref_shift so that it is correct for more/all? MBAFF/PAFF mixes. Fixes at least MR9_BT_B.
author michael
date Mon, 22 Sep 2008 02:32:22 +0000
parents 8195c970d077
children 50516d28608a
comparison
equal deleted inserted replaced
7901:a7d78c0657f1 7902:8b8be8f2b647
118 int pic_id; /**< h264 pic_num (short -> no wrap version of pic_num, 118 int pic_id; /**< h264 pic_num (short -> no wrap version of pic_num,
119 pic_num & max_pic_num; long -> long_pic_num) */ 119 pic_num & max_pic_num; long -> long_pic_num) */
120 int long_ref; ///< 1->long term reference 0->short term reference 120 int long_ref; ///< 1->long term reference 0->short term reference
121 int ref_poc[2][2][16]; ///< h264 POCs of the frames used as reference (FIXME need per slice) 121 int ref_poc[2][2][16]; ///< h264 POCs of the frames used as reference (FIXME need per slice)
122 int ref_count[2][2]; ///< number of entries in ref_poc (FIXME need per slice) 122 int ref_count[2][2]; ///< number of entries in ref_poc (FIXME need per slice)
123 int mbaff; ///< h264 1 -> MBAFF frame 0-> not MBAFF
123 124
124 int mb_var_sum; ///< sum of MB variance for current frame 125 int mb_var_sum; ///< sum of MB variance for current frame
125 int mc_mb_var_sum; ///< motion compensated MB variance for current frame 126 int mc_mb_var_sum; ///< motion compensated MB variance for current frame
126 uint16_t *mb_var; ///< Table for MB variances 127 uint16_t *mb_var; ///< Table for MB variances
127 uint16_t *mc_mb_var; ///< Table for motion compensated MB variances 128 uint16_t *mc_mb_var; ///< Table for motion compensated MB variances