On 6/16/17 12:56 AM, Vittorio Giovara wrote: > From: Anton Mitrofanov <[email protected]> > > --- > libavcodec/h264_cabac.c | 16 ++++++++-------- > libavcodec/h264_cavlc.c | 16 ++++++++-------- > 2 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c > index c28f5680de..e6dc5258a4 100644 > --- a/libavcodec/h264_cabac.c > +++ b/libavcodec/h264_cabac.c > @@ -2371,14 +2371,6 @@ decode_intra_mb: > const uint8_t *scan, *scan8x8; > const uint32_t *qmul; > > - if(IS_INTERLACED(mb_type)){ > - scan8x8 = sl->qscale ? h->field_scan8x8 : h->field_scan8x8_q0; > - scan = sl->qscale ? h->field_scan : h->field_scan_q0; > - }else{ > - scan8x8 = sl->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0; > - scan = sl->qscale ? h->zigzag_scan : h->zigzag_scan_q0; > - } > - > // decode_cabac_mb_dqp > if(get_cabac_noinline( &sl->cabac, &sl->cabac_state[60 + > (sl->last_qscale_diff != 0)])){ > int val = 1; > @@ -2409,6 +2401,14 @@ decode_intra_mb: > }else > sl->last_qscale_diff=0; > > + if(IS_INTERLACED(mb_type)){ > + scan8x8 = sl->qscale ? h->field_scan8x8 : h->field_scan8x8_q0; > + scan = sl->qscale ? h->field_scan : h->field_scan_q0; > + }else{ > + scan8x8 = sl->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0; > + scan = sl->qscale ? h->zigzag_scan : h->zigzag_scan_q0; > + } > + > decode_cabac_luma_residual(h, sl, scan, scan8x8, pixel_shift, > mb_type, cbp, 0); > if (CHROMA444(h)) { > decode_cabac_luma_residual(h, sl, scan, scan8x8, pixel_shift, > mb_type, cbp, 1); > diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c > index c11e211bd8..d57062bc56 100644 > --- a/libavcodec/h264_cavlc.c > +++ b/libavcodec/h264_cavlc.c > @@ -1093,14 +1093,6 @@ decode_intra_mb: > const uint8_t *scan, *scan8x8; > const int max_qp = 51 + 6 * (h->ps.sps->bit_depth_luma - 8); > > - if(IS_INTERLACED(mb_type)){ > - scan8x8 = sl->qscale ? h->field_scan8x8_cavlc : > h->field_scan8x8_cavlc_q0; > - scan = sl->qscale ? h->field_scan : h->field_scan_q0; > - }else{ > - scan8x8 = sl->qscale ? h->zigzag_scan8x8_cavlc : > h->zigzag_scan8x8_cavlc_q0; > - scan = sl->qscale ? h->zigzag_scan : h->zigzag_scan_q0; > - } > - > dquant= get_se_golomb(&sl->gb); > > sl->qscale += dquant; > @@ -1117,6 +1109,14 @@ decode_intra_mb: > sl->chroma_qp[0] = get_chroma_qp(h->ps.pps, 0, sl->qscale); > sl->chroma_qp[1] = get_chroma_qp(h->ps.pps, 1, sl->qscale); > > + if(IS_INTERLACED(mb_type)){ > + scan8x8 = sl->qscale ? h->field_scan8x8_cavlc : > h->field_scan8x8_cavlc_q0; > + scan = sl->qscale ? h->field_scan : h->field_scan_q0; > + }else{ > + scan8x8 = sl->qscale ? h->zigzag_scan8x8_cavlc : > h->zigzag_scan8x8_cavlc_q0; > + scan = sl->qscale ? h->zigzag_scan : h->zigzag_scan_q0; > + } > + > if ((ret = decode_luma_residual(h, sl, gb, scan, scan8x8, > pixel_shift, mb_type, cbp, 0)) < 0 ) { > return -1; > } >
Beside the style nits, looks probably ok. _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
