From patchwork Mon Nov 27 17:17:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 6406 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2030796jah; Mon, 27 Nov 2017 09:17:35 -0800 (PST) X-Google-Smtp-Source: AGs4zMZOsWvpTnGE+FHyoQtf1t5E1TytzeEaGDkxt0IB5ZgXNJi+MuH2PgrKwix7y7QQuAlc/+9E X-Received: by 10.28.71.5 with SMTP id u5mr13247261wma.84.1511803055200; Mon, 27 Nov 2017 09:17:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511803055; cv=none; d=google.com; s=arc-20160816; b=ajkLDpYILRukLvM1Ajf8xW1A/uaTgMal8jmMSFiI2px+hY1md8mkLuAASAZa2mlodx Cr80Z9qTHCYLXe1Gnf70J4aakuA+CP0EATS8jXsyAVxDPK6pAij666M2eLM35ZjawmNr 1++cZ+e+bRTbg7cz/M0/eh9VhnY2lr2J4MA6BOIgKWJYuUrpAoSdiza0VuRmq53VAYi1 bnd3cM+fOIVJdUCvh6OIjzJ+ynDIc6EZlc0G3EbdYd3T2xfVqGGkNaFU4qIbJLELK0xl Y7rFyomXByQbuglTUIWasLcME0skTEfw9/DfL1zTC2n4nCuiU2Gn4As2RTMK2dXtY0p8 Rk1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=VBCpYY/unm/HEf1Juv53yeBpHByReIXwMKSxWOrJIDA=; b=JX9je5vqFZJq9e7405s/M0k9zym6ri5VpHNFJB9wBez1mVzPN9v68k00N+ppDL4T+u wCIhqqZzGxxrJFx3suBbYKqCDX9BAuAZMi+sHynWLLaz6e/BfcbU7cL3gdt1xbLLXZ+R UluBnqzU6Qe5cIKirj5L5E3AYWwlKijcF3dAS3yG2PhNvYwHGIbP0qYO+upNmFO+lOH9 k8Pa/xnaP0DMEx0gJ9UXehS8E/eimFljYg2bToiDi8GnjRS89LiiECqEpRJQSfByFGUu DnVTSW0W5mgcpnrhFRfzcN96ss0kw6ZeOb+P+xAr2ZMy6teuzPU5SKqVX139LXYVcMrs DduQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Le91cdca; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e30si12906621wrc.555.2017.11.27.09.17.34; Mon, 27 Nov 2017 09:17:35 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Le91cdca; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DA99E68A2D6; Mon, 27 Nov 2017 19:17:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34CE468A1E3 for ; Mon, 27 Nov 2017 19:17:25 +0200 (EET) Received: by mail-qt0-f194.google.com with SMTP id h42so39994302qtk.11 for ; Mon, 27 Nov 2017 09:17:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=u74dcTZTFMDnjRC1UqKy3GjtRtGKW+DMHi2al2oK3Xk=; b=Le91cdcaRf+G3VeqBbOAcGEV7PxhBSyCj4+XZnz+wfdW1Akxu29AzD0n7qqueZjqUt t2OaVnWeQQX3Jb2dlKcN1tLGdSiVk0GF5u00lwZLkHmsR03Fsmcgi00SYifr3KHyQEGw g41/Msx2mtmhh6m0Lx1TaQn6Do2qZL0al1oVpVE8VIlzQtyZdMOljqVGic+re6BWm5V2 94RG+oXYHfx42uDjRT1gFsOBRFEl+PMIx7RukqeitJ4hHwCnvA6LWJWrEoUY/gmKCjE0 Q5PakxuR8DhUvMwZH2ZySl8RRbtYq0Y/i3uUAsclMk+a6nxbs1U9pIdMjv6nkaSaZJGl hH9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=u74dcTZTFMDnjRC1UqKy3GjtRtGKW+DMHi2al2oK3Xk=; b=iiIq3Y+AmeI05vGsv63TfqayY4P5B0JnCRymZNGrQARHfHN0AXoSKp9FswJL9nfDng 2eD3aULrj5DD0Fw0gDT+k+AUj/TF2HAAPBtvZ9wKPeMIStS3Qo/UT6s48Wq6GXK5p1TQ 3k9eeJy1gi9QGrfyrsknLV/IYUQ6kRjytV1jjABrRJnQW/XbQbxKso6wg/pLVOmRGqbl o4v6ddLjuoCvHtVWLJU4FUcYDpA+YvgYb1gQMPjDjIky2akpVaW17yxQuYdwIRavyw/U smUqYIUoiyPR77ro3vXwj2TQTBS6iUYs8ssqegn7RTXiRZXGd70tPOPK1eK1qSl/Bphx ylTA== X-Gm-Message-State: AJaThX5b4wEjpSaWpl3zRMt/Ay7SVs7rxsmumbUMLXQmOja1wwcL642v 4MUVdVYNHhBrI0LgxO7dFUSS9w== X-Received: by 10.200.47.12 with SMTP id j12mr60839369qta.204.1511803046065; Mon, 27 Nov 2017 09:17:26 -0800 (PST) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id d198sm10785221qkg.16.2017.11.27.09.17.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Nov 2017 09:17:25 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2017 14:17:08 -0300 Message-Id: <20171127171708.5640-1-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH] avformat/matroskaenc: move some initialization checks to mkv_init 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It's the correct place for them. Signed-off-by: James Almer --- libavformat/matroskaenc.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 06126781f8..35857bb02e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1859,25 +1859,7 @@ static int mkv_write_header(AVFormatContext *s) av_dict_get(s->metadata, "alpha_mode", NULL, 0)) version = 4; - if (s->nb_streams > MAX_TRACKS) { - av_log(s, AV_LOG_ERROR, - "At most %d streams are supported for muxing in Matroska\n", - MAX_TRACKS); - return AVERROR(EINVAL); - } - for (i = 0; i < s->nb_streams; i++) { - if (s->streams[i]->codecpar->codec_id == AV_CODEC_ID_ATRAC3 || - s->streams[i]->codecpar->codec_id == AV_CODEC_ID_COOK || - s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RA_288 || - s->streams[i]->codecpar->codec_id == AV_CODEC_ID_SIPR || - s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RV10 || - s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RV20) { - av_log(s, AV_LOG_ERROR, - "The Matroska muxer does not yet support muxing %s\n", - avcodec_get_name(s->streams[i]->codecpar->codec_id)); - return AVERROR_PATCHWELCOME; - } if (s->streams[i]->codecpar->codec_id == AV_CODEC_ID_OPUS || av_dict_get(s->streams[i]->metadata, "stereo_mode", NULL, 0) || av_dict_get(s->streams[i]->metadata, "alpha_mode", NULL, 0)) @@ -2656,6 +2638,27 @@ static int mkv_init(struct AVFormatContext *s) { int i; + if (s->nb_streams > MAX_TRACKS) { + av_log(s, AV_LOG_ERROR, + "At most %d streams are supported for muxing in Matroska\n", + MAX_TRACKS); + return AVERROR(EINVAL); + } + + for (i = 0; i < s->nb_streams; i++) { + if (s->streams[i]->codecpar->codec_id == AV_CODEC_ID_ATRAC3 || + s->streams[i]->codecpar->codec_id == AV_CODEC_ID_COOK || + s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RA_288 || + s->streams[i]->codecpar->codec_id == AV_CODEC_ID_SIPR || + s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RV10 || + s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RV20) { + av_log(s, AV_LOG_ERROR, + "The Matroska muxer does not yet support muxing %s\n", + avcodec_get_name(s->streams[i]->codecpar->codec_id)); + return AVERROR_PATCHWELCOME; + } + } + if (s->avoid_negative_ts < 0) { s->avoid_negative_ts = 1; s->internal->avoid_negative_ts_use_pts = 1;