Hi,
On Wed, Dec 28, 2011 at 11:21 AM, Ronald S. Bultje <[email protected]> wrote:
> Until line 1615, rest comes in a separate email.
> @@ -1615,146 +1705,195 @@ static av_always_inline void
> encode_mb_internal(MpegEncContext *s, int motion_x,
[..]
> + if (s->current_picture.mc_mb_var[s->mb_stride * mb_y + mb_x] <
> + 2 * s->qscale * s->qscale) {
4 more spaces indenting.
> + if (s->dsp.sad[1](NULL, ptr_y , dest_y,
> + wrap_y, 8) < 20 * s->qscale)
> + skip_dct[0] = 1;
> + if (s->dsp.sad[1](NULL, ptr_y + 8,
> + dest_y + 8, wrap_y, 8) < 20 * s->qscale)
> + skip_dct[1] = 1;
> + if (s->dsp.sad[1](NULL, ptr_y + dct_offset,
> + dest_y + dct_offset, wrap_y, 8) < 20 *
> s->qscale)
> + skip_dct[2] = 1;
> + if (s->dsp.sad[1](NULL, ptr_y + dct_offset + 8,
> + dest_y + dct_offset + 8, wrap_y, 8) <
> + 20 * s->qscale)
Try breaking earlier, so you get this:
if (s->dsp.sad(a, b, c,
d, e, f,
g) < ..)
..
> + if (s->dsp.sad[1](NULL, ptr_cb, dest_cb, wrap_c, 8) <
> + 20 * s->qscale)
> + skip_dct[4] = 1;
> + if (s->dsp.sad[1](NULL, ptr_cr, dest_cr, wrap_c, 8) <
> + 20 * s->qscale)
> + skip_dct[5] = 1;
Same for both.
> + if (!s->chroma_y_shift) { /* 422 */
> + if (s->dsp.sad[1](NULL, ptr_cb + (dct_offset >> 1),
> + dest_cb + (dct_offset >> 1), wrap_c, 8) <
> + 20 * s->qscale)
> + skip_dct[6] = 1;
> + if (s->dsp.sad[1](NULL, ptr_cr + (dct_offset >> 1),
> + dest_cr + (dct_offset >> 1), wrap_c, 8) <
> + 20 * s->qscale)
> + skip_dct[7] = 1;
> + }
Both second lines are wrongly indented, and for third line, see above.
Probably best to split in 4 lines:
if (s->dsp.sad[1](NULL, ..,
..,
.., ..) < ..)
..
> + // FIXME we could decide to change to quantizer instead of
> clipping
> + // JS: I don't think that would be a good idea it could
> lower quality instead
> + // of improve it. Just INTRADC clipping deserves changes
> in quantizer
80 characters.
Ronald
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
