[FFmpeg-devel] [PATCH] avformat/hlsenc: reopen new http session for http_persistent when upload file failed
Steven Liu
lq at chinaffmpeg.org
Sun Aug 25 17:58:37 EEST 2019
> 在 2019年8月23日，22:12，Ian Klassen <ian at virtualfunc.com> 写道：
>
> On Fri, Aug 23, 2019 at 2:06 AM Steven Liu <lq at chinaffmpeg.org> wrote:
>
>> fix ticket: 7975
>>
>> Signed-off-by: Steven Liu <lq at chinaffmpeg.org>
>> ---
>> libavformat/hlsenc.c | 67
>> ++++++++++++++++++++++++++++++++++++++++++----------
>> 1 file changed, 54 insertions(+), 13 deletions(-)
>>
>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>> index 18173cdce1..26e0f3819b 100644
>> --- a/libavformat/hlsenc.c
>> +++ b/libavformat/hlsenc.c
>> @@ -118,6 +118,7 @@ typedef struct VariantStream {
>> AVIOContext *out;
>> int packets_written;
>> int init_range_length;
>> + uint8_t *temp_buffer;
>>
>> AVFormatContext *avf;
>> AVFormatContext *vtt_avf;
>> @@ -262,11 +263,12 @@ static int hlsenc_io_open(AVFormatContext *s,
>> AVIOContext **pb, char *filename,
>> return err;
>> }
>>
>> -static void hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char
>> *filename) {
>> +static int hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char
>> *filename) {
>> HLSContext *hls = s->priv_data;
>> int http_base_proto = filename ? ff_is_http_proto(filename) : 0;
>> + int ret = 0;
>> if (!*pb)
>> - return;
>> + return ret;
>> if (!http_base_proto || !hls->http_persistent || hls->key_info_file
>> || hls->encrypt) {
>> ff_format_io_close(s, pb);
>> #if CONFIG_HTTP_PROTOCOL
>> @@ -274,9 +276,10 @@ static void hlsenc_io_close(AVFormatContext *s,
>> AVIOContext **pb, char *filename
>> URLContext *http_url_context = ffio_geturlcontext(*pb);
>> av_assert0(http_url_context);
>> avio_flush(*pb);
>> - ffurl_shutdown(http_url_context, AVIO_FLAG_WRITE);
>> + ret = ffurl_shutdown(http_url_context, AVIO_FLAG_WRITE);
>> #endif
>> }
>> + return ret;
>> }
>>
>> static void set_http_options(AVFormatContext *s, AVDictionary **options,
>> HLSContext *c)
>> @@ -447,7 +450,6 @@ static void write_styp(AVIOContext *pb)
>> static int flush_dynbuf(VariantStream *vs, int *range_length)
>> {
>> AVFormatContext *ctx = vs->avf;
>> - uint8_t *buffer;
>>
>> if (!ctx->pb) {
>> return AVERROR(EINVAL);
>> @@ -458,15 +460,20 @@ static int flush_dynbuf(VariantStream *vs, int
>> *range_length)
>> avio_flush(ctx->pb);
>>
>> // write out to file
>> - *range_length = avio_close_dyn_buf(ctx->pb, &buffer);
>> + *range_length = avio_close_dyn_buf(ctx->pb, &vs->temp_buffer);
>> ctx->pb = NULL;
>> - avio_write(vs->out, buffer, *range_length);
>> - av_free(buffer);
>> + avio_write(vs->out, vs->temp_buffer, *range_length);
>>
>> // re-open buffer
>> return avio_open_dyn_buf(&ctx->pb);
>> }
>>
>> +static void reflush_dynbuf(VariantStream *vs, int *range_length)
>> +{
>> + // re-open buffer
>> + avio_write(vs->out, vs->temp_buffer, *range_length);;
>> +}
>> +
>> static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls,
>> VariantStream *vs) {
>>
>> @@ -1544,7 +1551,10 @@ static int hls_window(AVFormatContext *s, int last,
>> VariantStream *vs)
>>
>> fail:
>> av_dict_free(&options);
>> - hlsenc_io_close(s, (byterange_mode || hls->segment_type ==
>> SEGMENT_TYPE_FMP4) ? &hls->m3u8_out : &vs->out, temp_filename);
>> + ret = hlsenc_io_close(s, (byterange_mode || hls->segment_type ==
>> SEGMENT_TYPE_FMP4) ? &hls->m3u8_out : &vs->out, temp_filename);
>> + if (ret < 0) {
>> + return ret;
>> + }
>> hlsenc_io_close(s, &hls->sub_m3u8_out, vs->vtt_m3u8_name);
>> if (use_temp_file) {
>> ff_rename(temp_filename, vs->m3u8_name, s);
>> @@ -2399,7 +2409,16 @@ static int hls_write_packet(AVFormatContext *s,
>> AVPacket *pkt)
>> if (ret < 0) {
>> return ret;
>> }
>> - hlsenc_io_close(s, &vs->out, filename);
>> + ret = hlsenc_io_close(s, &vs->out, filename);
>> + if (ret < 0) {
>> + av_log(s, AV_LOG_WARNING, "upload segment failed,"
>> + "and will retry upload by a new http
>> session.\n");
>> + ff_format_io_close(s, &vs->out);
>> + ret = hlsenc_io_open(s, &vs->out, filename, &options);
>> + reflush_dynbuf(vs, &range_length);
>> + ret = hlsenc_io_close(s, &vs->out, filename);
>> + }
>> + av_free(vs->temp_buffer);
>> av_free(filename);
>> }
>> }
>> @@ -2426,8 +2445,13 @@ static int hls_write_packet(AVFormatContext *s,
>> AVPacket *pkt)
>> // if we're building a VOD playlist, skip writing the manifest
>> multiple times, and just wait until the end
>> if (hls->pl_type != PLAYLIST_TYPE_VOD) {
>> if ((ret = hls_window(s, 0, vs)) < 0) {
>> - av_free(old_filename);
>> - return ret;
>> + av_log(s, AV_LOG_WARNING, "update playlist failed, will
>> retry once time\n");
>> + ff_format_io_close(s, &vs->out);
>> + vs->out = NULL;
>> + if ((ret = hls_window(s, 0, vs)) < 0) {
>> + av_free(old_filename);
>> + return ret;
>> + }
>> }
>> }
>>
>> @@ -2577,7 +2601,19 @@ static int hls_write_trailer(struct AVFormatContext
>> *s)
>> goto failed;
>>
>> vs->size = range_length;
>> - hlsenc_io_close(s, &vs->out, filename);
>> + ret = hlsenc_io_close(s, &vs->out, filename);
>> + if (ret < 0) {
>> + av_log(s, AV_LOG_WARNING, "write segment failed, will close
>> old handle and retry once time\n");
>> + ff_format_io_close(s, &vs->out);
>> + ret = hlsenc_io_open(s, &vs->out, filename, &options);
>> + if (ret < 0) {
>> + av_log(s, AV_LOG_ERROR, "Failed to open file '%s'\n",
>> vs->avf->url);
>> + goto failed;
>> + }
>> + reflush_dynbuf(vs, &range_length);
>> + ret = hlsenc_io_close(s, &vs->out, filename);
>> + }
>> + av_free(vs->temp_buffer);
>> av_free(filename);
>>
>> failed:
>> @@ -2610,7 +2646,12 @@ failed:
>> ff_format_io_close(s, &vtt_oc->pb);
>> avformat_free_context(vtt_oc);
>> }
>> - hls_window(s, 1, vs);
>> + ret = hls_window(s, 1, vs);
>> + if (ret < 0) {
>> + av_log(s, AV_LOG_WARNING, "update playlist failed, will retry
>> once time\n");
>> + ff_format_io_close(s, &vs->out);
>> + hls_window(s, 1, vs);
>> + }
>> avformat_free_context(oc);
>>
>> vs->avf = NULL;
>> --
>> 2.15.1
>>
>>
>>
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel at ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
>
>
> Something's not quite right. Looking at the server logs there are missing
> segments. It jumps from stream5.ts to stream26.ts.
>
> [23/Aug/2019:14:06:25 +0000] (0s) "GET /stream.m3u8 HTTP/1.1" 404 288
> "Lavf/58.31.101"
> [23/Aug/2019:14:06:26 +0000] (0s) "PUT /stream0.ts HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:06:28 +0000] (1s) "PUT /stream1.ts HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:06:33 +0000] (1s) "PUT /stream2.ts HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:06:37 +0000] (1s) "PUT /stream3.ts HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:06:42 +0000] (2s) "PUT /stream4.ts HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:06:46 +0000] (1s) "PUT /stream5.ts HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:06:49 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:06:51 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:06:52 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:06:54 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:06:56 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:06:57 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:06:59 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:01 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:02 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:04 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:05 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:07 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:09 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:10 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:12 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:13 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:15 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:16 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:17 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:18 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:21 +0000] (2s) "PUT /stream26.ts HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:26 +0000] (1s) "PUT /stream27.ts HTTP/1.1" 200 3
> "Lavf/58.31.101"
> [23/Aug/2019:14:07:29 +0000] (0s) "PUT /stream.m3u8 HTTP/1.1" 200 3
> "Lavf/58.31.101"
>
> Here's the ffmpeg command used:
>
> ffmpeg -i test.mp4 -hls_flags +append_list -hls_time 6 -method PUT
> -http_persistent 1 http://45.33.124.115/stre
> am.m3u8
You can try the new patchest, i have leave the test message in the patchset
>
> Thanks!
>
> Ian
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
Thanks
Steven
More information about the ffmpeg-devel
mailing list