diff mbox

[FFmpeg-devel,1/2] fate: add fate-sws-pixdesc-query

Message ID CAB0OVGqLiwA=qmyTVAi4Jfsuvi4t0q0G252MZFk25HUoS3LNDQ@mail.gmail.com
State Not Applicable
Headers show

Commit Message

Carl Eugen Hoyos July 23, 2017, 11:55 p.m. UTC
2017-03-19 15:00 GMT+01:00 Clément Bœsch <u@pkh.me>:
> Test the pixel format querying within libswscale.

Afaict, this broke fate on big-endian:
$ make fate-sws-pixdesc-query
TEST    sws-pixdesc-query
Test sws-pixdesc-query failed. Look at
tests/data/fate/sws-pixdesc-query.err for details.
make: *** [fate-sws-pixdesc-query] Error 1

Carl Eugen

Comments

Clément Bœsch July 24, 2017, 3:03 p.m. UTC | #1
On Mon, Jul 24, 2017 at 01:55:40AM +0200, Carl Eugen Hoyos wrote:
> 2017-03-19 15:00 GMT+01:00 Clément Bœsch <u@pkh.me>:
> > Test the pixel format querying within libswscale.
> 
> Afaict, this broke fate on big-endian:
> $ make fate-sws-pixdesc-query
> TEST    sws-pixdesc-query
> --- ./tests/ref/fate/sws-pixdesc-query  2017-07-23 16:42:59.000000000 -0700
> +++ tests/data/fate/sws-pixdesc-query   2017-07-23 16:50:48.000000000 -0700
> @@ -407,8 +407,8 @@
>     rgb8
>     rgb4
>     rgb4_byte
> -   abgr
> -   bgra
> +   argb
> +   rgba
>     rgb48be
>     rgb48le
>     rgb565be
> @@ -427,8 +427,8 @@
>     bgr8
>     bgr4
>     bgr4_byte
> -   argb
> -   rgba
> +   abgr
> +   bgra
>     bgr565be
>     bgr565le
>     bgr555be
> Test sws-pixdesc-query failed. Look at
> tests/data/fate/sws-pixdesc-query.err for details.
> make: *** [fate-sws-pixdesc-query] Error 1
> 

can you try https://github.com/ubitux/FFmpeg/tree/sws-query ?
Carl Eugen Hoyos July 24, 2017, 6:02 p.m. UTC | #2
2017-07-24 17:03 GMT+02:00 Clément Bœsch <u@pkh.me>:
> On Mon, Jul 24, 2017 at 01:55:40AM +0200, Carl Eugen Hoyos wrote:
>> 2017-03-19 15:00 GMT+01:00 Clément Bœsch <u@pkh.me>:
>> > Test the pixel format querying within libswscale.
>>
>> Afaict, this broke fate on big-endian:
>> $ make fate-sws-pixdesc-query
>> TEST    sws-pixdesc-query
>> --- ./tests/ref/fate/sws-pixdesc-query  2017-07-23 16:42:59.000000000 -0700
>> +++ tests/data/fate/sws-pixdesc-query   2017-07-23 16:50:48.000000000 -0700
>> @@ -407,8 +407,8 @@
>>     rgb8
>>     rgb4
>>     rgb4_byte
>> -   abgr
>> -   bgra
>> +   argb
>> +   rgba
>>     rgb48be
>>     rgb48le
>>     rgb565be
>> @@ -427,8 +427,8 @@
>>     bgr8
>>     bgr4
>>     bgr4_byte
>> -   argb
>> -   rgba
>> +   abgr
>> +   bgra
>>     bgr565be
>>     bgr565le
>>     bgr555be
>> Test sws-pixdesc-query failed. Look at
>> tests/data/fate/sws-pixdesc-query.err for details.
>> make: *** [fate-sws-pixdesc-query] Error 1
>>
>
> can you try https://github.com/ubitux/FFmpeg/tree/sws-query ?

It works, thank you!

I just sent an alternative approach, I believe it is less convoluted
and simplifies the existing code but has the disadvantage that I
also have to fix five asm functions.

Do you prefer your approach?

Carl Eugen
Clément Bœsch July 24, 2017, 6:32 p.m. UTC | #3
On Mon, Jul 24, 2017 at 08:02:25PM +0200, Carl Eugen Hoyos wrote:
> 2017-07-24 17:03 GMT+02:00 Clément Bœsch <u@pkh.me>:
> > On Mon, Jul 24, 2017 at 01:55:40AM +0200, Carl Eugen Hoyos wrote:
> >> 2017-03-19 15:00 GMT+01:00 Clément Bœsch <u@pkh.me>:
> >> > Test the pixel format querying within libswscale.
> >>
> >> Afaict, this broke fate on big-endian:
> >> $ make fate-sws-pixdesc-query
> >> TEST    sws-pixdesc-query
> >> --- ./tests/ref/fate/sws-pixdesc-query  2017-07-23 16:42:59.000000000 -0700
> >> +++ tests/data/fate/sws-pixdesc-query   2017-07-23 16:50:48.000000000 -0700
> >> @@ -407,8 +407,8 @@
> >>     rgb8
> >>     rgb4
> >>     rgb4_byte
> >> -   abgr
> >> -   bgra
> >> +   argb
> >> +   rgba
> >>     rgb48be
> >>     rgb48le
> >>     rgb565be
> >> @@ -427,8 +427,8 @@
> >>     bgr8
> >>     bgr4
> >>     bgr4_byte
> >> -   argb
> >> -   rgba
> >> +   abgr
> >> +   bgra
> >>     bgr565be
> >>     bgr565le
> >>     bgr555be
> >> Test sws-pixdesc-query failed. Look at
> >> tests/data/fate/sws-pixdesc-query.err for details.
> >> make: *** [fate-sws-pixdesc-query] Error 1
> >>
> >
> > can you try https://github.com/ubitux/FFmpeg/tree/sws-query ?
> 
> It works, thank you!
> 
> I just sent an alternative approach, I believe it is less convoluted
> and simplifies the existing code but has the disadvantage that I
> also have to fix five asm functions.
> 
> Do you prefer your approach?
> 

I won't comment on the swscale part, I leave that to the sws maintainer.
No opinion in particular.

That patchset can still be applied, at least the first 2 patches, as
convenience (sorted pix fmt, more predictable output).
Clément Bœsch July 30, 2017, 2:09 p.m. UTC | #4
On Mon, Jul 24, 2017 at 08:02:25PM +0200, Carl Eugen Hoyos wrote:
> 2017-07-24 17:03 GMT+02:00 Clément Bœsch <u@pkh.me>:
> > On Mon, Jul 24, 2017 at 01:55:40AM +0200, Carl Eugen Hoyos wrote:
> >> 2017-03-19 15:00 GMT+01:00 Clément Bœsch <u@pkh.me>:
> >> > Test the pixel format querying within libswscale.
> >>
> >> Afaict, this broke fate on big-endian:
> >> $ make fate-sws-pixdesc-query
> >> TEST    sws-pixdesc-query
> >> --- ./tests/ref/fate/sws-pixdesc-query  2017-07-23 16:42:59.000000000 -0700
> >> +++ tests/data/fate/sws-pixdesc-query   2017-07-23 16:50:48.000000000 -0700
> >> @@ -407,8 +407,8 @@
> >>     rgb8
> >>     rgb4
> >>     rgb4_byte
> >> -   abgr
> >> -   bgra
> >> +   argb
> >> +   rgba
> >>     rgb48be
> >>     rgb48le
> >>     rgb565be
> >> @@ -427,8 +427,8 @@
> >>     bgr8
> >>     bgr4
> >>     bgr4_byte
> >> -   argb
> >> -   rgba
> >> +   abgr
> >> +   bgra
> >>     bgr565be
> >>     bgr565le
> >>     bgr555be
> >> Test sws-pixdesc-query failed. Look at
> >> tests/data/fate/sws-pixdesc-query.err for details.
> >> make: *** [fate-sws-pixdesc-query] Error 1
> >>
> >
> > can you try https://github.com/ubitux/FFmpeg/tree/sws-query ?
> 
> It works, thank you!
> 

Applied, as it should fix ticket #6554.

Thanks for the test

[...]
diff mbox

Patch

--- ./tests/ref/fate/sws-pixdesc-query  2017-07-23 16:42:59.000000000 -0700
+++ tests/data/fate/sws-pixdesc-query   2017-07-23 16:50:48.000000000 -0700
@@ -407,8 +407,8 @@ 
    rgb8
    rgb4
    rgb4_byte
-   abgr
-   bgra
+   argb
+   rgba
    rgb48be
    rgb48le
    rgb565be
@@ -427,8 +427,8 @@ 
    bgr8
    bgr4
    bgr4_byte
-   argb
-   rgba
+   abgr
+   bgra
    bgr565be
    bgr565le
    bgr555be