Re: [FFmpeg-devel] [PATCH 1/3] avcodec/vc1: fix condition guarding overlap filter on I picture

2018-06-28 Thread Carl Eugen Hoyos
2018-06-20 13:10 GMT+02:00, Jerome Borsboom :
> The overlap filter needs to run when PQUANT is 9 or higher, irrespective
> of CONDOVER.
>
> Signed-off-by: Jerome Borsboom 
> ---
> This patch set should fix decoding of the SA10125.vc1 test file to make it
> bit-equal to the reference decoder.

Patch set applied.

Thank you, Carl Eugen
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


Re: [FFmpeg-devel] [PATCH 1/3] avcodec/vc1: fix condition guarding overlap filter on I picture

2018-06-20 Thread Jerome Borsboom
> SA10178.vc1: 18 frames ok, last 7 frames are different

this one decodes correctly when you force bitexact decoding:

ffmpeg -bitexact -i SA10178.vc1 SA10178_s.yuv

This is caused by the issue that my rejected patch 'avcodec/x86/hpeldsp:
fix half pel interpolation' tried to resolve. The proposed solution to
make bitexact decoding the default for VC-1 seems right.


Regards,
Jerome
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


Re: [FFmpeg-devel] [PATCH 1/3] avcodec/vc1: fix condition guarding overlap filter on I picture

2018-06-20 Thread Carl Eugen Hoyos
2018-06-20 13:10 GMT+02:00, Jerome Borsboom :
> The overlap filter needs to run when PQUANT is 9 or higher, irrespective
> of CONDOVER.
>
> Signed-off-by: Jerome Borsboom 
> ---
> This patch set should fix decoding of the SA10125.vc1 test file to make it
> bit-equal to the reference decoder.

I can confirm that this patchset fixes SA10125.vc1 and a few other files.
The remaining files with issues are:
SA10135.vc1: Shows an error message ("missing cbpcy_vlc") and produces
wrong output
SA10178.vc1: 18 frames ok, last 7 frames are different

Several samples show an error that luma scaling and chroma scaling are
not supported and produce incorrect output, for example SA00048.vc1.
A few samples use pan-scan which is not supported by FFmpeg, for
example SA10164.vc1 - a warning is shown.

Thank you, Carl Eugen
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


[FFmpeg-devel] [PATCH 1/3] avcodec/vc1: fix condition guarding overlap filter on I picture

2018-06-20 Thread Jerome Borsboom
The overlap filter needs to run when PQUANT is 9 or higher, irrespective
of CONDOVER.

Signed-off-by: Jerome Borsboom 
---
This patch set should fix decoding of the SA10125.vc1 test file to make it
bit-equal to the reference decoder.

 libavcodec/vc1_block.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c
index c620566f78..b58b71b3e0 100644
--- a/libavcodec/vc1_block.c
+++ b/libavcodec/vc1_block.c
@@ -2726,7 +2726,7 @@ static void vc1_decode_i_blocks_adv(VC1Context *v)
 v->vc1dsp.vc1_inv_trans_8x8(block[k]);
 }
 
-if (v->overlap && v->condover != CONDOVER_NONE)
+if (v->overlap && (v->pq >= 9 || v->condover != CONDOVER_NONE))
 ff_vc1_i_overlap_filter(v);
 vc1_put_blocks_clamped(v, 1);
 if (v->s.loop_filter)
-- 
2.13.6


___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel