[FFmpeg-devel] [PATCH 2/2] svq3: stop using clear_blocks().

[Ronald S. Bultje]

Hi,

On Mon, Feb 18, 2013 at 7:39 AM, Ronald S. Bultje <rsbultje at gmail.com> wrote:
> Hi,
>
> On Feb 18, 2013 6:37 AM, "Michael Niedermayer" <michaelni at gmx.at> wrote:
>>
>> On Sun, Feb 17, 2013 at 05:01:27PM -0800, Ronald S. Bultje wrote:
>> > From: "Ronald S. Bultje" <rsbultje at gmail.com>
>> >
>> > The clearing of block coefficients is now integrated in the IDCT.
>> > ---
>> >  libavcodec/svq3.c | 2 --
>> >  1 file changed, 2 deletions(-)
>> >
>> > diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
>> > index 1c41153..ad90f93 100644
>> > --- a/libavcodec/svq3.c
>> > +++ b/libavcodec/svq3.c
>> > @@ -671,8 +671,6 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned
>> > int mb_type)
>> >      }
>> >      if (!IS_SKIP(mb_type) || h->pict_type == AV_PICTURE_TYPE_B) {
>> >          memset(h->non_zero_count_cache + 8, 0, 14 * 8 *
>> > sizeof(uint8_t));
>> > -        h->dsp.clear_blocks(h->mb +   0);
>> > -        h->dsp.clear_blocks(h->mb + 384);
>> >      }
>>
>> This causes artifacts with:
>> http://samples.ffmpeg.org/mov/watermark/svq3_watermark.mov
>
> It depends on the h264 clear blocks idct merge patch.

Do you want me to squash it with that one? They really belong together...

Ronald