From patchwork Tue Jun 2 04:02:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Ribble X-Patchwork-Id: 20068 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2D66244A37B for ; Tue, 2 Jun 2020 07:09:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E287868A345; Tue, 2 Jun 2020 07:09:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BC4E6881BA for ; Tue, 2 Jun 2020 07:09:39 +0300 (EEST) Received: by mail-oi1-f193.google.com with SMTP id a21so4504627oic.8 for ; Mon, 01 Jun 2020 21:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=livingasone-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lup7dMQfk1Laq571Ja3DcQjCXf5il2ICZJzDmDPM3w4=; b=O6xGeb3dQ0KLBh7pN9C54gGlIS58X7JKWYOpD/zvB3R+3GOaM19h9hMcrCW2k/MvbL VyW+t0TLAavu00VJJ/eOnafQGI8lfwh4Pp9LdVXTGHLfbIRHnUtZpvumOsN/OdMFkVli IRcyFGIaJiho9DajfzbMEBzciBDwIsN6Qb1NT4GTAdPf3N1c2OZjXLKTAAsughWGUV8e M29mxxQN5IuaRY/7RGIBQXlLXr3jpiu1b/to2lIOiH5UgQcpE6oyy5N8tagaP7us/4mi i/vHxsPzZTJ6puGJ3nrMTb5qoIBMhlP/70rd8FaN0BdL3QTsxV8p9X0MoZAz/Z3+pqEi mZcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lup7dMQfk1Laq571Ja3DcQjCXf5il2ICZJzDmDPM3w4=; b=DQgw/9A+bU6QN+Mj2dpD6FvWzqbmfPlDn43CaxK1Bfvi5vUP5j9Rc+P/+hgYBeEoen qlkw4mk4wXDqF7rYO3+HIePGqcY+C8H6JjcbkiqN5oAYQsjTbP0FmMo+hoTyQqn6whnm SuTas1RbgeNVVt/OmZzn9lJbVZoDDGHSgBvDdsvcQLIE2aSTf6nlQrkZZiqHMbXjUcmW irV7dLHMZWadi7EBZdwRKIBAVulAkx3jKM6QRXQAJGWF5ISPmUsLm4/leEoJ4kRZdQYa yEVTaxS7W986nNdEXi2UNp0rEdsZVe6zfbSAZq2pBNrjbSMKaV9AlRQ2eOzGP06Rmnfw 9LTA== X-Gm-Message-State: AOAM530mPD9lTcCezV5mUW4PBwN7KVUzis5ZbgQCmD2uKp181mdhppEi 8li6nGWBrebGw92WAtmtGnHZjeslm4cLWA== X-Google-Smtp-Source: ABdhPJzenJnWnmYanS57DxkKrMmSg73Ei/XADt1dezh2YB3N8qOlnXDhVQCsvBX4io48PhKHtnskZw== X-Received: by 2002:aca:2316:: with SMTP id e22mr1659209oie.71.1591070556381; Mon, 01 Jun 2020 21:02:36 -0700 (PDT) Received: from hoth.ribblenet.woot.myvwan.com ([47.184.141.37]) by smtp.gmail.com with ESMTPSA id y20sm409666ooj.30.2020.06.01.21.02.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2020 21:02:35 -0700 (PDT) From: Chris Ribble To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jun 2020 23:02:09 -0500 Message-Id: <20200602040209.19419-1-chris.ribble@livingasone.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/dashenc: reopen new http session for http_persistent X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Taylor Patton , Brad Reitmeyer , Chris Ribble Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fix ticket: 8693 Based on implementation in hlsenc.c Signed-off-by: Chris Ribble --- libavformat/dashenc.c | 67 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 14 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 00a37b175d..a45d9bc7d0 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -121,6 +121,7 @@ typedef struct OutputStream { const char *single_file_name; /* file names selected for this particular stream */ const char *init_seg_name; const char *media_seg_name; + uint8_t *temp_buffer; char codec_str[100]; int written_len; @@ -239,12 +240,13 @@ static int dashenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename, return err; } -static void dashenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename) { +static int dashenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename) { DASHContext *c = 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 || !c->http_persistent) { ff_format_io_close(s, pb); @@ -254,8 +256,10 @@ static void dashenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filenam av_assert0(http_url_context); avio_flush(*pb); ffurl_shutdown(http_url_context, AVIO_FLAG_WRITE); + ret = ff_http_get_shutdown_status(http_url_context); #endif } + return ret; } static const char *get_format_str(SegmentType segment_type) { @@ -453,33 +457,38 @@ static void set_codec_str(AVFormatContext *s, AVCodecParameters *par, static int flush_dynbuf(DASHContext *c, OutputStream *os, int *range_length) { - uint8_t *buffer; + AVFormatContext *ctx = os->ctx; - if (!os->ctx->pb) { + if (!ctx->pb) { return AVERROR(EINVAL); } // flush - av_write_frame(os->ctx, NULL); - avio_flush(os->ctx->pb); + av_write_frame(ctx, NULL); + avio_flush(ctx->pb); if (!c->single_file) { // write out to file - *range_length = avio_close_dyn_buf(os->ctx->pb, &buffer); - os->ctx->pb = NULL; + *range_length = avio_close_dyn_buf(ctx->pb, &os->temp_buffer); + ctx->pb = NULL; if (os->out) - avio_write(os->out, buffer + os->written_len, *range_length - os->written_len); + avio_write(os->out, os->temp_buffer + os->written_len, *range_length - os->written_len); os->written_len = 0; - av_free(buffer); // re-open buffer - return avio_open_dyn_buf(&os->ctx->pb); + return avio_open_dyn_buf(&ctx->pb); } else { - *range_length = avio_tell(os->ctx->pb) - os->pos; + *range_length = avio_tell(ctx->pb) - os->pos; return 0; } } +static void reflush_dynbuf(OutputStream *os, int *range_length) +{ + // re-open buffer + avio_write(os->out, os->temp_buffer, *range_length);; +} + static void set_http_options(AVDictionary **options, DASHContext *c) { if (c->method) @@ -596,6 +605,7 @@ static int flush_init_segment(AVFormatContext *s, OutputStream *os) int ret, range_length; ret = flush_dynbuf(c, os, &range_length); + av_freep(&os->temp_buffer); if (ret < 0) return ret; @@ -642,6 +652,7 @@ static void dash_free(AVFormatContext *s) av_freep(&os->single_file_name); av_freep(&os->init_seg_name); av_freep(&os->media_seg_name); + av_freep(&os->temp_buffer); } av_freep(&c->streams); @@ -1241,7 +1252,18 @@ static int write_manifest(AVFormatContext *s, int final) avio_printf(out, "\n"); avio_flush(out); - dashenc_io_close(s, &c->mpd_out, temp_filename); + ret = dashenc_io_close(s, &c->mpd_out, temp_filename); + if (ret < 0) { + av_log(s, AV_LOG_WARNING, "upload manifest failed, will retry with a new http session.\n"); + ff_format_io_close(s, &c->mpd_out); + + set_http_options(&opts, c); + dashenc_io_open(s, &c->mpd_out, temp_filename, &opts); + av_dict_free(&opts); + + dashenc_io_close(s, &c->mpd_out, temp_filename); + return ret; + } if (use_rename) { if ((ret = ff_rename(temp_filename, s->url, s)) < 0) @@ -1939,7 +1961,21 @@ static int dash_flush(AVFormatContext *s, int final, int stream) if (c->single_file) { find_index_range(s, os->full_path, os->pos, &index_length); } else { - dashenc_io_close(s, &os->out, os->temp_path); + ret = dashenc_io_close(s, &os->out, os->temp_path); + if (ret < 0) { + AVDictionary *http_opts = NULL; + + av_log(s, AV_LOG_WARNING, "upload segment failed, will retry with a new http session.\n"); + ff_format_io_close(s, &os->out); + + set_http_options(&http_opts, c); + ret = dashenc_io_open(s, &os->out, os->temp_path, &http_opts); + av_dict_free(&http_opts); + + reflush_dynbuf(os, &range_length); + ret = dashenc_io_close(s, &os->out, os->temp_path); + } + av_freep(&os->temp_buffer); if (use_rename) { ret = ff_rename(os->temp_path, os->full_path, os->ctx); @@ -2010,6 +2046,9 @@ static int dash_flush(AVFormatContext *s, int final, int stream) c->nr_of_streams_flushed = 0; } ret = write_manifest(s, final); + if (ret < 0 && c->http_persistent) { + ret = write_manifest(s, final); + } } return ret; }