diff mbox series

[FFmpeg-devel] exclude currently unused 0.17% of fate samples from rsync

Message ID 20230810152704.6670-1-michael@niedermayer.cc
State New
Headers show
Series [FFmpeg-devel] exclude currently unused 0.17% of fate samples from rsync | expand

Checks

Context Check Description
andriy/commit_msg_x86 warning The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ".
yinshiyou/commit_msg_loongarch64 warning The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ".
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Michael Niedermayer Aug. 10, 2023, 3:27 p.m. UTC
Several developers where upset, that from the over 1gb of fate samples 2mb are only used
by the ffmpeg branch with SDR support in https://git.ffmpeg.org/libavradio

This avoids these samples from being downloaded or synchronized.
It should have no real world effect on anything of course if 0.17% more or
less is downloaded but maybe it makes some people happier.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 configure      | 2 ++
 tests/Makefile | 1 +
 2 files changed, 3 insertions(+)

Comments

Vittorio Giovara Aug. 11, 2023, 4:17 p.m. UTC | #1
On Thu, Aug 10, 2023 at 5:27 PM Michael Niedermayer <michael@niedermayer.cc>
wrote:

> Several developers where upset, that from the over 1gb of fate samples 2mb
> are only used
> by the ffmpeg branch with SDR support in https://git.ffmpeg.org/libavradio
>
> This avoids these samples from being downloaded or synchronized.
> It should have no real world effect on anything of course if 0.17% more or
> less is downloaded but maybe it makes some people happier.
>
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  configure      | 2 ++
>  tests/Makefile | 1 +
>  2 files changed, 3 insertions(+)
>
> diff --git a/configure b/configure
> index 932998b8d6..f859701ebd 100755
> --- a/configure
> +++ b/configure
> @@ -2384,6 +2384,7 @@ TOOLCHAIN_FEATURES="
>      inline_asm_nonlocal_labels
>      pragma_deprecated
>      rsync_contimeout
> +    rsync_exclude
>      symver_asm_label
>      symver_gnu_asm
>      vfp_args
> @@ -6968,6 +6969,7 @@ disabled makeinfo_html && texi2html --help 2>
> /dev/null | grep -q 'init-file' &&
>  perl -v            > /dev/null 2>&1 && enable perl      || disable perl
>  pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable pod2man
>  rsync --help 2> /dev/null | grep -q 'contimeout' && enable
> rsync_contimeout || disable rsync_contimeout
> +rsync --help 2> /dev/null | grep -q -- '--exclude' && enable
> rsync_exclude || disable rsync_exclude
>  xmllint --version  > /dev/null 2>&1 && enable xmllint   || disable xmllint
>
>  # check V4L2 codecs available in the API
> diff --git a/tests/Makefile b/tests/Makefile
> index e09f30a0fc..45db76695e 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -265,6 +265,7 @@ FATE_EXTERN                   += $(FATE_EXTERN-yes)
> $(FATE_SAMPLES_FASTSTART)
>  FATE += $(FATE-yes)
>
>  RSYNC_OPTIONS-$(HAVE_RSYNC_CONTIMEOUT) += --contimeout=60
> +RSYNC_OPTIONS-$(HAVE_RSYNC_EXCLUDE)    += --exclude=/sdr/
>

This causes a list of folders to be maintained in the Makefile code which
I'm not sure is kosher
Would it not be simpler to just delete the sdr folder?
Michael Niedermayer Aug. 12, 2023, 2:19 p.m. UTC | #2
On Fri, Aug 11, 2023 at 06:17:29PM +0200, Vittorio Giovara wrote:
> On Thu, Aug 10, 2023 at 5:27 PM Michael Niedermayer <michael@niedermayer.cc>
> wrote:
> 
> > Several developers where upset, that from the over 1gb of fate samples 2mb
> > are only used
> > by the ffmpeg branch with SDR support in https://git.ffmpeg.org/libavradio
> >
> > This avoids these samples from being downloaded or synchronized.
> > It should have no real world effect on anything of course if 0.17% more or
> > less is downloaded but maybe it makes some people happier.
> >
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  configure      | 2 ++
> >  tests/Makefile | 1 +
> >  2 files changed, 3 insertions(+)
> >
> > diff --git a/configure b/configure
> > index 932998b8d6..f859701ebd 100755
> > --- a/configure
> > +++ b/configure
> > @@ -2384,6 +2384,7 @@ TOOLCHAIN_FEATURES="
> >      inline_asm_nonlocal_labels
> >      pragma_deprecated
> >      rsync_contimeout
> > +    rsync_exclude
> >      symver_asm_label
> >      symver_gnu_asm
> >      vfp_args
> > @@ -6968,6 +6969,7 @@ disabled makeinfo_html && texi2html --help 2>
> > /dev/null | grep -q 'init-file' &&
> >  perl -v            > /dev/null 2>&1 && enable perl      || disable perl
> >  pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable pod2man
> >  rsync --help 2> /dev/null | grep -q 'contimeout' && enable
> > rsync_contimeout || disable rsync_contimeout
> > +rsync --help 2> /dev/null | grep -q -- '--exclude' && enable
> > rsync_exclude || disable rsync_exclude
> >  xmllint --version  > /dev/null 2>&1 && enable xmllint   || disable xmllint
> >
> >  # check V4L2 codecs available in the API
> > diff --git a/tests/Makefile b/tests/Makefile
> > index e09f30a0fc..45db76695e 100644
> > --- a/tests/Makefile
> > +++ b/tests/Makefile
> > @@ -265,6 +265,7 @@ FATE_EXTERN                   += $(FATE_EXTERN-yes)
> > $(FATE_SAMPLES_FASTSTART)
> >  FATE += $(FATE-yes)
> >
> >  RSYNC_OPTIONS-$(HAVE_RSYNC_CONTIMEOUT) += --contimeout=60
> > +RSYNC_OPTIONS-$(HAVE_RSYNC_EXCLUDE)    += --exclude=/sdr/
> >
> 
> This causes a list of folders to be maintained in the Makefile code which
> I'm not sure is kosher

Its only temporary.
If we succeed implementing what jb suggested then there will be a
sdr (demuxer/input) module in git master. And a new libavradio
that module in git master will still need the testfiles, so when
the module is added then these --exclude cases become unneeded


> Would it not be simpler to just delete the sdr folder?

on the client, it would cause it to be redownloaded,
on the server, it would break libavradio, and especially when
we are trying to refactor the code to move some of it into a seperate libavradio
(which i dont yet know how easy that will be)
it will be important to ensure that nothing breaks when stuff is refactored
so i would prefer to leave this on the server for ease of testing for everyone

thx

[...]
Paul B Mahol Aug. 12, 2023, 3:07 p.m. UTC | #3
On Sat, Aug 12, 2023 at 4:19 PM Michael Niedermayer <michael@niedermayer.cc>
wrote:

> On Fri, Aug 11, 2023 at 06:17:29PM +0200, Vittorio Giovara wrote:
> > On Thu, Aug 10, 2023 at 5:27 PM Michael Niedermayer <
> michael@niedermayer.cc>
> > wrote:
> >
> > > Several developers where upset, that from the over 1gb of fate samples
> 2mb
> > > are only used
> > > by the ffmpeg branch with SDR support in
> https://git.ffmpeg.org/libavradio
> > >
> > > This avoids these samples from being downloaded or synchronized.
> > > It should have no real world effect on anything of course if 0.17%
> more or
> > > less is downloaded but maybe it makes some people happier.
> > >
> > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > > ---
> > >  configure      | 2 ++
> > >  tests/Makefile | 1 +
> > >  2 files changed, 3 insertions(+)
> > >
> > > diff --git a/configure b/configure
> > > index 932998b8d6..f859701ebd 100755
> > > --- a/configure
> > > +++ b/configure
> > > @@ -2384,6 +2384,7 @@ TOOLCHAIN_FEATURES="
> > >      inline_asm_nonlocal_labels
> > >      pragma_deprecated
> > >      rsync_contimeout
> > > +    rsync_exclude
> > >      symver_asm_label
> > >      symver_gnu_asm
> > >      vfp_args
> > > @@ -6968,6 +6969,7 @@ disabled makeinfo_html && texi2html --help 2>
> > > /dev/null | grep -q 'init-file' &&
> > >  perl -v            > /dev/null 2>&1 && enable perl      || disable
> perl
> > >  pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable
> pod2man
> > >  rsync --help 2> /dev/null | grep -q 'contimeout' && enable
> > > rsync_contimeout || disable rsync_contimeout
> > > +rsync --help 2> /dev/null | grep -q -- '--exclude' && enable
> > > rsync_exclude || disable rsync_exclude
> > >  xmllint --version  > /dev/null 2>&1 && enable xmllint   || disable
> xmllint
> > >
> > >  # check V4L2 codecs available in the API
> > > diff --git a/tests/Makefile b/tests/Makefile
> > > index e09f30a0fc..45db76695e 100644
> > > --- a/tests/Makefile
> > > +++ b/tests/Makefile
> > > @@ -265,6 +265,7 @@ FATE_EXTERN                   += $(FATE_EXTERN-yes)
> > > $(FATE_SAMPLES_FASTSTART)
> > >  FATE += $(FATE-yes)
> > >
> > >  RSYNC_OPTIONS-$(HAVE_RSYNC_CONTIMEOUT) += --contimeout=60
> > > +RSYNC_OPTIONS-$(HAVE_RSYNC_EXCLUDE)    += --exclude=/sdr/
> > >
> >
> > This causes a list of folders to be maintained in the Makefile code which
> > I'm not sure is kosher
>
> Its only temporary.
> If we succeed implementing what jb suggested then there will be a
> sdr (demuxer/input) module in git master. And a new libavradio
> that module in git master will still need the testfiles, so when
> the module is added then these --exclude cases become unneeded
>
>
> > Would it not be simpler to just delete the sdr folder?
>
> on the client, it would cause it to be redownloaded,
> on the server, it would break libavradio, and especially when
> we are trying to refactor the code to move some of it into a seperate
> libavradio
> (which i dont yet know how easy that will be)
> it will be important to ensure that nothing breaks when stuff is refactored
> so i would prefer to leave this on the server for ease of testing for
> everyone
>
> thx
>

You become such a nuisance for project.


>
> [...]
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> No human being will ever know the Truth, for even if they happen to say it
> by chance, they would not even known they had done so. -- Xenophanes
> _______________________________________________
> 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".
>
James Almer Aug. 12, 2023, 3:09 p.m. UTC | #4
On 8/12/2023 12:07 PM, Paul B Mahol wrote:
> On Sat, Aug 12, 2023 at 4:19 PM Michael Niedermayer <michael@niedermayer.cc>
> wrote:
> 
>> On Fri, Aug 11, 2023 at 06:17:29PM +0200, Vittorio Giovara wrote:
>>> On Thu, Aug 10, 2023 at 5:27 PM Michael Niedermayer <
>> michael@niedermayer.cc>
>>> wrote:
>>>
>>>> Several developers where upset, that from the over 1gb of fate samples
>> 2mb
>>>> are only used
>>>> by the ffmpeg branch with SDR support in
>> https://git.ffmpeg.org/libavradio
>>>>
>>>> This avoids these samples from being downloaded or synchronized.
>>>> It should have no real world effect on anything of course if 0.17%
>> more or
>>>> less is downloaded but maybe it makes some people happier.
>>>>
>>>> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
>>>> ---
>>>>   configure      | 2 ++
>>>>   tests/Makefile | 1 +
>>>>   2 files changed, 3 insertions(+)
>>>>
>>>> diff --git a/configure b/configure
>>>> index 932998b8d6..f859701ebd 100755
>>>> --- a/configure
>>>> +++ b/configure
>>>> @@ -2384,6 +2384,7 @@ TOOLCHAIN_FEATURES="
>>>>       inline_asm_nonlocal_labels
>>>>       pragma_deprecated
>>>>       rsync_contimeout
>>>> +    rsync_exclude
>>>>       symver_asm_label
>>>>       symver_gnu_asm
>>>>       vfp_args
>>>> @@ -6968,6 +6969,7 @@ disabled makeinfo_html && texi2html --help 2>
>>>> /dev/null | grep -q 'init-file' &&
>>>>   perl -v            > /dev/null 2>&1 && enable perl      || disable
>> perl
>>>>   pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable
>> pod2man
>>>>   rsync --help 2> /dev/null | grep -q 'contimeout' && enable
>>>> rsync_contimeout || disable rsync_contimeout
>>>> +rsync --help 2> /dev/null | grep -q -- '--exclude' && enable
>>>> rsync_exclude || disable rsync_exclude
>>>>   xmllint --version  > /dev/null 2>&1 && enable xmllint   || disable
>> xmllint
>>>>
>>>>   # check V4L2 codecs available in the API
>>>> diff --git a/tests/Makefile b/tests/Makefile
>>>> index e09f30a0fc..45db76695e 100644
>>>> --- a/tests/Makefile
>>>> +++ b/tests/Makefile
>>>> @@ -265,6 +265,7 @@ FATE_EXTERN                   += $(FATE_EXTERN-yes)
>>>> $(FATE_SAMPLES_FASTSTART)
>>>>   FATE += $(FATE-yes)
>>>>
>>>>   RSYNC_OPTIONS-$(HAVE_RSYNC_CONTIMEOUT) += --contimeout=60
>>>> +RSYNC_OPTIONS-$(HAVE_RSYNC_EXCLUDE)    += --exclude=/sdr/
>>>>
>>>
>>> This causes a list of folders to be maintained in the Makefile code which
>>> I'm not sure is kosher
>>
>> Its only temporary.
>> If we succeed implementing what jb suggested then there will be a
>> sdr (demuxer/input) module in git master. And a new libavradio
>> that module in git master will still need the testfiles, so when
>> the module is added then these --exclude cases become unneeded
>>
>>
>>> Would it not be simpler to just delete the sdr folder?
>>
>> on the client, it would cause it to be redownloaded,
>> on the server, it would break libavradio, and especially when
>> we are trying to refactor the code to move some of it into a seperate
>> libavradio
>> (which i dont yet know how easy that will be)
>> it will be important to ensure that nothing breaks when stuff is refactored
>> so i would prefer to leave this on the server for ease of testing for
>> everyone
>>
>> thx
>>
> 
> You become such a nuisance for project.

Could you please stop being so inflammatory for no reason?
Paul B Mahol Aug. 12, 2023, 3:10 p.m. UTC | #5
On Sat, Aug 12, 2023 at 5:09 PM James Almer <jamrial@gmail.com> wrote:

> On 8/12/2023 12:07 PM, Paul B Mahol wrote:
> > On Sat, Aug 12, 2023 at 4:19 PM Michael Niedermayer <
> michael@niedermayer.cc>
> > wrote:
> >
> >> On Fri, Aug 11, 2023 at 06:17:29PM +0200, Vittorio Giovara wrote:
> >>> On Thu, Aug 10, 2023 at 5:27 PM Michael Niedermayer <
> >> michael@niedermayer.cc>
> >>> wrote:
> >>>
> >>>> Several developers where upset, that from the over 1gb of fate samples
> >> 2mb
> >>>> are only used
> >>>> by the ffmpeg branch with SDR support in
> >> https://git.ffmpeg.org/libavradio
> >>>>
> >>>> This avoids these samples from being downloaded or synchronized.
> >>>> It should have no real world effect on anything of course if 0.17%
> >> more or
> >>>> less is downloaded but maybe it makes some people happier.
> >>>>
> >>>> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> >>>> ---
> >>>>   configure      | 2 ++
> >>>>   tests/Makefile | 1 +
> >>>>   2 files changed, 3 insertions(+)
> >>>>
> >>>> diff --git a/configure b/configure
> >>>> index 932998b8d6..f859701ebd 100755
> >>>> --- a/configure
> >>>> +++ b/configure
> >>>> @@ -2384,6 +2384,7 @@ TOOLCHAIN_FEATURES="
> >>>>       inline_asm_nonlocal_labels
> >>>>       pragma_deprecated
> >>>>       rsync_contimeout
> >>>> +    rsync_exclude
> >>>>       symver_asm_label
> >>>>       symver_gnu_asm
> >>>>       vfp_args
> >>>> @@ -6968,6 +6969,7 @@ disabled makeinfo_html && texi2html --help 2>
> >>>> /dev/null | grep -q 'init-file' &&
> >>>>   perl -v            > /dev/null 2>&1 && enable perl      || disable
> >> perl
> >>>>   pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable
> >> pod2man
> >>>>   rsync --help 2> /dev/null | grep -q 'contimeout' && enable
> >>>> rsync_contimeout || disable rsync_contimeout
> >>>> +rsync --help 2> /dev/null | grep -q -- '--exclude' && enable
> >>>> rsync_exclude || disable rsync_exclude
> >>>>   xmllint --version  > /dev/null 2>&1 && enable xmllint   || disable
> >> xmllint
> >>>>
> >>>>   # check V4L2 codecs available in the API
> >>>> diff --git a/tests/Makefile b/tests/Makefile
> >>>> index e09f30a0fc..45db76695e 100644
> >>>> --- a/tests/Makefile
> >>>> +++ b/tests/Makefile
> >>>> @@ -265,6 +265,7 @@ FATE_EXTERN                   +=
> $(FATE_EXTERN-yes)
> >>>> $(FATE_SAMPLES_FASTSTART)
> >>>>   FATE += $(FATE-yes)
> >>>>
> >>>>   RSYNC_OPTIONS-$(HAVE_RSYNC_CONTIMEOUT) += --contimeout=60
> >>>> +RSYNC_OPTIONS-$(HAVE_RSYNC_EXCLUDE)    += --exclude=/sdr/
> >>>>
> >>>
> >>> This causes a list of folders to be maintained in the Makefile code
> which
> >>> I'm not sure is kosher
> >>
> >> Its only temporary.
> >> If we succeed implementing what jb suggested then there will be a
> >> sdr (demuxer/input) module in git master. And a new libavradio
> >> that module in git master will still need the testfiles, so when
> >> the module is added then these --exclude cases become unneeded
> >>
> >>
> >>> Would it not be simpler to just delete the sdr folder?
> >>
> >> on the client, it would cause it to be redownloaded,
> >> on the server, it would break libavradio, and especially when
> >> we are trying to refactor the code to move some of it into a seperate
> >> libavradio
> >> (which i dont yet know how easy that will be)
> >> it will be important to ensure that nothing breaks when stuff is
> refactored
> >> so i would prefer to leave this on the server for ease of testing for
> >> everyone
> >>
> >> thx
> >>
> >
> > You become such a nuisance for project.
>
> Could you please stop being so inflammatory for no reason?
>

I have reasons. And you are just going with the flow.


> _______________________________________________
> 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".
>
diff mbox series

Patch

diff --git a/configure b/configure
index 932998b8d6..f859701ebd 100755
--- a/configure
+++ b/configure
@@ -2384,6 +2384,7 @@  TOOLCHAIN_FEATURES="
     inline_asm_nonlocal_labels
     pragma_deprecated
     rsync_contimeout
+    rsync_exclude
     symver_asm_label
     symver_gnu_asm
     vfp_args
@@ -6968,6 +6969,7 @@  disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' &&
 perl -v            > /dev/null 2>&1 && enable perl      || disable perl
 pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable pod2man
 rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
+rsync --help 2> /dev/null | grep -q -- '--exclude' && enable rsync_exclude || disable rsync_exclude
 xmllint --version  > /dev/null 2>&1 && enable xmllint   || disable xmllint
 
 # check V4L2 codecs available in the API
diff --git a/tests/Makefile b/tests/Makefile
index e09f30a0fc..45db76695e 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -265,6 +265,7 @@  FATE_EXTERN                   += $(FATE_EXTERN-yes) $(FATE_SAMPLES_FASTSTART)
 FATE += $(FATE-yes)
 
 RSYNC_OPTIONS-$(HAVE_RSYNC_CONTIMEOUT) += --contimeout=60
+RSYNC_OPTIONS-$(HAVE_RSYNC_EXCLUDE)    += --exclude=/sdr/
 RSYNC_OPTIONS = -vrltLW --timeout=60 $(RSYNC_OPTIONS-yes)
 
 $(FATE_FFMPEG) $(FATE_FFMPEG_FFPROBE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) $(FATE_SAMPLES_FFMPEG_FFPROBE): ffmpeg$(PROGSSUF)$(EXESUF)