From patchwork Tue Nov 10 00:58:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23460 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 6A0D8448FFF for ; Tue, 10 Nov 2020 03:07:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F6A868BD36; Tue, 10 Nov 2020 03:07:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C47768B9B7 for ; Tue, 10 Nov 2020 03:07:52 +0200 (EET) Received: by mail-oi1-f194.google.com with SMTP id q206so12405307oif.13 for ; Mon, 09 Nov 2020 17:07:52 -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; bh=754nYCoOYN5W5wbK8rlLSXzSyndT+pCVwht7p9/aqFk=; b=LtmJ51tjL5yyTsbjYVwtvhLGJn0V0U7JkspIb0/+DvQ8a+YaO7ABhLkBtARsXFmqEh l8KBjNnobsiyJJikqbb/W5sQVG52FsdZEVwnk7oeUMqgcAkGL7xWQcVVmUH/aWpnCk29 tsIjupV5E6GpAL8NXXUGTd/GS3WUSPmrUJRhO1gEVx4GBMfv7HQyLMxJAcFAmqHQS/yH eRLX69dNv/UelwLd7EjMstmvCVEY3Sfi+T1jN5GTKOgUq1mdKU+DhZdRh8zPo0nv9oSc BoPOTy8RAHhYi1+NWfOV5o0Iw9oJJ9UI55czvYUkuq7QIfDp1ZNjZHZiEy7Y56QAocN0 BzyQ== 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; bh=754nYCoOYN5W5wbK8rlLSXzSyndT+pCVwht7p9/aqFk=; b=f3w56dZhoKhA0qIGJd2nuyZizcyzqyHiwSxb4HiGil3C15DTG06gTPPwAGjDr+uUNl s5SgovdYaRMJ5bIbQwGqy2B1CJWQmQ3qR0ktMvPiOb0dBtI0FUSOq3oB9R9dTY9/Fk/G /d64M/bc73rsRi7+qhf922fqlZxvpYq0Ja0NtJfiJEt2xoMmuoWMsx81WA2JB81VaE3z FbpN4bkO+tF41g3YfVxQg4Kjb0JUnWnrAvB/2ht361XxRlf3LhnWRP4aDePJavT9AM/1 ah8bcNtdiafE4QMQkF5KYQvTKTFrykcJwW+upfw+QehU1ZAuftt+vsmvGZKrDy5IDC2Y 2ogw== X-Gm-Message-State: AOAM530WbhtFdB5RrYg9Was6lBnsm4v4uKE8jI2iiShClDaLWjyXA/tw wnuSpHmzCvlqxsaqclvW9r7xbh1587gAFw== X-Google-Smtp-Source: ABdhPJyiAI3E5keqsIPH182eeWvopNz8lhSnrADD6WwJZcCpuDU3rI87ZjtPGaTICNKytkAYMUpr2A== X-Received: by 2002:a17:90a:5204:: with SMTP id v4mr1897337pjh.188.1604970106236; Mon, 09 Nov 2020 17:01:46 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id r127sm12183969pfc.159.2020.11.09.17.01.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Nov 2020 17:01:45 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 08:58:36 +0800 Message-Id: <1604969916-3030-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1604969916-3030-1-git-send-email-lance.lmwang@gmail.com> References: <1604969916-3030-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/4] avformat/dvenc: check the format before vst and ast[i] are initialized 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/dvenc.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 1c38673..6c0d40f 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -311,10 +311,20 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s) switch (st->codecpar->codec_type) { case AVMEDIA_TYPE_VIDEO: if (vst) return NULL; + if (st->codecpar->codec_id != AV_CODEC_ID_DVVIDEO) + goto bail_out; vst = st; break; case AVMEDIA_TYPE_AUDIO: if (c->n_ast > 1) return NULL; + /* Some checks -- DV format is very picky about its incoming streams */ + if(st->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE || + st->codecpar->channels != 2) + goto bail_out; + if (st->codecpar->sample_rate != 48000 && + st->codecpar->sample_rate != 44100 && + st->codecpar->sample_rate != 32000 ) + goto bail_out; c->ast[c->n_ast++] = st; break; default: @@ -322,20 +332,9 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s) } } - /* Some checks -- DV format is very picky about its incoming streams */ - if (!vst || vst->codecpar->codec_id != AV_CODEC_ID_DVVIDEO) + if (!vst) goto bail_out; - for (i=0; in_ast; i++) { - if (c->ast[i]) { - if(c->ast[i]->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE || - c->ast[i]->codecpar->channels != 2) - goto bail_out; - if (c->ast[i]->codecpar->sample_rate != 48000 && - c->ast[i]->codecpar->sample_rate != 44100 && - c->ast[i]->codecpar->sample_rate != 32000 ) - goto bail_out; - } - } + c->sys = av_dv_codec_profile2(vst->codecpar->width, vst->codecpar->height, vst->codecpar->format, vst->time_base); if (!c->sys)