[FFmpeg-devel] [PATCH v2 02/19] swscale: rename SwsContext to SwsInternal

[Niklas Haas]

On Mon, 14 Oct 2024 19:49:21 +0200 Michael Niedermayer <michael at niedermayer.cc> wrote:
> On Mon, Oct 14, 2024 at 06:39:21PM +0200, Michael Niedermayer wrote:
> > On Mon, Oct 14, 2024 at 06:02:45PM +0200, Niklas Haas wrote:
> > > On Mon, 14 Oct 2024 16:55:39 +0200 Michael Niedermayer <michael at niedermayer.cc> wrote:
> > > > On Mon, Oct 14, 2024 at 03:37:27PM +0200, Niklas Haas wrote:
> > > > > From: Niklas Haas <git at haasn.dev>
> > > > >
> > > > > And preserve the public SwsContext as separate name. The motivation here
> > > > > is that I want to turn SwsContext into a public struct, while keeping the
> > > > > internal implementation hidden. Additionally, I also want to be able to
> > > > > use multiple internal implementations, e.g. for GPU devices.
> > > > >
> > > > > This commit does not include any functional changes. For the most part, it is
> > > > > a simple rename. The only complications arise from the public facing API
> > > > > functions, which preserve their current type (and hence require an additional
> > > > > unwrapping step internally), and the checkasm test framework, which directly
> > > > > accesses SwsInternal.
> > > > >
> > > > > For consistency, the affected functions that need to maintain a distionction
> > > > > have generally been changed to refer to the SwsContext as *sws, and the
> > > > > SwsInternal as *c.
> > > > >
> > > > > In an upcoming commit, I will provide a backing definition for the public
> > > > > SwsContext, and update `sws_internal()` to dereference the internal struct
> > > > > instead of merely casting it.
> > > > >
> > > > > Sponsored-by: Sovereign Tech Fund
> > > > > Signed-off-by: Niklas Haas <git at haasn.dev>
> > > >
> > > > does not apply
> > > >
> > > >
> > > > Applying: swscale: rename SwsContext to SwsInternal
> > > > Using index info to reconstruct a base tree...
> > > > M	libswscale/output.c
> > > > M	libswscale/utils.c
> > > > Falling back to patching base and 3-way merge...
> > > > Auto-merging libswscale/utils.c
> > > > Auto-merging libswscale/output.c
> > > > CONFLICT (content): Merge conflict in libswscale/output.c
> > > > error: Failed to merge in the changes.
> > > > Patch failed at 0001 swscale: rename SwsContext to SwsInternal
> > > > hint: Use 'git am --show-current-patch=diff' to see the failed patch
> > > > hint: When you have resolved this problem, run "git am --continue".
> > > > hint: If you prefer to skip this patch, run "git am --skip" instead.
> > > > hint: To restore the original branch and stop patching, run "git am --abort".
> > > > hint: Disable this message with "git config advice.mergeConflict false"
> > > >
> > > > thx
> > >
> > > I've rebased it here:
> > >
> > > https://github.com/haasn/FFmpeg/tree/swscale4
> >
> > on x86-32 linux
> >
> > make
> > CC	libswscale/alphablend.o
> > In file included from src/libavutil/internal.h:39:0,
> >                  from src/libavutil/common.h:50,
> >                  from src/libavutil/avutil.h:301,
> >                  from src/libswscale/swscale.h:33,
> >                  from src/libswscale/swscale_internal.h:28,
> >                  from src/libswscale/alphablend.c:21:
> > src/libswscale/swscale_internal.h:682:1: error: static assertion failed: "yuv2rgb_y_offset must be updated in x86 asm"
> >  static_assert(offsetof(SwsInternal, yuv2rgb_y_offset) == 40348,
> >  ^
> > make: *** [src/ffbuild/common.mak:81: libswscale/alphablend.o] Error 1
>
> and on qemu-MIPS: (big endian issue maybe)
>
> --- src/tests/ref/fate/sws-yuv-colorspace	2024-10-14 18:05:24.495328917 +0200
> +++ tests/data/fate/sws-yuv-colorspace	2024-10-14 18:41:48.656863487 +0200
> @@ -3,4 +3,4 @@
>  #codec_id 0: rawvideo
>  #dimensions 0: 352x288
>  #sar 0: 0/1
> -0,          0,          0,        1,   152064, 0xcbcb97b9
> +0,          0,          0,        1,   152064, 0x956698d5
> TEST    acodec-pcm-u8
> Test sws-yuv-colorspace failed. Look at tests/data/fate/sws-yuv-colorspace.err for

Do you have a command line I could copy to reproduce this?

>
>
> [...]
>
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> No great genius has ever existed without some touch of madness. -- Aristotle
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".