Re: [FFmpeg-devel] [PATCH 5/5] avformat/rawenc: Use init instead of write_header function

2021-03-10 Thread Andreas Rheinhardt 
Andreas Rheinhardt:
> force_one_stream() does not write anything.
> 
> Signed-off-by: Andreas Rheinhardt 
> ---
> Is it it actually intended that the mp2 muxer does not use
> force_one_stream at all? And is it intended that force_one_stream
> does only check codec_type and not the actual codec?
> And wouldn't it be better to inform the caller about the fact that
> the format supports only one stream by adding a new
> AVOutputFormat.flags?
> 
>  libavformat/rawenc.c | 60 ++--
>  1 file changed, 30 insertions(+), 30 deletions(-)
> 
> diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
> index 32704f9bfd..caec297f4a 100644
> --- a/libavformat/rawenc.c
> +++ b/libavformat/rawenc.c
> @@ -64,7 +64,7 @@ AVOutputFormat ff_ac3_muxer = {
>  .extensions= "ac3",
>  .audio_codec   = AV_CODEC_ID_AC3,
>  .video_codec   = AV_CODEC_ID_NONE,
> -.write_header  = force_one_stream,
> +.init  = force_one_stream,
>  .write_packet  = ff_raw_write_packet,
>  .flags = AVFMT_NOTIMESTAMPS,
>  };
> @@ -96,7 +96,7 @@ AVOutputFormat ff_adx_muxer = {
>  .extensions= "adx",
>  .audio_codec   = AV_CODEC_ID_ADPCM_ADX,
>  .video_codec   = AV_CODEC_ID_NONE,
> -.write_header  = force_one_stream,
> +.init  = force_one_stream,
>  .write_packet  = ff_raw_write_packet,
>  .write_trailer = adx_write_trailer,
>  .flags = AVFMT_NOTIMESTAMPS,
> @@ -110,7 +110,7 @@ AVOutputFormat ff_aptx_muxer = {
>  .extensions= "aptx",
>  .audio_codec   = AV_CODEC_ID_APTX,
>  .video_codec   = AV_CODEC_ID_NONE,
> -.write_header  = force_one_stream,
> +.init  = force_one_stream,
>  .write_packet  = ff_raw_write_packet,
>  .flags = AVFMT_NOTIMESTAMPS,
>  };
> @@ -123,7 +123,7 @@ AVOutputFormat ff_aptx_hd_muxer = {
>  .extensions= "aptxhd",
>  .audio_codec   = AV_CODEC_ID_APTX_HD,
>  .video_codec   = AV_CODEC_ID_NONE,
> -.write_header  = force_one_stream,
> +.init  = force_one_stream,
>  .write_packet  = ff_raw_write_packet,
>  .flags = AVFMT_NOTIMESTAMPS,
>  };
> @@ -136,7 +136,7 @@ AVOutputFormat ff_avs2_muxer = {
>  .extensions= "avs,avs2",
>  .audio_codec   = AV_CODEC_ID_NONE,
>  .video_codec   = AV_CODEC_ID_AVS2,
> -.write_header  = force_one_stream,
> +.init  = force_one_stream,
>  .write_packet  = ff_raw_write_packet,
>  .flags = AVFMT_NOTIMESTAMPS,
>  };
> @@ -149,7 +149,7 @@ AVOutputFormat ff_cavsvideo_muxer = {
>  .extensions= "cavs",
>  .audio_codec   = AV_CODEC_ID_NONE,
>  .video_codec   = AV_CODEC_ID_CAVS,
> -.write_header  = force_one_stream,
> +.init  = force_one_stream,
>  .write_packet  = ff_raw_write_packet,
>  .flags = AVFMT_NOTIMESTAMPS,
>  };
> @@ -161,7 +161,7 @@ AVOutputFormat ff_codec2raw_muxer = {
>  .long_name = NULL_IF_CONFIG_SMALL("raw codec2 muxer"),
>  .audio_codec   = AV_CODEC_ID_CODEC2,
>  .video_codec   = AV_CODEC_ID_NONE,
> -.write_header  = force_one_stream,
> +.init  = force_one_stream,
>  .write_packet  = ff_raw_write_packet,
>  .flags = AVFMT_NOTIMESTAMPS,
>  };
> @@ -172,7 +172,7 @@ AVOutputFormat ff_codec2raw_muxer = {
>  AVOutputFormat ff_data_muxer = {
>  .name  = "data",
>  .long_name = NULL_IF_CONFIG_SMALL("raw data"),
> -.write_header  = force_one_stream,
> +.init  = force_one_stream,
>  .write_packet  = ff_raw_write_packet,
>  .flags = AVFMT_NOTIMESTAMPS,
>  };
> @@ -185,7 +185,7 @@ AVOutputFormat ff_dirac_muxer = {
>  .extensions= "drc,vc2",
>  .audio_codec   = AV_CODEC_ID_NONE,
>  .video_codec   = AV_CODEC_ID_DIRAC,
> -.write_header  = force_one_stream,
> +.init  = force_one_stream,
>  .write_packet  = ff_raw_write_packet,
>  .flags = AVFMT_NOTIMESTAMPS,
>  };
> @@ -198,7 +198,7 @@ AVOutputFormat ff_dnxhd_muxer = {
>  .extensions= "dnxhd,dnxhr",
>  .audio_codec   = AV_CODEC_ID_NONE,
>  .video_codec   = AV_CODEC_ID_DNXHD,
> -.write_header  = force_one_stream,
> +.init  = force_one_stream,
>  .write_packet  = ff_raw_write_packet,
>  .flags = AVFMT_NOTIMESTAMPS,
>  };
> @@ -212,7 +212,7 @@ AVOutputFormat ff_dts_muxer = {
>  .extensions= "dts",
>  .audio_codec   = AV_CODEC_ID_DTS,
>  .video_codec   = AV_CODEC_ID_NONE,
> -.write_header  = force_one_stream,
> +.init  = force_one_stream,
>  .write_packet  = ff_raw_write_packet,
>  .flags =

[FFmpeg-devel] [PATCH 5/5] avformat/rawenc: Use init instead of write_header function

2021-03-08 Thread Andreas Rheinhardt 
force_one_stream() does not write anything.

Signed-off-by: Andreas Rheinhardt 
---
Is it it actually intended that the mp2 muxer does not use
force_one_stream at all? And is it intended that force_one_stream
does only check codec_type and not the actual codec?
And wouldn't it be better to inform the caller about the fact that
the format supports only one stream by adding a new
AVOutputFormat.flags?

 libavformat/rawenc.c | 60 ++--
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 32704f9bfd..caec297f4a 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -64,7 +64,7 @@ AVOutputFormat ff_ac3_muxer = {
 .extensions= "ac3",
 .audio_codec   = AV_CODEC_ID_AC3,
 .video_codec   = AV_CODEC_ID_NONE,
-.write_header  = force_one_stream,
+.init  = force_one_stream,
 .write_packet  = ff_raw_write_packet,
 .flags = AVFMT_NOTIMESTAMPS,
 };
@@ -96,7 +96,7 @@ AVOutputFormat ff_adx_muxer = {
 .extensions= "adx",
 .audio_codec   = AV_CODEC_ID_ADPCM_ADX,
 .video_codec   = AV_CODEC_ID_NONE,
-.write_header  = force_one_stream,
+.init  = force_one_stream,
 .write_packet  = ff_raw_write_packet,
 .write_trailer = adx_write_trailer,
 .flags = AVFMT_NOTIMESTAMPS,
@@ -110,7 +110,7 @@ AVOutputFormat ff_aptx_muxer = {
 .extensions= "aptx",
 .audio_codec   = AV_CODEC_ID_APTX,
 .video_codec   = AV_CODEC_ID_NONE,
-.write_header  = force_one_stream,
+.init  = force_one_stream,
 .write_packet  = ff_raw_write_packet,
 .flags = AVFMT_NOTIMESTAMPS,
 };
@@ -123,7 +123,7 @@ AVOutputFormat ff_aptx_hd_muxer = {
 .extensions= "aptxhd",
 .audio_codec   = AV_CODEC_ID_APTX_HD,
 .video_codec   = AV_CODEC_ID_NONE,
-.write_header  = force_one_stream,
+.init  = force_one_stream,
 .write_packet  = ff_raw_write_packet,
 .flags = AVFMT_NOTIMESTAMPS,
 };
@@ -136,7 +136,7 @@ AVOutputFormat ff_avs2_muxer = {
 .extensions= "avs,avs2",
 .audio_codec   = AV_CODEC_ID_NONE,
 .video_codec   = AV_CODEC_ID_AVS2,
-.write_header  = force_one_stream,
+.init  = force_one_stream,
 .write_packet  = ff_raw_write_packet,
 .flags = AVFMT_NOTIMESTAMPS,
 };
@@ -149,7 +149,7 @@ AVOutputFormat ff_cavsvideo_muxer = {
 .extensions= "cavs",
 .audio_codec   = AV_CODEC_ID_NONE,
 .video_codec   = AV_CODEC_ID_CAVS,
-.write_header  = force_one_stream,
+.init  = force_one_stream,
 .write_packet  = ff_raw_write_packet,
 .flags = AVFMT_NOTIMESTAMPS,
 };
@@ -161,7 +161,7 @@ AVOutputFormat ff_codec2raw_muxer = {
 .long_name = NULL_IF_CONFIG_SMALL("raw codec2 muxer"),
 .audio_codec   = AV_CODEC_ID_CODEC2,
 .video_codec   = AV_CODEC_ID_NONE,
-.write_header  = force_one_stream,
+.init  = force_one_stream,
 .write_packet  = ff_raw_write_packet,
 .flags = AVFMT_NOTIMESTAMPS,
 };
@@ -172,7 +172,7 @@ AVOutputFormat ff_codec2raw_muxer = {
 AVOutputFormat ff_data_muxer = {
 .name  = "data",
 .long_name = NULL_IF_CONFIG_SMALL("raw data"),
-.write_header  = force_one_stream,
+.init  = force_one_stream,
 .write_packet  = ff_raw_write_packet,
 .flags = AVFMT_NOTIMESTAMPS,
 };
@@ -185,7 +185,7 @@ AVOutputFormat ff_dirac_muxer = {
 .extensions= "drc,vc2",
 .audio_codec   = AV_CODEC_ID_NONE,
 .video_codec   = AV_CODEC_ID_DIRAC,
-.write_header  = force_one_stream,
+.init  = force_one_stream,
 .write_packet  = ff_raw_write_packet,
 .flags = AVFMT_NOTIMESTAMPS,
 };
@@ -198,7 +198,7 @@ AVOutputFormat ff_dnxhd_muxer = {
 .extensions= "dnxhd,dnxhr",
 .audio_codec   = AV_CODEC_ID_NONE,
 .video_codec   = AV_CODEC_ID_DNXHD,
-.write_header  = force_one_stream,
+.init  = force_one_stream,
 .write_packet  = ff_raw_write_packet,
 .flags = AVFMT_NOTIMESTAMPS,
 };
@@ -212,7 +212,7 @@ AVOutputFormat ff_dts_muxer = {
 .extensions= "dts",
 .audio_codec   = AV_CODEC_ID_DTS,
 .video_codec   = AV_CODEC_ID_NONE,
-.write_header  = force_one_stream,
+.init  = force_one_stream,
 .write_packet  = ff_raw_write_packet,
 .flags = AVFMT_NOTIMESTAMPS,
 };
@@ -226,7 +226,7 @@ AVOutputFormat ff_eac3_muxer = {
 .extensions= "eac3",
 .audio_codec   = AV_CODEC_ID_EAC3,
 .video_codec   = AV_CODEC_ID_NONE,
-.write_header  = force_one_stream,
+.init  =