On Tue, 2 Oct 2007, Andreas ?man wrote:
First two patches applied, (previously ok'ed by Michael)
I fixed the doxygen incompat stuff and some vertical alignment.
Thanks. Does multiple trailing documentation lines with ///< not work properly? The doxy manual implied that it did.
- const int pic_height = 16*s->mb_height >> MB_MBAFF; + const int pic_height = 16*s->mb_height >> (MB_MBAFF || FIELD_PICTURE);
I believe you should use MB_FIELD here instead (and on all other places) Perhaps that should be a separate patch, i dunno really..
Yes, that would work as well. I did it this way to be consistent with how it was currently being done. MB_FIELD would be a little faster at runtime. I can post a new patch with this change, or provide one to do it after, depending on the desired order of things. Stronger opinions anyone?
@@ -4835,19 +5209,13 @@ if( cbp_a == 2 ) ctx++; if( cbp_b == 2 ) ctx += 2; return 1 + get_cabac_noinline( &h->cabac, &h->cabac_state[77 + ctx] ); } static int decode_cabac_mb_dqp( H264Context *h) { - MpegEncContext * const s = &h->s; - int mbn_xy; int ctx = 0; int val = 0;
- if( s->mb_x > 0 ) - mbn_xy = s->mb_x + s->mb_y*s->mb_stride - 1; - else - mbn_xy = s->mb_width - 1 + (s->mb_y-1)*s->mb_stride;
if( h->last_qscale_diff != 0 ) ctx++;
while( get_cabac_noinline( &h->cabac, &h->cabac_state[60 + ctx] ) ) {
Unrelated removal of unused code, but deserves to be fixed either way.
Yes. My mistake - I meant to remove that hunk prior to posting. Patch w/out that hunk attached. Thanks for taking a look. -Jeff