From patchwork Sun May 17 23:13:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19723 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 6B9044489FD for ; Mon, 18 May 2020 02:13:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F5C96898F7; Mon, 18 May 2020 02:13:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 08734680BD1 for ; Mon, 18 May 2020 02:13:29 +0300 (EEST) Received: by mail-wm1-f52.google.com with SMTP id m185so3415355wme.3 for ; Sun, 17 May 2020 16:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=G/t+OJJMwvd2VnxEtvViliwxlnkLiTtAnx6TIdqr6rE=; b=eskbV/nt0PgKjvunFnCyGXohPTjrdsxzhnJmisNMk2W5cJ9FAWVKTQvWC3DL/m3hZG 226zYn1vKzPWAkfdD9/ytkQJmUtXY0lBJEImrWiDq+V/MQqPBH7NTJomKEUxZa3o4afR uiU6UwmUhAxH2J4S+dvXxxBxRPeRqwu5fLcA3s8I+ZYweS0CEiMJy2VHiGv0F45PsDAU mwFlN4wWN2Akx9a/ua8tz/tZvSkh8xLB5lIYD17w4sYkhrjPgIY4pc/WFh+Ple1Pjfyb GVhDZMHCtJ9uhxsqp0QFzoZe0zCmw8vE2DlmxTYrDlsQzvwC5DqJXF1DM0J7qvJA5z/v hecw== 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=G/t+OJJMwvd2VnxEtvViliwxlnkLiTtAnx6TIdqr6rE=; b=sgtqRjv948p7FEyK8JTGMmIDFl8Tcgr2aAJAN37Db7YLV8kDHeaAoZNt9LEYpoJ9tH kaqo+FIg5lE+O0gAPoDBU/w+HdHOatOOEx5WT25ns7KWNxjyotC9moFVcWFMUWEbOvOa L3/UvXe9fR+G9B2Y1LFsIUFyw9N2jXGGD4ruCcP8/PxFZWejEaYD5IG4g123kGbjn1Ej vEAY9guby2WW22SyurPAQC1HuepLCAVKx3BqeMCh8Gg1rQs4AjmnYhX+T0jUWkLJpVO8 PICNFcPfw15NeVXDHoCtnUn4JyEdNtVJT1GM00big5gaXkmbl6D3bCGoneYuVseNZmNX d2ig== X-Gm-Message-State: AOAM533nIXd+BK5oYi422cP7OKwrTbf0fn8Z5fOjBJk9TW5aqeZBD3wu 41LNqjlnb5NLFayjaXjIk+JxNmEH X-Google-Smtp-Source: ABdhPJxctg8/CMENnqMUedKBMUiU8tz9f/ULLtr82Mpj4ELFQRTSV+s6JJGnZswBwZHkUIg46LW1ig== X-Received: by 2002:a1c:8094:: with SMTP id b142mr16499321wmd.61.1589757208011; Sun, 17 May 2020 16:13:28 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id q144sm14700203wme.0.2020.05.17.16.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 16:13:27 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 01:13:14 +0200 Message-Id: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] avformat/segment: Access AVStream more directly 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" by storing s->streams[i] in a pointer instead of constantly using s->streams[i]->... Signed-off-by: Andreas Rheinhardt --- libavformat/segment.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libavformat/segment.c b/libavformat/segment.c index 32c09827eb..7e8bd65976 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -162,12 +162,11 @@ static int segment_mux_init(AVFormatContext *s) oc->flags = s->flags; for (i = 0; i < s->nb_streams; i++) { - AVStream *st; - AVCodecParameters *ipar, *opar; + AVStream *st, *ist = s->streams[i]; + AVCodecParameters *ipar = ist->codecpar, *opar; if (!(st = avformat_new_stream(oc, NULL))) return AVERROR(ENOMEM); - ipar = s->streams[i]->codecpar; opar = st->codecpar; avcodec_parameters_copy(opar, ipar); if (!oc->oformat->codec_tag || @@ -177,16 +176,16 @@ static int segment_mux_init(AVFormatContext *s) } else { opar->codec_tag = 0; } - st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio; - st->time_base = s->streams[i]->time_base; - st->avg_frame_rate = s->streams[i]->avg_frame_rate; + st->sample_aspect_ratio = ist->sample_aspect_ratio; + st->time_base = ist->time_base; + st->avg_frame_rate = ist->avg_frame_rate; #if FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS - if (s->streams[i]->codecpar->codec_tag == MKTAG('t','m','c','d')) - st->codec->time_base = s->streams[i]->codec->time_base; + if (ipar->codec_tag == MKTAG('t','m','c','d')) + st->codec->time_base = ist->codec->time_base; FF_ENABLE_DEPRECATION_WARNINGS #endif - av_dict_copy(&st->metadata, s->streams[i]->metadata, 0); + av_dict_copy(&st->metadata, ist->metadata, 0); } return 0; From patchwork Sun May 17 23:13:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19724 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 772494489FD for ; Mon, 18 May 2020 02:13:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5FED66891EF; Mon, 18 May 2020 02:13:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 296DC688135 for ; Mon, 18 May 2020 02:13:49 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id k13so7608398wrx.3 for ; Sun, 17 May 2020 16:13:49 -0700 (PDT) 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=OubXgA3J/ghqaQRQVpAAi+e3eOs4hy/UrNBfOdzjeYI=; b=hvMaZVGq1r43JmYoDcP2x1Ez11GZoMUAzkOoomrLpgjgZq0Xs/IbZu5071VHpahEuZ fGlsUxL1BRHWexC7gCTxQhMYFMj4oYjTYQvt1n/my4HA4p0kjcNqMuYCd7GiLSQonG5H oWS86D6mHAuKSt0KJOWtQWFFSG07kOdvgOXJF47S4rWzMCuAFncVg/NEAP0vOMrxdZO8 ooCxeCMRhcO9E954Ci7pX+QGE8VgB/62F71/7rrxc9Q3bJilgWXDySlT/D7/yM73akjx YiGDsgEJFBOHeC5nQim0bUxYMkPHY7FMqD6RYR17avGHMkcLALOHdtRt6GeZJMqP5HIj 8+eQ== 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=OubXgA3J/ghqaQRQVpAAi+e3eOs4hy/UrNBfOdzjeYI=; b=aWGM0G1mvMf1yr3Ycpb2U+Kd4XfCpYSPdWKuZj3s7fWPHnfTK7ZqAzNQRDlH/tdFE3 HjMvITqGli1jqgSHOpPrrJ02srHUob9qfqoTeABa6+8jXVMTn+FLiVxohIa1pr6MMIxV vlInZeR6K3qaGvkZ/FekoQaD8c6BIxkcTwsrb9c8kLZDc3bGwBnrTmbPHeDNG9Dc310U MpZ4CgPQdVZ9kh+Ba92ZGhHwf5bd5bfOz6/WOn0Y82uxLjPiAEFi1QNGDeRUpRqz3tRO F8zQCvfUPsB2/KCntFgHwD7050LTtABZ2Ke+Ei7ooBZZmgeULeXjuq9OncCeuBu7vMFh dmuA== X-Gm-Message-State: AOAM530mvZghIq8otQ0KvCpmVIGSs2X5EBtrFMTNwVkMpfGgNpLH9EqS FmcRizCg1szb4TDOrMHJmYa9bNW1 X-Google-Smtp-Source: ABdhPJxE5LmQ+1jSDeDe3kElgqqjEBUoUYd+Dreloe4fQUK9+8nlOFoRxFMOeg9Dv/DVGrhLQTI9Vw== X-Received: by 2002:adf:f1c4:: with SMTP id z4mr17665264wro.25.1589757228247; Sun, 17 May 2020 16:13:48 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id q144sm14700203wme.0.2020.05.17.16.13.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 16:13:47 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 01:13:15 +0200 Message-Id: <20200517231319.13067-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> References: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/6] avformat/segment: Propagate disposition 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/segment.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/segment.c b/libavformat/segment.c index 7e8bd65976..2ff2b5372e 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -179,6 +179,7 @@ static int segment_mux_init(AVFormatContext *s) st->sample_aspect_ratio = ist->sample_aspect_ratio; st->time_base = ist->time_base; st->avg_frame_rate = ist->avg_frame_rate; + st->disposition = ist->disposition; #if FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS if (ipar->codec_tag == MKTAG('t','m','c','d')) From patchwork Sun May 17 23:13:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19727 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 4549B44B362 for ; Mon, 18 May 2020 02:20:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 114406898F7; Mon, 18 May 2020 02:20:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A421680280 for ; Mon, 18 May 2020 02:20:44 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id f13so7468006wmc.5 for ; Sun, 17 May 2020 16:20:44 -0700 (PDT) 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=vC0Iy8+J0WoYEbH4BPpcTxMB6Rt8Qi8MrJPL+KsFuzg=; b=GlhdFFOabm/OWE2vJb1cGoRHMkYbzwVzeC9VlJ+5eN78vz04nVktDF+VJm7yE6vSDJ 0JISmYRccAD652ftGwMWGZnJugCA9yzyFD8BySrfaIhEnEqzw21412n8qpIW8seunKct KFpMvSizZtPaGoO0QHQyDnzfeGGYRWazaoyJPfnogVtbOQGDsl3itzAhq0ywuDMjaZlv DPeaR8bhuKrvrLBLdh6I8U9BMvBhUWx5QsR5Xfg0TRk1CT3/QBjoA5iz22ACAoXA5K5s 3z5WJexLL9vS/HdQw+tBS4b7gRiNLNii0nLPPYP7xu2v//AqATnmPzH4fZ4KADLpH2BZ l8aQ== 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=vC0Iy8+J0WoYEbH4BPpcTxMB6Rt8Qi8MrJPL+KsFuzg=; b=dcS3K8XeMLq3kdwnQM9I40Bmn/g+kViMBx0QbVRp8auVb6Kxa8ap7xPPI1CwWpRyUv txgGi2lMjeMjr3evg16Xf0YrXysr/ixcwivkGWrfLvqT1sHZdi0/168gIVYDfprNf9zG RS778pJs/v6runiJXqZgGfXxRmtkQKXodJNHLtNpuAAVCJwLiGBEFjaesNs+DcIQcORb vKl0dpmOjg+xlxtdhk+uuXP8DbCfhEm1s9+b4S2r6gKIFP+XtriW+PgLclbAPHfu0fm0 2bC51YNU9TGqM6y9ArfZuWgeMihRE3wii/iGA2KKLwsqskM8yv9XmlO0GRXG1iQC4O8d Hhog== X-Gm-Message-State: AOAM5300GfWg1YiaUsiAVQjBJTSng75Jjy0t8N4FpEzpDOUzI1gD91A8 W5Z2Fcef00VEaVSzpjNgqxqKBQXT X-Google-Smtp-Source: ABdhPJys0JVNdIW6X21dApnm/23OWaf59T5T9KjN46FDGj/mY9WPLRiE6vbZ/mSVSelj7b6RHOv5Yg== X-Received: by 2002:a05:600c:22d3:: with SMTP id 19mr16982379wmg.161.1589757229426; Sun, 17 May 2020 16:13:49 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id q144sm14700203wme.0.2020.05.17.16.13.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 16:13:48 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 01:13:16 +0200 Message-Id: <20200517231319.13067-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> References: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] avformat/matroskaenc: Forward errors from avpriv_split_xiph_headers() 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/matroskaenc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 99b549ecc4..1b6e80da36 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -603,17 +603,18 @@ static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, const uint8_t *header_start[3]; int header_len[3]; int first_header_size; - int j; + int err, j; if (par->codec_id == AV_CODEC_ID_VORBIS) first_header_size = 30; else first_header_size = 42; - if (avpriv_split_xiph_headers(par->extradata, par->extradata_size, - first_header_size, header_start, header_len) < 0) { + err = avpriv_split_xiph_headers(par->extradata, par->extradata_size, + first_header_size, header_start, header_len); + if (err < 0) { av_log(s, AV_LOG_ERROR, "Extradata corrupt.\n"); - return -1; + return err; } avio_w8(pb, 2); // number packets - 1 From patchwork Sun May 17 23:13:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19728 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 5DD2E44B429 for ; Mon, 18 May 2020 02:21:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 42EB6689AA9; Mon, 18 May 2020 02:21:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EDDC6808B8 for ; Mon, 18 May 2020 02:21:48 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id n5so8336632wmd.0 for ; Sun, 17 May 2020 16:21:48 -0700 (PDT) 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=YUlRgWvgAgWvA4Y/ToM4lS4AS80UcSsyQiTNHAfAtdw=; b=pekjk3we5tNv2mea5JpauvP8Ta1WG/iGFsvomgbMZAMH1t66VTduy59owCz1nRSHdB 6a8ZQN9fnsxPUAG0xE78rs3zmnefLQlpKI/R4Gw+bdtqwh9gSzQMmXuYdSPA9svKIMcB FATFvkDMbpveusfpu9gYkABUsB0tY/tdaMk4DGABm/C94sXbYoG7euXXSnr6lobBYvwi FM2KaOKdkRwgjHl3R6ihWApTPBdHYo07Iim0rGvRuRo3jOo71g45gyGc7KYkvO83qV4H bjbrYopVNmLCajkaDP9aAbpmHkKp4A8OxXUsawdIA+pgRoHg7zXNGABDIyngduH6s6wB QyWw== 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=YUlRgWvgAgWvA4Y/ToM4lS4AS80UcSsyQiTNHAfAtdw=; b=DOjQDmlSeH/ZBCa0A7FBzyGQlmqZLoWlZ5D5LZ/aAnjOlkwOEzVgxDzNdDwy2aQDAl eorhCEJsCbkxtVJPbdXWzzM8cMvQZQk9GWCWPWfLVxT86DtF8RiX1ElWmim+4HbwDN0B qYdGzlEKlonl2R7hDYmVNJqbGWCQQXnfiIlJIbsFSf/IUMEZIh+/pu7g0ho+HpQ7IBXH ZF6TTUX4kbtOjQ8M6/9TmP3C+Y8kJVC/ShhYKBIDbjFG01VyZMeUwl7ovRpsFAjw+Nkz xhj0rJmuCsYOm2t3VkYD6/0L3o3d+VHTJz2YcUZ43fJwALgPbNnSW/Drtn6GXzrDJ5pO uZ6w== X-Gm-Message-State: AOAM5304ElUhaieWJFEeBksDfQfljnUzDNP0UJMZQoV/XBpX+GUUq2jF Knkt4Q7Lax7fXdACsN1zymowNm5u X-Google-Smtp-Source: ABdhPJymu4UVFN1MOGMzlX/hrEpBtEmE241Aa2nfoVyGeWybwH1N/l4tlhHqt3UPqWrPlxoXaEgf0Q== X-Received: by 2002:a1c:7407:: with SMTP id p7mr17041338wmc.114.1589757230640; Sun, 17 May 2020 16:13:50 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id q144sm14700203wme.0.2020.05.17.16.13.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 16:13:50 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 01:13:17 +0200 Message-Id: <20200517231319.13067-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> References: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/xiph: Return better error codes 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 --- There is another "return -1" left which might either be invalid data or an unsupported future extension of the format (e.g. one that does not have three arrays). I left this as is. libavcodec/xiph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/xiph.c b/libavcodec/xiph.c index d072224b4a..3073315e63 100644 --- a/libavcodec/xiph.c +++ b/libavcodec/xiph.c @@ -35,7 +35,7 @@ int avpriv_split_xiph_headers(const uint8_t *extradata, int extradata_size, header_start[i] = extradata; extradata += header_len[i]; if (overall_len > extradata_size - header_len[i]) - return -1; + return AVERROR_INVALIDDATA; overall_len += header_len[i]; } } else if (extradata_size >= 3 && extradata_size < INT_MAX - 0x1ff && extradata[0] == 2) { @@ -50,7 +50,7 @@ int avpriv_split_xiph_headers(const uint8_t *extradata, int extradata_size, header_len[i] += *extradata; overall_len += *extradata; if (overall_len > extradata_size) - return -1; + return AVERROR_INVALIDDATA; } header_len[2] = extradata_size - overall_len; header_start[0] = extradata; From patchwork Sun May 17 23:13:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19725 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 9C44E4489FD for ; Mon, 18 May 2020 02:13:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 79093689E53; Mon, 18 May 2020 02:13:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF4C9680821 for ; Mon, 18 May 2020 02:13:52 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id f13so7461350wmc.5 for ; Sun, 17 May 2020 16:13:52 -0700 (PDT) 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=G5zuiNpf0tloZdoh+CWr0Y1KSUuaARGitsvcnRr1V00=; b=UDsLv+e0JVoFAqMguFrgJ2Uq/ZQo4MlRs/zK6+Jmdwahkbm0jzpfrxlBKufVdtkKuE et9sgVPmRCbudr67XKYXg8oa4TkRbCG56fieEVrAnjds8RLTpfE3300oxlUtXJ4siUFv 41dJ926RH8RS8fiE0y15jakGRNkvH6hIUdQKOrSy2sBNU34I45QdomkP1qOAaatsBtXo JdrmS3b7kWdub+cUsq4RqyjijQ5PVxl9/Y/k83nY0tWBV5d8ELqCTvGG1Cozkw2d9a3U TThgCltI6A0d2LU4qrqPerPaE4Aw/ZqN6mnXrpTqdjofv1iZISElFIqDYIz4mbrVabtv +okA== 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=G5zuiNpf0tloZdoh+CWr0Y1KSUuaARGitsvcnRr1V00=; b=eEC9qthXrE45PM2en5xL4QzViusixRX+4NDr+3k3U1iD8CoAeakSrJJigZUj/iCMUl tbJsHUTgg2OtS/FjRjvs1vbeHNdCOJYHQ0u29G/HF7Jf0xnxpx38ADnXNmHEtDMuhsRN ZWdDohx2v7n4G2jXaN5LqB1ng5F3rIuxKK0zDIUdt2JEHncBaGqlk/LWmsCVN9WZon9E pQP2CSyBxLwF8Bk4rhfo//im2KsajrALY0bdqSOo01/YmdPcrI9qRF9PfVJXFqyKoXUq Xqja5bYRGFiaHw6PxF62gzMtHtW+C2fNWklzNUAmDoaWg3NxI12zY5cyTUSVjqzlJuy+ lzxA== X-Gm-Message-State: AOAM532LRtY/MCywvQ83dKorPf556Oh1l0ll7TiX9BWOKS1YSBZxJD7o J8zW4RdWbdicRH/1UvoyiHSmWc4h X-Google-Smtp-Source: ABdhPJzUuTb/2bxCofbEchi2maDqMdj/z6UrcD+HkY9FJa0dANJzMT6ymJCzxusORAPJ8f7XH3hc5w== X-Received: by 2002:a1c:c2c6:: with SMTP id s189mr16879808wmf.25.1589757231955; Sun, 17 May 2020 16:13:51 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id q144sm14700203wme.0.2020.05.17.16.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 16:13:51 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 01:13:18 +0200 Message-Id: <20200517231319.13067-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> References: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] avformat/matroskadec: Use proper context for logging 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/matroskadec.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b277c05f9d..81e7b16821 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1771,7 +1771,7 @@ static void matroska_convert_tags(AVFormatContext *s) } } if (!found) { - av_log(NULL, AV_LOG_WARNING, + av_log(s, AV_LOG_WARNING, "The tags at index %d refer to a " "non-existent attachment %"PRId64".\n", i, tags[i].target.attachuid); @@ -1788,7 +1788,7 @@ static void matroska_convert_tags(AVFormatContext *s) } } if (!found) { - av_log(NULL, AV_LOG_WARNING, + av_log(s, AV_LOG_WARNING, "The tags at index %d refer to a non-existent chapter " "%"PRId64".\n", i, tags[i].target.chapteruid); @@ -1805,7 +1805,7 @@ static void matroska_convert_tags(AVFormatContext *s) } } if (!found) { - av_log(NULL, AV_LOG_WARNING, + av_log(s, AV_LOG_WARNING, "The tags at index %d refer to a non-existent track " "%"PRId64".\n", i, tags[i].target.trackuid); @@ -2157,7 +2157,9 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) { return 0; } -static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) { +static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track, + void *logctx) +{ AVSphericalMapping *spherical; enum AVSphericalProjection projection; size_t spherical_size; @@ -2170,7 +2172,7 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) track->video.projection.private.size); if (bytestream2_get_byte(&gb) != 0) { - av_log(NULL, AV_LOG_WARNING, "Unknown spherical metadata\n"); + av_log(logctx, AV_LOG_WARNING, "Unknown spherical metadata\n"); return 0; } @@ -2185,14 +2187,14 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) r = bytestream2_get_be32(&gb); if (b >= UINT_MAX - t || r >= UINT_MAX - l) { - av_log(NULL, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "Invalid bounding rectangle coordinates " "%"PRIu32",%"PRIu32",%"PRIu32",%"PRIu32"\n", l, t, r, b); return AVERROR_INVALIDDATA; } } else if (track->video.projection.private.size != 0) { - av_log(NULL, AV_LOG_ERROR, "Unknown spherical metadata\n"); + av_log(logctx, AV_LOG_ERROR, "Unknown spherical metadata\n"); return AVERROR_INVALIDDATA; } @@ -2203,19 +2205,19 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) break; case MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP: if (track->video.projection.private.size < 4) { - av_log(NULL, AV_LOG_ERROR, "Missing projection private properties\n"); + av_log(logctx, AV_LOG_ERROR, "Missing projection private properties\n"); return AVERROR_INVALIDDATA; } else if (track->video.projection.private.size == 12) { uint32_t layout = bytestream2_get_be32(&gb); if (layout) { - av_log(NULL, AV_LOG_WARNING, + av_log(logctx, AV_LOG_WARNING, "Unknown spherical cubemap layout %"PRIu32"\n", layout); return 0; } projection = AV_SPHERICAL_CUBEMAP; padding = bytestream2_get_be32(&gb); } else { - av_log(NULL, AV_LOG_ERROR, "Unknown spherical metadata\n"); + av_log(logctx, AV_LOG_ERROR, "Unknown spherical metadata\n"); return AVERROR_INVALIDDATA; } break; @@ -2223,7 +2225,7 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) /* No Spherical metadata */ return 0; default: - av_log(NULL, AV_LOG_WARNING, + av_log(logctx, AV_LOG_WARNING, "Unknown spherical metadata type %"PRIu64"\n", track->video.projection.type); return 0; @@ -2779,7 +2781,7 @@ static int matroska_parse_tracks(AVFormatContext *s) ret = mkv_parse_video_color(st, track); if (ret < 0) return ret; - ret = mkv_parse_video_projection(st, track); + ret = mkv_parse_video_projection(st, track, matroska->ctx); if (ret < 0) return ret; } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) { From patchwork Sun May 17 23:13:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19726 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 9F2F54489FD for ; Mon, 18 May 2020 02:14:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B03A689F22; Mon, 18 May 2020 02:14:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 176F5689AD2 for ; Mon, 18 May 2020 02:13:54 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id j5so9735440wrq.2 for ; Sun, 17 May 2020 16:13:54 -0700 (PDT) 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=u5FyWnGHixXub6SEMrFQZzqZKl81tTikPRrpSbGSxEI=; b=ADhkHYGPuVBaRIRhsjCdrfKzbBLClcfjFIQpdXevSdLWEwPKa9HicdfyiylbWjOUNE zLTBeiikMCs+gq9worPWRCHvVOu7yGrRffzKCp9ih5y98Fk9TdFfkUzlxHoFdJHRQYyC tF0pd6ei65VmVNiKIl++zv7wSjBfQDLEOTUL3WvRAhEzagEWZG488pB/w64wNstk/aQg gGwPhu2QPocuDm6KzLKSNA8WW6QFgcYd+2grg69LoQe/IwOu3fRiOc8K1lPP08u6UDZF yQcS/v88niWn9M0oeA7t5js1q6oKJK9D8fqZj528I0lZW/q6fUSTXFEZvV+grQ9n1EXW Ak8w== 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=u5FyWnGHixXub6SEMrFQZzqZKl81tTikPRrpSbGSxEI=; b=D6//UVSQY7gUnqnfmCLmJUpbCbmx+RFu/dl7TpOvXSmEn6eD3rjNX3vYpXupMlyyuH RWRTSXLqKZ3QIO0UQ9WLi/yc3WoOs7vMC9XaRugmoIwwiVfAwaHQ6FJr5fRznz8zDwXn hhpGUiJ+KZHvx+p0zawqns4Qtz5/v6ek15jsAtxJfXISeDK1lBy19Qh9fyhfs1/DuRax zdo5YT6MJWl/XpN57msK9LMh0oyhm7QFq+2bz/iZEmAPXLKyN0YP1GAUnOnBN4Y/gmRs yesA4KJu36IMQNW1s88THv10gqlXHI2ipwDlGja/vpNJbvG7UKXF9WlXFZYI/jRYda57 Xurg== X-Gm-Message-State: AOAM531ljIl3D2QuFWEtehqh94TQ1kb8DcSrs7d392KIfNxauHY1W0Yf jMlQPRuq7SJH3FF93k/gGYwvP6pg X-Google-Smtp-Source: ABdhPJzQ5YccBsANE0WiPnIYBgUWnmpMsFnz+/3rdpP3+HKF10gyblSAv3p/kBWMDH5wE7q9WmJcuA== X-Received: by 2002:adf:a285:: with SMTP id s5mr18046460wra.60.1589757233024; Sun, 17 May 2020 16:13:53 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id q144sm14700203wme.0.2020.05.17.16.13.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 16:13:52 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 01:13:19 +0200 Message-Id: <20200517231319.13067-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> References: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] avformat/webm_chunk: Open AVIOContext before initializing sub-muxer 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" The description of AVOutputFormat.init contains the statement that "this method must not write output". Due to this, the webm_chunk muxer defers opening the AVIOContext for the child muxer until avformat_write_header(), i.e. there is no AVIOContext when the sub-muxer's avformat_init_output() is called. But this violates the documentation of said function which requires the AVFormatContext to have an already opened AVIOContext. This commit fixes this. Signed-off-by: Andreas Rheinhardt --- libavformat/webm_chunk.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index 1749509975..f1bee5fa9f 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -44,6 +44,7 @@ typedef struct WebMChunkContext { uint64_t duration_written; int64_t prev_pts; AVFormatContext *avf; + int header_written; } WebMChunkContext; static int webm_chunk_init(AVFormatContext *s) @@ -101,6 +102,15 @@ static int webm_chunk_init(AVFormatContext *s) avpriv_set_pts_info(st, ost->pts_wrap_bits, ost->time_base.num, ost->time_base.den); + if (wc->http_method) + if ((ret = av_dict_set(&dict, "method", wc->http_method, 0)) < 0) + return ret; + ret = s->io_open(s, &oc->pb, oc->url, AVIO_FLAG_WRITE, &dict); + av_dict_free(&dict); + if (ret < 0) + return ret; + oc->pb->seekable = 0; + if ((ret = av_dict_set_int(&dict, "dash", 1, 0)) < 0 || (ret = av_dict_set_int(&dict, "cluster_time_limit", wc->chunk_duration, 0)) < 0 || @@ -147,19 +157,10 @@ static int webm_chunk_write_header(AVFormatContext *s) WebMChunkContext *wc = s->priv_data; AVFormatContext *oc = wc->avf; int ret; - AVDictionary *options = NULL; - if (wc->http_method) - if ((ret = av_dict_set(&options, "method", wc->http_method, 0)) < 0) - return ret; - ret = s->io_open(s, &oc->pb, oc->url, AVIO_FLAG_WRITE, &options); - av_dict_free(&options); - if (ret < 0) - return ret; - - oc->pb->seekable = 0; ret = avformat_write_header(oc, NULL); ff_format_io_close(s, &oc->pb); + wc->header_written = 1; if (ret < 0) return ret; return 0; @@ -270,7 +271,10 @@ static void webm_chunk_deinit(AVFormatContext *s) if (!wc->avf) return; - ffio_free_dyn_buf(&wc->avf->pb); + if (wc->header_written) + ffio_free_dyn_buf(&wc->avf->pb); + else + ff_format_io_close(s, &wc->avf->pb); avformat_free_context(wc->avf); wc->avf = NULL; }