[FFmpeg-devel] [PATCH] build: fix windows build issue introduced by 45bea45

[FFmpeg-devel] [PATCH] build: fix windows build issue introduced by 45bea45

[Nuo Mi]

We defined CR to 2 in libavcodec/vvc/dec.h, but the CR used by _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY winnt.h
reorder the header will avoid the issue.
---
 tests/checkasm/vvc_sao.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/checkasm/vvc_sao.c b/tests/checkasm/vvc_sao.c
index 9e6507b2c3..4ad40684fa 100644
--- a/tests/checkasm/vvc_sao.c
+++ b/tests/checkasm/vvc_sao.c
@@ -20,14 +20,13 @@
 
 #include <string.h>
 
+#include "checkasm.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem_internal.h"
 
 #include "libavcodec/vvc/dsp.h"
 #include "libavcodec/vvc/ctu.h"
 
-#include "checkasm.h"
-
 static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff };
 static const uint32_t sao_size[] = {8, 16, 32, 48, 64, 80, 96, 112, 128};
 
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] build: fix windows build issue introduced by 45bea45

[Zhao Zhili]

> On May 15, 2025, at 20:46, Nuo Mi <nuomi2021@gmail.com> wrote:
> 
> We defined CR to 2 in libavcodec/vvc/dec.h, but the CR used by _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY winnt.h
> reorder the header will avoid the issue.

There are similar issues of using short uppercase variable names or macro, e.g.,

f0f596dbc6b45b544d2d2d4fb78c0a2bdc3e6eb1

And

b1240c983f96271990c4262978a08edc8eb4df1f

How about limit the scope or add prefix to the macro?

> ---
> tests/checkasm/vvc_sao.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/tests/checkasm/vvc_sao.c b/tests/checkasm/vvc_sao.c
> index 9e6507b2c3..4ad40684fa 100644
> --- a/tests/checkasm/vvc_sao.c
> +++ b/tests/checkasm/vvc_sao.c
> @@ -20,14 +20,13 @@
> 
> #include <string.h>
> 
> +#include "checkasm.h"
> #include "libavutil/intreadwrite.h"
> #include "libavutil/mem_internal.h"
> 
> #include "libavcodec/vvc/dsp.h"
> #include "libavcodec/vvc/ctu.h"
> 
> -#include "checkasm.h"
> -
> static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff };
> static const uint32_t sao_size[] = {8, 16, 32, 48, 64, 80, 96, 112, 128};
> 
> -- 
> 2.34.1
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] build: fix windows build issue introduced by 45bea45

[softworkz .]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Nuo Mi
> Sent: Donnerstag, 15. Mai 2025 14:46
> To: ffmpeg-devel@ffmpeg.org
> Cc: Nuo Mi <nuomi2021@gmail.com>
> Subject: [FFmpeg-devel] [PATCH] build: fix windows build issue introduced by
> 45bea45
> 
> We defined CR to 2 in libavcodec/vvc/dec.h, but the CR used by
> _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY winnt.h
> reorder the header will avoid the issue.
> ---
>  tests/checkasm/vvc_sao.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/tests/checkasm/vvc_sao.c b/tests/checkasm/vvc_sao.c
> index 9e6507b2c3..4ad40684fa 100644
> --- a/tests/checkasm/vvc_sao.c
> +++ b/tests/checkasm/vvc_sao.c
> @@ -20,14 +20,13 @@
> 
>  #include <string.h>
> 
> +#include "checkasm.h"
>  #include "libavutil/intreadwrite.h"
>  #include "libavutil/mem_internal.h"
> 
>  #include "libavcodec/vvc/dsp.h"
>  #include "libavcodec/vvc/ctu.h"
> 
> -#include "checkasm.h"
> -
>  static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff };
>  static const uint32_t sao_size[] = {8, 16, 32, 48, 64, 80, 96, 112, 128};
> 
> --

LGTM - at least as an immediate fix for the builds (Zhao's suggestion can 
still be considered afterwards, I think)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] build: fix windows build issue introduced by 45bea45

[Nuo Mi]

Thank you, Zhili and softworkz, for the review.
Applied.

The purpose of the CR macro is to improve readability.
Adding a VVC_ prefix would make the code unnecessarily long and reduce
clarity.
I don't have a strong opinion on this, if either of you still feel that
VVC_CB is better.
I'm happy to make the change.

On Fri, May 16, 2025 at 4:31 AM softworkz . <softworkz@hotmail.com> wrote:

>
>
> > -----Original Message-----
> > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Nuo Mi
> > Sent: Donnerstag, 15. Mai 2025 14:46
> > To: ffmpeg-devel@ffmpeg.org
> > Cc: Nuo Mi <nuomi2021@gmail.com>
> > Subject: [FFmpeg-devel] [PATCH] build: fix windows build issue
> introduced by
> > 45bea45
> >
> > We defined CR to 2 in libavcodec/vvc/dec.h, but the CR used by
> > _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY winnt.h
> > reorder the header will avoid the issue.
> > ---
> >  tests/checkasm/vvc_sao.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/tests/checkasm/vvc_sao.c b/tests/checkasm/vvc_sao.c
> > index 9e6507b2c3..4ad40684fa 100644
> > --- a/tests/checkasm/vvc_sao.c
> > +++ b/tests/checkasm/vvc_sao.c
> > @@ -20,14 +20,13 @@
> >
> >  #include <string.h>
> >
> > +#include "checkasm.h"
> >  #include "libavutil/intreadwrite.h"
> >  #include "libavutil/mem_internal.h"
> >
> >  #include "libavcodec/vvc/dsp.h"
> >  #include "libavcodec/vvc/ctu.h"
> >
> > -#include "checkasm.h"
> > -
> >  static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff,
> 0x0fff0fff };
> >  static const uint32_t sao_size[] = {8, 16, 32, 48, 64, 80, 96, 112,
> 128};
> >
> > --
>
> LGTM - at least as an immediate fix for the builds (Zhao's suggestion can
> still be considered afterwards, I think)
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".