[FFmpeg-devel] [PATCH 0/3] avisynth: miscellaneous fixes

[FFmpeg-devel] [PATCH 0/3] avisynth: miscellaneous fixes

[Stephen Hutchinson]

Stephen Hutchinson (3):
  avformat/avisynth: add missing avs_release_video_frame
  avformat/avisynth: use ch_layout.nb_channels for channel count
  avformat/avisynth: cosmetics after nb_channels change

 libavformat/avisynth.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

-- 
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] [PATCH 1/3] avformat/avisynth: add missing avs_release_video_frame

[Stephen Hutchinson]

The AviSynth C API requires using avs_release_video_frame
whenever avs_get_frame has been used, but the recent addition
of frameprop reading to the demuxer was missing this in
avisynth_create_stream_video.

---
 libavformat/avisynth.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
index a97d12b6b6..98b4d68a57 100644
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -728,6 +728,7 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st)
                 st->codecpar->chroma_location = AVCHROMA_LOC_UNSPECIFIED;
             }
         }
+        avs_library.avs_release_video_frame(frame);
     } else {
         st->codecpar->field_order = AV_FIELD_UNKNOWN;
         /* AviSynth works with frame-based video, detecting field order can
-- 
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] [PATCH 2/3] avformat/avisynth: use ch_layout.nb_channels for channel count

[Stephen Hutchinson]

Fixes deprecation warning
---
 libavformat/avisynth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
index 98b4d68a57..5605fbefc4 100644
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -753,7 +753,7 @@ static int avisynth_create_stream_audio(AVFormatContext *s, AVStream *st)
 
     st->codecpar->codec_type  = AVMEDIA_TYPE_AUDIO;
     st->codecpar->sample_rate = avs->vi->audio_samples_per_second;
-    st->codecpar->channels    = avs->vi->nchannels;
+    st->codecpar->ch_layout.nb_channels    = avs->vi->nchannels;
     st->duration              = avs->vi->num_audio_samples;
     avpriv_set_pts_info(st, 64, 1, avs->vi->audio_samples_per_second);
 
-- 
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] [PATCH 3/3] avformat/avisynth: cosmetics after nb_channels change

[Stephen Hutchinson]

---
 libavformat/avisynth.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
index 5605fbefc4..3d9fa2be50 100644
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -751,10 +751,10 @@ static int avisynth_create_stream_audio(AVFormatContext *s, AVStream *st)
 {
     AviSynthContext *avs = s->priv_data;
 
-    st->codecpar->codec_type  = AVMEDIA_TYPE_AUDIO;
-    st->codecpar->sample_rate = avs->vi->audio_samples_per_second;
-    st->codecpar->ch_layout.nb_channels    = avs->vi->nchannels;
-    st->duration              = avs->vi->num_audio_samples;
+    st->codecpar->codec_type            = AVMEDIA_TYPE_AUDIO;
+    st->codecpar->sample_rate           = avs->vi->audio_samples_per_second;
+    st->codecpar->ch_layout.nb_channels = avs->vi->nchannels;
+    st->duration                        = avs->vi->num_audio_samples;
     avpriv_set_pts_info(st, 64, 1, avs->vi->audio_samples_per_second);
 
     switch (avs->vi->sample_type) {
-- 
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 2/3] avformat/avisynth: use ch_layout.nb_channels for channel count

[James Almer]

On 8/7/2022 10:25 PM, Stephen Hutchinson wrote:
> Fixes deprecation warning
> ---
>   libavformat/avisynth.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
> index 98b4d68a57..5605fbefc4 100644
> --- a/libavformat/avisynth.c
> +++ b/libavformat/avisynth.c
> @@ -753,7 +753,7 @@ static int avisynth_create_stream_audio(AVFormatContext *s, AVStream *st)
>   
>       st->codecpar->codec_type  = AVMEDIA_TYPE_AUDIO;
>       st->codecpar->sample_rate = avs->vi->audio_samples_per_second;
> -    st->codecpar->channels    = avs->vi->nchannels;
> +    st->codecpar->ch_layout.nb_channels    = avs->vi->nchannels;
>       st->duration              = avs->vi->num_audio_samples;
>       avpriv_set_pts_info(st, 64, 1, avs->vi->audio_samples_per_second);

Applied and backported to 5.1.

Can't believe we missed this...
_______________________________________________
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 1/3] avformat/avisynth: add missing avs_release_video_frame

[Stephen Hutchinson]

On 8/7/22 9:25 PM, Stephen Hutchinson wrote:
> The AviSynth C API requires using avs_release_video_frame
> whenever avs_get_frame has been used, but the recent addition
> of frameprop reading to the demuxer was missing this in
> avisynth_create_stream_video.
> 
> ---
>   libavformat/avisynth.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
> index a97d12b6b6..98b4d68a57 100644
> --- a/libavformat/avisynth.c
> +++ b/libavformat/avisynth.c
> @@ -728,6 +728,7 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st)
>                   st->codecpar->chroma_location = AVCHROMA_LOC_UNSPECIFIED;
>               }
>           }
> +        avs_library.avs_release_video_frame(frame);
>       } else {
>           st->codecpar->field_order = AV_FIELD_UNKNOWN;
>           /* AviSynth works with frame-based video, detecting field order can

Pushed.
_______________________________________________
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".