From patchwork Mon Mar 2 04:44:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18004 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 182D6449CCD for ; Mon, 2 Mar 2020 06:45:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 081F368B4DF; Mon, 2 Mar 2020 06:45:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D834D68B485 for ; Mon, 2 Mar 2020 06:45:04 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id j16so10804282wrt.3 for ; Sun, 01 Mar 2020 20:45:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=thJChplhtayHP2JCZn7sE3slIzrxVZ0Fo1vOHFm+GRc=; b=qneu9wkU24TfIr2hZ9+quhDer/GGfCDlEKBTS3/ooI50RBbhLCrJP4xEYDnxRPz8C+ IYQLUZ3z1Oobcu4XCCtxD/ye56nRfifjWmRjVOwoDxhaNOfbBuYOmZxUYC7XvceVpgH2 N5Mv30vKKmabDbm3ZS4k2rtF7/JK7tDjc+Was+OPGZdA45vjOXgju0VNuAPVErQ7zyS3 quiN6RZQ+6AtZykTt3MbEX4Sb+NQ+RxrWnrgysmH0y6Ywplnmr/E0sZ6kfnCPB7kJ8H+ pv7wZcTnabmWOEJEHpDcXmluUBg0jvcdtN0vXVyko2Y2xSqvJ+O0J2a8EUdwKkcpCAX2 gkrg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=thJChplhtayHP2JCZn7sE3slIzrxVZ0Fo1vOHFm+GRc=; b=Fg0inGYbBMw24U3TRNKDXOGE7wh2m1C+Nwo24JxNykmNzPad6AvuJ7PZfFtnBUlAEq pSc/wjHH18OlJ9hPwMaJlkPJnoNNdw81RC+ypIHEgXHzc80IGQImJleuzaudn1XW+tSS Xb3WBERAJMyuxikWyrbOqqkw2JM+AhRHdiJr4Hq7sQHoAbvJkrbEI1sVA5LaR1TbFSnZ uuKf+heqpAAD8IlpGnWN24UCSHZiLszUEcgdZp6q8rvb2g08JlBfZ548oSbFkM0ZzMJi tdhTWm5fPxBXAWAkGo9D4r63t1/pR0j/e3A6DCHafULb4zPIkvWsAsSaXMl/n4Pn1dFV ecuw== X-Gm-Message-State: APjAAAWycBM3dqJh9D7AY7SZAbJ5C5VDnj23NEYE0al2pom+b8Z0mRu3 ENm2bU2FgtRKgjn0RWRfHdFmWdYY X-Google-Smtp-Source: APXvYqw4O4DL2p5mB8F+ogjZXh7jDLBu6cYI2wPPwZmspt1swVWF0HtfP6HOJdPLSvBbOSREdrTJzw== X-Received: by 2002:adf:ed04:: with SMTP id a4mr19417789wro.76.1583124304218; Sun, 01 Mar 2020 20:45:04 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id s22sm13130229wmc.16.2020.03.01.20.45.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2020 20:45:03 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Mar 2020 05:44:42 +0100 Message-Id: <20200302044445.14842-10-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302043520.14165-1-andreas.rheinhardt@gmail.com> References: <20200302043520.14165-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/17] avformat/webm_chunk: Add init function 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/webm_chunk.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index 8abfc2870b..efdce62391 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -55,7 +55,7 @@ typedef struct WebMChunkContext { AVFormatContext *avf; } WebMChunkContext; -static int chunk_mux_init(AVFormatContext *s) +static int webm_chunk_init(AVFormatContext *s) { WebMChunkContext *wc = s->priv_data; const AVOutputFormat *oformat; @@ -64,11 +64,17 @@ static int chunk_mux_init(AVFormatContext *s) AVDictionary *dict = NULL; int ret; + // DASH Streams can only have one track per file. + if (s->nb_streams != 1) + return AVERROR(EINVAL); + if (!wc->header_filename) { av_log(s, AV_LOG_ERROR, "No header filename provided\n"); return AVERROR(EINVAL); } + wc->prev_pts = AV_NOPTS_VALUE; + oformat = av_guess_format("webm", s->url, "video/webm"); if (!oformat) return AVERROR_MUXER_NOT_FOUND; @@ -144,19 +150,10 @@ static int get_chunk_filename(AVFormatContext *s, char filename[MAX_FILENAME_SIZ static int webm_chunk_write_header(AVFormatContext *s) { WebMChunkContext *wc = s->priv_data; - AVFormatContext *oc = NULL; + AVFormatContext *oc = wc->avf; int ret; AVDictionary *options = NULL; - // DASH Streams can only have either one track per file. - if (s->nb_streams != 1) { return AVERROR_INVALIDDATA; } - - wc->prev_pts = AV_NOPTS_VALUE; - - ret = chunk_mux_init(s); - if (ret < 0) - return ret; - oc = wc->avf; if (wc->http_method) av_dict_set(&options, "method", wc->http_method, 0); ret = s->io_open(s, &oc->pb, oc->url, AVIO_FLAG_WRITE, &options); @@ -295,6 +292,7 @@ AVOutputFormat ff_webm_chunk_muxer = { .flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER | AVFMT_NEEDNUMBER | AVFMT_TS_NONSTRICT, .priv_data_size = sizeof(WebMChunkContext), + .init = webm_chunk_init, .write_header = webm_chunk_write_header, .write_packet = webm_chunk_write_packet, .write_trailer = webm_chunk_write_trailer,