[FFmpeg-devel] [PATCH] lavf/movenc: mark mov/mp4 as supporting VFR

[FFmpeg-devel] [PATCH] lavf/movenc: mark mov/mp4 as supporting VFR

[Anton Khirnov]

---
 libavformat/movenc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index b97c479cc4..30cfbf6e74 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -8230,11 +8230,11 @@ const FFOutputFormat ff_mov_muxer = {
     .write_packet      = mov_write_packet,
     .write_trailer     = mov_write_trailer,
     .deinit            = mov_free,
+    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE | AVFMT_VARIABLE_FPS
 #if FF_API_ALLOW_FLUSH
-    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
-#else
-    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE,
+                       | AVFMT_ALLOW_FLUSH
 #endif
+                         ,
     .p.codec_tag       = (const AVCodecTag* const []){
         ff_codec_movvideo_tags, ff_codec_movaudio_tags, ff_codec_movsubtitle_tags, 0
     },
@@ -8282,11 +8282,11 @@ const FFOutputFormat ff_mp4_muxer = {
     .write_packet      = mov_write_packet,
     .write_trailer     = mov_write_trailer,
     .deinit            = mov_free,
+    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE | AVFMT_VARIABLE_FPS
 #if FF_API_ALLOW_FLUSH
-    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
-#else
-    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE,
+                       | AVFMT_ALLOW_FLUSH
 #endif
+                         ,
     .p.codec_tag       = mp4_codec_tags_list,
     .check_bitstream   = mov_check_bitstream,
     .p.priv_class      = &mov_isobmff_muxer_class,
-- 
2.43.0

_______________________________________________
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] lavf/movenc: mark mov/mp4 as supporting VFR

[Gyan Doshi]

On 2024-03-29 02:05 pm, Anton Khirnov wrote:
> ---
>   libavformat/movenc.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/libavformat/movenc.c b/libavformat/movenc.c
> index b97c479cc4..30cfbf6e74 100644
> --- a/libavformat/movenc.c
> +++ b/libavformat/movenc.c
> @@ -8230,11 +8230,11 @@ const FFOutputFormat ff_mov_muxer = {
>       .write_packet      = mov_write_packet,
>       .write_trailer     = mov_write_trailer,
>       .deinit            = mov_free,
> +    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE | AVFMT_VARIABLE_FPS
>   #if FF_API_ALLOW_FLUSH
> -    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
> -#else
> -    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE,
> +                       | AVFMT_ALLOW_FLUSH
>   #endif
> +                         ,
>       .p.codec_tag       = (const AVCodecTag* const []){
>           ff_codec_movvideo_tags, ff_codec_movaudio_tags, ff_codec_movsubtitle_tags, 0
>       },
> @@ -8282,11 +8282,11 @@ const FFOutputFormat ff_mp4_muxer = {
>       .write_packet      = mov_write_packet,
>       .write_trailer     = mov_write_trailer,
>       .deinit            = mov_free,
> +    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE | AVFMT_VARIABLE_FPS
>   #if FF_API_ALLOW_FLUSH
> -    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
> -#else
> -    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE,
> +                       | AVFMT_ALLOW_FLUSH
>   #endif
> +                         ,
>       .p.codec_tag       = mp4_codec_tags_list,
>       .check_bitstream   = mov_check_bitstream,
>       .p.priv_class      = &mov_isobmff_muxer_class,

LGTM. Should have been done a long time ago.
What about the other muxers in movenc?

Regards,
Gyan

_______________________________________________
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] lavf/movenc: mark mov/mp4 as supporting VFR

[Anton Khirnov]

Quoting Gyan Doshi (2024-03-29 10:19:15)
> LGTM. Should have been done a long time ago.
> What about the other muxers in movenc?

I don't know what they are used for or what constraints they have, so I
left them alone for now. Can also change them if people see no problem
with it.

-- 
Anton Khirnov
_______________________________________________
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] lavf/movenc: mark mov/mp4 as supporting VFR

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 473 bytes --]

On Fri, Mar 29, 2024 at 09:35:09AM +0100, Anton Khirnov wrote:
> ---
>  libavformat/movenc.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

can you add a fate test for this ?
its odd we have no single test that changes from this

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Elect your leaders based on what they did after the last election, not
based on what they say before an election.


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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] [PATCH] tests/fate/mov: add a test for VFR muxing

[Anton Khirnov]

---
 tests/fate/mov.mak | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
index b54fe19620..d12980815f 100644
--- a/tests/fate/mov.mak
+++ b/tests/fate/mov.mak
@@ -218,6 +218,11 @@ fate-mov-pcm-remux: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-44100-1.wav -m
 fate-mov-pcm-remux: CMP = oneline
 fate-mov-pcm-remux: REF = e76115bc392d702da38f523216bba165
 
+FATE_MOV_FFMPEG-$(call TRANSCODE, RAWVIDEO, MOV, TESTSRC_FILTER SETPTS_FILTER) += fate-mov-vfr
+fate-mov-vfr: CMD = md5 -filter_complex testsrc=size=2x2:duration=1,setpts=N*N -c rawvideo -fflags +bitexact -f mov
+fate-mov-vfr: CMP = oneline
+fate-mov-vfr: REF = 1558b4a9398d8635783c93f84eb5a60d
+
 FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER) += fate-mov-mp4-iamf-stereo
 fate-mov-mp4-iamf-stereo: tests/data/asynth-44100-2.wav tests/data/streamgroups/audio_element-stereo tests/data/streamgroups/mix_presentation-stereo
 fate-mov-mp4-iamf-stereo: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
-- 
2.43.0

_______________________________________________
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] tests/fate/mov: add a test for VFR muxing

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1704 bytes --]

On Tue, Jul 02, 2024 at 11:36:43AM +0200, Anton Khirnov wrote:
> ---
>  tests/fate/mov.mak | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
> index b54fe19620..d12980815f 100644
> --- a/tests/fate/mov.mak
> +++ b/tests/fate/mov.mak
> @@ -218,6 +218,11 @@ fate-mov-pcm-remux: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-44100-1.wav -m
>  fate-mov-pcm-remux: CMP = oneline
>  fate-mov-pcm-remux: REF = e76115bc392d702da38f523216bba165
>  
> +FATE_MOV_FFMPEG-$(call TRANSCODE, RAWVIDEO, MOV, TESTSRC_FILTER SETPTS_FILTER) += fate-mov-vfr
> +fate-mov-vfr: CMD = md5 -filter_complex testsrc=size=2x2:duration=1,setpts=N*N -c rawvideo -fflags +bitexact -f mov
> +fate-mov-vfr: CMP = oneline
> +fate-mov-vfr: REF = 1558b4a9398d8635783c93f84eb5a60d
> +
>  FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER) += fate-mov-mp4-iamf-stereo
>  fate-mov-mp4-iamf-stereo: tests/data/asynth-44100-2.wav tests/data/streamgroups/audio_element-stereo tests/data/streamgroups/mix_presentation-stereo
>  fate-mov-mp4-iamf-stereo: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav

seems not working here

TEST    mov-vfr
--- -	2024-07-07 01:56:44.023200989 +0200
+++ tests/data/fate/mov-vfr	2024-07-07 01:56:44.018435695 +0200
@@ -1 +1 @@
-1558b4a9398d8635783c93f84eb5a60d
+84979b46f7fddec88c3b173a60efacae
Test mov-vfr failed. Look at tests/data/fate/mov-vfr.err for details.
make: *** [tests/Makefile:311: fate-mov-vfr] Error 1

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No great genius has ever existed without some touch of madness. -- Aristotle

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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] tests/fate/mov: add a test for VFR muxing

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1895 bytes --]

On Sun, Jul 07, 2024 at 01:57:56AM +0200, Michael Niedermayer wrote:
> On Tue, Jul 02, 2024 at 11:36:43AM +0200, Anton Khirnov wrote:
> > ---
> >  tests/fate/mov.mak | 5 +++++
> >  1 file changed, 5 insertions(+)
> > 
> > diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
> > index b54fe19620..d12980815f 100644
> > --- a/tests/fate/mov.mak
> > +++ b/tests/fate/mov.mak
> > @@ -218,6 +218,11 @@ fate-mov-pcm-remux: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-44100-1.wav -m
> >  fate-mov-pcm-remux: CMP = oneline
> >  fate-mov-pcm-remux: REF = e76115bc392d702da38f523216bba165
> >  
> > +FATE_MOV_FFMPEG-$(call TRANSCODE, RAWVIDEO, MOV, TESTSRC_FILTER SETPTS_FILTER) += fate-mov-vfr
> > +fate-mov-vfr: CMD = md5 -filter_complex testsrc=size=2x2:duration=1,setpts=N*N -c rawvideo -fflags +bitexact -f mov
> > +fate-mov-vfr: CMP = oneline
> > +fate-mov-vfr: REF = 1558b4a9398d8635783c93f84eb5a60d
> > +
> >  FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER) += fate-mov-mp4-iamf-stereo
> >  fate-mov-mp4-iamf-stereo: tests/data/asynth-44100-2.wav tests/data/streamgroups/audio_element-stereo tests/data/streamgroups/mix_presentation-stereo
> >  fate-mov-mp4-iamf-stereo: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
> 
> seems not working here
> 
> TEST    mov-vfr
> --- -	2024-07-07 01:56:44.023200989 +0200
> +++ tests/data/fate/mov-vfr	2024-07-07 01:56:44.018435695 +0200
> @@ -1 +1 @@
> -1558b4a9398d8635783c93f84eb5a60d
> +84979b46f7fddec88c3b173a60efacae
> Test mov-vfr failed. Look at tests/data/fate/mov-vfr.err for details.
> make: *** [tests/Makefile:311: fate-mov-vfr] Error 1

disregard this, i need some sleep

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The greatest way to live with honor in this world is to be what we pretend
to be. -- Socrates

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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] lavf/movenc: mark mov/mp4 as supporting VFR

[James Almer]

On 3/29/2024 5:35 AM, Anton Khirnov wrote:
> ---
>   libavformat/movenc.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/libavformat/movenc.c b/libavformat/movenc.c
> index b97c479cc4..30cfbf6e74 100644
> --- a/libavformat/movenc.c
> +++ b/libavformat/movenc.c
> @@ -8230,11 +8230,11 @@ const FFOutputFormat ff_mov_muxer = {
>       .write_packet      = mov_write_packet,
>       .write_trailer     = mov_write_trailer,
>       .deinit            = mov_free,
> +    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE | AVFMT_VARIABLE_FPS
>   #if FF_API_ALLOW_FLUSH
> -    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
> -#else
> -    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE,
> +                       | AVFMT_ALLOW_FLUSH
>   #endif
> +                         ,
>       .p.codec_tag       = (const AVCodecTag* const []){
>           ff_codec_movvideo_tags, ff_codec_movaudio_tags, ff_codec_movsubtitle_tags, 0
>       },
> @@ -8282,11 +8282,11 @@ const FFOutputFormat ff_mp4_muxer = {
>       .write_packet      = mov_write_packet,
>       .write_trailer     = mov_write_trailer,
>       .deinit            = mov_free,
> +    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE | AVFMT_VARIABLE_FPS
>   #if FF_API_ALLOW_FLUSH
> -    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
> -#else
> -    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE,
> +                       | AVFMT_ALLOW_FLUSH
>   #endif
> +                         ,
>       .p.codec_tag       = mp4_codec_tags_list,
>       .check_bitstream   = mov_check_bitstream,
>       .p.priv_class      = &mov_isobmff_muxer_class,

There's a custom check for these muxers in 
avformat_transfer_internal_stream_timing_info() that would afaict be 
disabled with this change.
_______________________________________________
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] lavf/movenc: mark mov/mp4 as supporting VFR

[Anton Khirnov]

Quoting James Almer (2024-03-30 13:49:07)
> On 3/29/2024 5:35 AM, Anton Khirnov wrote:
> > ---
> >   libavformat/movenc.c | 12 ++++++------
> >   1 file changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/libavformat/movenc.c b/libavformat/movenc.c
> > index b97c479cc4..30cfbf6e74 100644
> > --- a/libavformat/movenc.c
> > +++ b/libavformat/movenc.c
> > @@ -8230,11 +8230,11 @@ const FFOutputFormat ff_mov_muxer = {
> >       .write_packet      = mov_write_packet,
> >       .write_trailer     = mov_write_trailer,
> >       .deinit            = mov_free,
> > +    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE | AVFMT_VARIABLE_FPS
> >   #if FF_API_ALLOW_FLUSH
> > -    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
> > -#else
> > -    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE,
> > +                       | AVFMT_ALLOW_FLUSH
> >   #endif
> > +                         ,
> >       .p.codec_tag       = (const AVCodecTag* const []){
> >           ff_codec_movvideo_tags, ff_codec_movaudio_tags, ff_codec_movsubtitle_tags, 0
> >       },
> > @@ -8282,11 +8282,11 @@ const FFOutputFormat ff_mp4_muxer = {
> >       .write_packet      = mov_write_packet,
> >       .write_trailer     = mov_write_trailer,
> >       .deinit            = mov_free,
> > +    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE | AVFMT_VARIABLE_FPS
> >   #if FF_API_ALLOW_FLUSH
> > -    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
> > -#else
> > -    .p.flags           = AVFMT_GLOBALHEADER | AVFMT_TS_NEGATIVE,
> > +                       | AVFMT_ALLOW_FLUSH
> >   #endif
> > +                         ,
> >       .p.codec_tag       = mp4_codec_tags_list,
> >       .check_bitstream   = mov_check_bitstream,
> >       .p.priv_class      = &mov_isobmff_muxer_class,
> 
> There's a custom check for these muxers in 
> avformat_transfer_internal_stream_timing_info() that would afaict be 
> disabled with this change.

good?

-- 
Anton Khirnov
_______________________________________________
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".