* [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists
@ 2023-10-06 21:40 Léon Spaans
2023-10-11 1:50 ` Steven Liu
0 siblings, 1 reply; 11+ messages in thread
From: Léon Spaans @ 2023-10-06 21:40 UTC (permalink / raw)
To: ffmpeg-devel
Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant playlists.
Signed-off-by: Léon Spaans <leons@gridpoint.nl>
---
libavformat/hlsenc.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 08f3746ce7..8f7eee202e 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -1580,7 +1580,9 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs)
set_http_options(s, &options, hls);
snprintf(temp_filename, sizeof(temp_filename), use_temp_file ? "%s.tmp" : "%s", vs->m3u8_name);
- if ((ret = hlsenc_io_open(s, byterange_mode ? &hls->m3u8_out : &vs->out, temp_filename, &options)) < 0) {
+ ret = hlsenc_io_open(s, byterange_mode ? &hls->m3u8_out : &vs->out, temp_filename, &options);
+ av_dict_free(&options);
+ if (ret < 0) {
if (hls->ignore_io_errors)
ret = 0;
goto fail;
@@ -1635,8 +1637,11 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs)
ff_hls_write_end_list(byterange_mode ? hls->m3u8_out : vs->out);
if (vs->vtt_m3u8_name) {
+ set_http_options(vs->vtt_avf, &options, hls);
snprintf(temp_vtt_filename, sizeof(temp_vtt_filename), use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name);
- if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename, &options)) < 0) {
+ ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename, &options);
+ av_dict_free(&options);
+ if (ret < 0) {
if (hls->ignore_io_errors)
ret = 0;
goto fail;
--
2.40.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".
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists
2023-10-06 21:40 [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists Léon Spaans
@ 2023-10-11 1:50 ` Steven Liu
0 siblings, 0 replies; 11+ messages in thread
From: Steven Liu @ 2023-10-11 1:50 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Léon Spaans <leons@gridpoint.nl> 于2023年10月7日周六 05:41写道：
>
> Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant playlists.
>
> Signed-off-by: Léon Spaans <leons@gridpoint.nl>
> ---
> libavformat/hlsenc.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index 08f3746ce7..8f7eee202e 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -1580,7 +1580,9 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs)
>
> set_http_options(s, &options, hls);
> snprintf(temp_filename, sizeof(temp_filename), use_temp_file ? "%s.tmp" : "%s", vs->m3u8_name);
> - if ((ret = hlsenc_io_open(s, byterange_mode ? &hls->m3u8_out : &vs->out, temp_filename, &options)) < 0) {
> + ret = hlsenc_io_open(s, byterange_mode ? &hls->m3u8_out : &vs->out, temp_filename, &options);
> + av_dict_free(&options);
> + if (ret < 0) {
> if (hls->ignore_io_errors)
> ret = 0;
> goto fail;
> @@ -1635,8 +1637,11 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs)
> ff_hls_write_end_list(byterange_mode ? hls->m3u8_out : vs->out);
>
> if (vs->vtt_m3u8_name) {
> + set_http_options(vs->vtt_avf, &options, hls);
> snprintf(temp_vtt_filename, sizeof(temp_vtt_filename), use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name);
> - if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename, &options)) < 0) {
> + ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename, &options);
> + av_dict_free(&options);
> + if (ret < 0) {
> if (hls->ignore_io_errors)
> ret = 0;
> goto fail;
> --
> 2.40.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".
LGTM
Thanks
Steven
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread
* [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists
@ 2023-10-01 14:40 Léon Spaans
2023-10-01 23:16 ` Steven Liu
0 siblings, 1 reply; 11+ messages in thread
From: Léon Spaans @ 2023-10-01 14:40 UTC (permalink / raw)
To: ffmpeg-devel
Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant
playlists.
Signed-off-by: Léon Spaans <leons@gridpoint.nl>
---
libavformat/hlsenc.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 08f3746ce7..150320a880 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -1585,6 +1585,7 @@ static int hls_window(AVFormatContext *s, int
last, VariantStream *vs)
ret = 0;
goto fail;
}
+ av_dict_free(&options);
for (en = vs->segments; en; en = en->next) {
if (target_duration <= en->duration)
@@ -1635,8 +1636,11 @@ static int hls_window(AVFormatContext *s, int
last, VariantStream *vs)
ff_hls_write_end_list(byterange_mode ? hls->m3u8_out : vs->out);
if (vs->vtt_m3u8_name) {
+ set_http_options(vs->avf, &options, hls);
snprintf(temp_vtt_filename, sizeof(temp_vtt_filename),
use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name);
- if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out,
temp_vtt_filename, &options)) < 0) {
+ ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename,
&options);
+ av_dict_free(&options);
+ if (ret < 0) {
if (hls->ignore_io_errors)
ret = 0;
goto fail;
--
2.40.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".
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists
2023-10-01 14:40 Léon Spaans
@ 2023-10-01 23:16 ` Steven Liu
2023-10-02 3:50 ` Léon Spaans
0 siblings, 1 reply; 11+ messages in thread
From: Steven Liu @ 2023-10-01 23:16 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Léon Spaans <leons@gridpoint.nl>于2023年10月1日 周日22:40写道：
> Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant
> playlists.
>
> Signed-off-by: Léon Spaans <leons@gridpoint.nl>
> ---
> libavformat/hlsenc.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index 08f3746ce7..150320a880 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -1585,6 +1585,7 @@ static int hls_window(AVFormatContext *s, int
> last, VariantStream *vs)
> ret = 0;
> goto fail;
> }
> + av_dict_free(&options);
> for (en = vs->segments; en; en = en->next) {
> if (target_duration <= en->duration)
> @@ -1635,8 +1636,11 @@ static int hls_window(AVFormatContext *s, int
> last, VariantStream *vs)
> ff_hls_write_end_list(byterange_mode ? hls->m3u8_out : vs->out);
> if (vs->vtt_m3u8_name) {
> + set_http_options(vs->avf, &options, hls);
> snprintf(temp_vtt_filename, sizeof(temp_vtt_filename),
> use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name);
> - if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out,
> temp_vtt_filename, &options)) < 0) {
> + ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename,
> &options);
> + av_dict_free(&options);
> + if (ret < 0) {
> if (hls->ignore_io_errors)
> ret = 0;
> goto fail;
> --
> 2.40.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".
>
LGTM
Thanks
Steven
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists
2023-10-01 23:16 ` Steven Liu
@ 2023-10-02 3:50 ` Léon Spaans
2023-10-05 7:15 ` Léon Spaans
0 siblings, 1 reply; 11+ messages in thread
From: Léon Spaans @ 2023-10-02 3:50 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Thanks Steven!
Have a wonderful day!
Léon
> On 2 Oct 2023, at 01:17, Steven Liu <lingjiujianke@gmail.com> wrote:
>
> Léon Spaans <leons@gridpoint.nl>于2023年10月1日 周日22:40写道：
>
>> Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant
>> playlists.
>>
>> Signed-off-by: Léon Spaans <leons@gridpoint.nl>
>> ---
>> libavformat/hlsenc.c | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>> index 08f3746ce7..150320a880 100644
>> --- a/libavformat/hlsenc.c
>> +++ b/libavformat/hlsenc.c
>> @@ -1585,6 +1585,7 @@ static int hls_window(AVFormatContext *s, int
>> last, VariantStream *vs)
>> ret = 0;
>> goto fail;
>> }
>> + av_dict_free(&options);
>> for (en = vs->segments; en; en = en->next) {
>> if (target_duration <= en->duration)
>> @@ -1635,8 +1636,11 @@ static int hls_window(AVFormatContext *s, int
>> last, VariantStream *vs)
>> ff_hls_write_end_list(byterange_mode ? hls->m3u8_out : vs->out);
>> if (vs->vtt_m3u8_name) {
>> + set_http_options(vs->avf, &options, hls);
>> snprintf(temp_vtt_filename, sizeof(temp_vtt_filename),
>> use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name);
>> - if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out,
>> temp_vtt_filename, &options)) < 0) {
>> + ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename,
>> &options);
>> + av_dict_free(&options);
>> + if (ret < 0) {
>> if (hls->ignore_io_errors)
>> ret = 0;
>> goto fail;
>> --
>> 2.40.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".
>>
> LGTM
>
>
> Thanks
> Steven
> _______________________________________________
> 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".
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists
2023-10-02 3:50 ` Léon Spaans
@ 2023-10-05 7:15 ` Léon Spaans
2023-10-05 7:25 ` Steven Liu
0 siblings, 1 reply; 11+ messages in thread
From: Léon Spaans @ 2023-10-05 7:15 UTC (permalink / raw)
To: FFmpeg development discussions and patches
According to Patchwork the patch results in 2 "Failed to apply" warnings
for contexts "yinshiyou/configure_loongarch64" and "andriy/configure_x86".
This is not something I saw in the `make fate` output.
Is there something I should know allowing me to fix this? Or can this be
ignored?
Thanks && kind regards.
On 10/2/23 05:50, Léon Spaans wrote:
> Thanks Steven!
>
> Have a wonderful day!
>
> Léon
>
>
>> On 2 Oct 2023, at 01:17, Steven Liu <lingjiujianke@gmail.com> wrote:
>>
>> Léon Spaans <leons@gridpoint.nl>于2023年10月1日 周日22:40写道：
>>
>>> Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant
>>> playlists.
>>>
>>> Signed-off-by: Léon Spaans <leons@gridpoint.nl>
>>> ---
>>> libavformat/hlsenc.c | 6 +++++-
>>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>>> index 08f3746ce7..150320a880 100644
>>> --- a/libavformat/hlsenc.c
>>> +++ b/libavformat/hlsenc.c
>>> @@ -1585,6 +1585,7 @@ static int hls_window(AVFormatContext *s, int
>>> last, VariantStream *vs)
>>> ret = 0;
>>> goto fail;
>>> }
>>> + av_dict_free(&options);
>>> for (en = vs->segments; en; en = en->next) {
>>> if (target_duration <= en->duration)
>>> @@ -1635,8 +1636,11 @@ static int hls_window(AVFormatContext *s, int
>>> last, VariantStream *vs)
>>> ff_hls_write_end_list(byterange_mode ? hls->m3u8_out : vs->out);
>>> if (vs->vtt_m3u8_name) {
>>> + set_http_options(vs->avf, &options, hls);
>>> snprintf(temp_vtt_filename, sizeof(temp_vtt_filename),
>>> use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name);
>>> - if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out,
>>> temp_vtt_filename, &options)) < 0) {
>>> + ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename,
>>> &options);
>>> + av_dict_free(&options);
>>> + if (ret < 0) {
>>> if (hls->ignore_io_errors)
>>> ret = 0;
>>> goto fail;
>>> --
>>> 2.40.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".
>>>
>> LGTM
>>
>>
>> Thanks
>> Steven
>> _______________________________________________
>> 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".
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists
2023-10-05 7:15 ` Léon Spaans
@ 2023-10-05 7:25 ` Steven Liu
2023-10-06 14:50 ` Steven Liu
0 siblings, 1 reply; 11+ messages in thread
From: Steven Liu @ 2023-10-05 7:25 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Léon Spaans <leons@gridpoint.nl>于2023年10月5日 周四15:15写道：
> According to Patchwork the patch results in 2 "Failed to apply" warnings
> for contexts "yinshiyou/configure_loongarch64" and "andriy/configure_x86".
>
> This is not something I saw in the `make fate` output.
>
> Is there something I should know allowing me to fix this? Or can this be
> ignored?
Don’t worry, These days are holidays in China mainland, maybe two days
later will check it.
>
>
>
> Thanks && kind regards.
>
>
> On 10/2/23 05:50, Léon Spaans wrote:
> > Thanks Steven!
> >
> > Have a wonderful day!
> >
> > Léon
> >
> >
> >> On 2 Oct 2023, at 01:17, Steven Liu <lingjiujianke@gmail.com> wrote:
> >>
> >> Léon Spaans <leons@gridpoint.nl>于2023年10月1日 周日22:40写道：
> >>
> >>> Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant
> >>> playlists.
> >>>
> >>> Signed-off-by: Léon Spaans <leons@gridpoint.nl>
> >>> ---
> >>> libavformat/hlsenc.c | 6 +++++-
> >>> 1 file changed, 5 insertions(+), 1 deletion(-)
> >>>
> >>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> >>> index 08f3746ce7..150320a880 100644
> >>> --- a/libavformat/hlsenc.c
> >>> +++ b/libavformat/hlsenc.c
> >>> @@ -1585,6 +1585,7 @@ static int hls_window(AVFormatContext *s, int
> >>> last, VariantStream *vs)
> >>> ret = 0;
> >>> goto fail;
> >>> }
> >>> + av_dict_free(&options);
> >>> for (en = vs->segments; en; en = en->next) {
> >>> if (target_duration <= en->duration)
> >>> @@ -1635,8 +1636,11 @@ static int hls_window(AVFormatContext *s, int
> >>> last, VariantStream *vs)
> >>> ff_hls_write_end_list(byterange_mode ? hls->m3u8_out :
> vs->out);
> >>> if (vs->vtt_m3u8_name) {
> >>> + set_http_options(vs->avf, &options, hls);
> >>> snprintf(temp_vtt_filename, sizeof(temp_vtt_filename),
> >>> use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name);
> >>> - if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out,
> >>> temp_vtt_filename, &options)) < 0) {
> >>> + ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename,
> >>> &options);
> >>> + av_dict_free(&options);
> >>> + if (ret < 0) {
> >>> if (hls->ignore_io_errors)
> >>> ret = 0;
> >>> goto fail;
> >>> --
> >>> 2.40.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".
> >>>
> >> LGTM
> >>
> >>
> >> Thanks
> >> Steven
> >> _______________________________________________
> >> 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".
>
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists
2023-10-05 7:25 ` Steven Liu
@ 2023-10-06 14:50 ` Steven Liu
2023-10-06 21:09 ` Léon Spaans
0 siblings, 1 reply; 11+ messages in thread
From: Steven Liu @ 2023-10-06 14:50 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Steven Liu <lingjiujianke@gmail.com> 于2023年10月5日周四 15:25写道：
>
>
>
> Léon Spaans <leons@gridpoint.nl>于2023年10月5日 周四15:15写道：
>>
>> According to Patchwork the patch results in 2 "Failed to apply" warnings
>> for contexts "yinshiyou/configure_loongarch64" and "andriy/configure_x86".
>>
>> This is not something I saw in the `make fate` output.
>>
>> Is there something I should know allowing me to fix this? Or can this be
>> ignored?
>
>
> Don’t worry, These days are holidays in China mainland, maybe two days later will check it.
>>
>>
>>
>>
>> Thanks && kind regards.
>>
>>
>> On 10/2/23 05:50, Léon Spaans wrote:
>> > Thanks Steven!
>> >
>> > Have a wonderful day!
>> >
>> > Léon
Hi Léon,
I read this patch again, I have some question:
>> >
>> >
>> >> On 2 Oct 2023, at 01:17, Steven Liu <lingjiujianke@gmail.com> wrote:
>> >>
>> >> Léon Spaans <leons@gridpoint.nl>于2023年10月1日 周日22:40写道：
>> >>
>> >>> Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant
>> >>> playlists.
>> >>>
>> >>> Signed-off-by: Léon Spaans <leons@gridpoint.nl>
>> >>> ---
>> >>> libavformat/hlsenc.c | 6 +++++-
>> >>> 1 file changed, 5 insertions(+), 1 deletion(-)
>> >>>
>> >>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>> >>> index 08f3746ce7..150320a880 100644
>> >>> --- a/libavformat/hlsenc.c
>> >>> +++ b/libavformat/hlsenc.c
>> >>> @@ -1585,6 +1585,7 @@ static int hls_window(AVFormatContext *s, int
>> >>> last, VariantStream *vs)
>> >>> ret = 0;
>> >>> goto fail;
>> >>> }
>> >>> + av_dict_free(&options);
this should modify as:
snprintf(temp_filename, sizeof(temp_filename), use_temp_file ?
"%s.tmp" : "%s", vs->m3u8_name);
ret = hlsenc_io_open(s, byterange_mode ? &hls->m3u8_out :
&vs->out, temp_filename, &options);
av_dict_free(&options);
if (ret < 0) {
if (hls->ignore_io_errors)
ret = 0;
goto fail;
}
Because there have one goto fail when hlsenc_io_open failed;
>> >>> for (en = vs->segments; en; en = en->next) {
>> >>> if (target_duration <= en->duration)
>> >>> @@ -1635,8 +1636,11 @@ static int hls_window(AVFormatContext *s, int
>> >>> last, VariantStream *vs)
>> >>> ff_hls_write_end_list(byterange_mode ? hls->m3u8_out : vs->out);
>> >>> if (vs->vtt_m3u8_name) {
>> >>> + set_http_options(vs->avf, &options, hls);
should this set vs->vtt_avf ?
maybe subtitle of webvtt should use vs->vtt_avf, is it?
>> >>> snprintf(temp_vtt_filename, sizeof(temp_vtt_filename),
>> >>> use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name);
>> >>> - if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out,
>> >>> temp_vtt_filename, &options)) < 0) {
>> >>> + ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename,
>> >>> &options);
>> >>> + av_dict_free(&options);
>> >>> + if (ret < 0) {
>> >>> if (hls->ignore_io_errors)
>> >>> ret = 0;
>> >>> goto fail;
>> >>> --
>> >>> 2.40.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".
>> >>>
>> >> LGTM
>> >>
>> >>
>> >> Thanks
>> >> Steven
>> >> _______________________________________________
>> >> 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".
Thanks
Steven
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists
2023-10-06 14:50 ` Steven Liu
@ 2023-10-06 21:09 ` Léon Spaans
0 siblings, 0 replies; 11+ messages in thread
From: Léon Spaans @ 2023-10-06 21:09 UTC (permalink / raw)
To: FFmpeg development discussions and patches, Steven Liu
Thanks Steven!
>> libavformat/hlsenc.c | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>> index 08f3746ce7..150320a880 100644
>> --- a/libavformat/hlsenc.c
>> +++ b/libavformat/hlsenc.c
>> @@ -1585,6 +1585,7 @@ static int hls_window(AVFormatContext *s, int
>> last, VariantStream *vs)
>> ret = 0;
>> goto fail;
>> }
>> + av_dict_free(&options);
> this should modify as:
>
> snprintf(temp_filename, sizeof(temp_filename), use_temp_file ?
> "%s.tmp" : "%s", vs->m3u8_name);
> ret = hlsenc_io_open(s, byterange_mode ? &hls->m3u8_out :
> &vs->out, temp_filename, &options);
> av_dict_free(&options);
> if (ret < 0) {
> if (hls->ignore_io_errors)
> ret = 0;
> goto fail;
> }
>
> Because there have one goto fail when hlsenc_io_open failed;
Fixing this as well indeed seems better!
>> for (en = vs->segments; en; en = en->next) {
>> if (target_duration <= en->duration)
>> @@ -1635,8 +1636,11 @@ static int hls_window(AVFormatContext *s, int
>> last, VariantStream *vs)
>> ff_hls_write_end_list(byterange_mode ? hls->m3u8_out : vs->out);
>> if (vs->vtt_m3u8_name) {
>> + set_http_options(vs->avf, &options, hls);
> should this set vs->vtt_avf ?
> maybe subtitle of webvtt should use vs->vtt_avf, is it?
Using `vs->vtt_avf` makes more sense here indeed.
>> snprintf(temp_vtt_filename, sizeof(temp_vtt_filename),
>> use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name);
>> - if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out,
>> temp_vtt_filename, &options)) < 0) {
>> + ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename,
>> &options);
>> + av_dict_free(&options);
>> + if (ret < 0) {
>> if (hls->ignore_io_errors)
>> ret = 0;
>> goto fail;
>> --
I have changed the patch accordingly and will resend.
Léon
_______________________________________________
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".
^ permalink raw reply [flat|nested] 11+ messages in thread
* [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists
@ 2023-10-01 9:38 Léon Spaans
2023-10-01 12:43 ` Steven Liu
0 siblings, 1 reply; 11+ messages in thread
From: Léon Spaans @ 2023-10-01 9:38 UTC (permalink / raw)
To: ffmpeg-devel
Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant
playlists.
Signed-off-by: Léon Spaans <leons@gridpoint.nl>
---
libavformat/hlsenc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 08f3746ce7..c956f11ed5 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -1585,6 +1585,7 @@ static int hls_window(AVFormatContext *s, int
last, VariantStream *vs)
ret = 0;
goto fail;
}
+ av_dict_free(&options);
for (en = vs->segments; en; en = en->next) {
if (target_duration <= en->duration)
@@ -1635,12 +1636,14 @@ static int hls_window(AVFormatContext *s, int
last, VariantStream *vs)
ff_hls_write_end_list(byterange_mode ? hls->m3u8_out : vs->out);
if (vs->vtt_m3u8_name) {
+ set_http_options(vs->avf, &options, hls);
snprintf(temp_vtt_filename, sizeof(temp_vtt_filename),
use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name);
if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out,
temp_vtt_filename, &options)) < 0) {
if (hls->ignore_io_errors)
ret = 0;
goto fail;
}
+ av_dict_free(&options);
ff_hls_write_playlist_header(hls->sub_m3u8_out, hls->version,
hls->allowcache,
target_duration, sequence,
PLAYLIST_TYPE_NONE, 0);
for (en = vs->segments; en; en = en->next) {
--
2.40.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".
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists
2023-10-01 9:38 Léon Spaans
@ 2023-10-01 12:43 ` Steven Liu
0 siblings, 0 replies; 11+ messages in thread
From: Steven Liu @ 2023-10-01 12:43 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Léon Spaans <leons@gridpoint.nl>于2023年10月1日 周日17:38写道：
> Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant
> playlists.
>
> Signed-off-by: Léon Spaans <leons@gridpoint.nl>
> ---
> libavformat/hlsenc.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index 08f3746ce7..c956f11ed5 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -1585,6 +1585,7 @@ static int hls_window(AVFormatContext *s, int
> last, VariantStream *vs)
> ret = 0;
> goto fail;
> }
> + av_dict_free(&options);
> for (en = vs->segments; en; en = en->next) {
> if (target_duration <= en->duration)
> @@ -1635,12 +1636,14 @@ static int hls_window(AVFormatContext *s, int
> last, VariantStream *vs)
> ff_hls_write_end_list(byterange_mode ? hls->m3u8_out : vs->out);
> if (vs->vtt_m3u8_name) {
> + set_http_options(vs->avf, &options, hls);
> snprintf(temp_vtt_filename, sizeof(temp_vtt_filename),
> use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name);
> if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out,
> temp_vtt_filename, &options)) < 0) {
> if (hls->ignore_io_errors)
> ret = 0;
> goto fail;
> }
move ret = hlsenc_io_open out of if check, and av_dict_free immediately
after hlsenc_io_open before check ret value.
>
> + av_dict_free(&options);
> ff_hls_write_playlist_header(hls->sub_m3u8_out, hls->version,
> hls->allowcache,
> target_duration, sequence,
> PLAYLIST_TYPE_NONE, 0);
> for (en = vs->segments; en; en = en->next) {
> --
> 2.40.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".
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-10-11 1:50 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-06 21:40 [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists Léon Spaans
2023-10-11 1:50 ` Steven Liu
-- strict thread matches above, loose matches on Subject: below --
2023-10-01 14:40 Léon Spaans
2023-10-01 23:16 ` Steven Liu
2023-10-02 3:50 ` Léon Spaans
2023-10-05 7:15 ` Léon Spaans
2023-10-05 7:25 ` Steven Liu
2023-10-06 14:50 ` Steven Liu
2023-10-06 21:09 ` Léon Spaans
2023-10-01 9:38 Léon Spaans
2023-10-01 12:43 ` Steven Liu
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git