From patchwork Sun Dec 17 11:01:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 45186 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp6749479pzf; Sun, 17 Dec 2023 03:01:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IFthNpS+KD70pqdW6OKSQzhqvKlV8oJwdB6OaaWzp4O1EDMdVe7v4isA5VnPZgESkilPNxA X-Received: by 2002:a17:906:5345:b0:a1c:b707:cbd1 with SMTP id j5-20020a170906534500b00a1cb707cbd1mr12141866ejo.24.1702810895907; Sun, 17 Dec 2023 03:01:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702810895; cv=none; d=google.com; s=arc-20160816; b=uC+luHwnfzvE8bNcadnhWfU3cjQCMlMa9nF7f2yyZn61lqTK6odZURzRDCOtAhXaBg KhdXMrUiJ2nWDPIJlDcdo6V5vQC0lSE564jf93TaddnEHFJ7bpWd1tG/unHrVo1JSNJz sUJLSYE4GLQhdpJMZMHKTrlR3tsq5zR2aEqyX3JU/e3u6kwzsDq08DqZ6fqxeegwCKND CVvCmDwkQv3Dbf806rGQOh9Bp0ZXWup8NllqtnKtumbrFtX4ni1ktyCQh91PcvyyA67J O1up+f87dfCEwhhvw0Pn5ANT5xuHvemj1ul6C+GSAXefTKflb+ecsE7fCzUAno8YawYj O5tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=qtAMBswMW9uAuudJ5KJCoOhW8PNF/7IVu10E4WHc+0Y=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=LZE9c7uNjuADJF0VQTybJ03vjb3FL6lsgHjUunbpfbZl6Q60M2IR+zIGNbVds863y1 RtbiQOHbTXiZczkCQI1zPgLJ0hk76ZipFu0/LzYLwKA9AXPczbsnFgMGT9jZmEzv3U2m PSyoWTgwcXo5jJ68AUVdI5qaWxFEqaTv6x+qWk/n4AfmmGi8sie1J4EIEKBDey0It6h+ uSUtMDa7eLY8KlyO4IQtdWX+Q4lB5PVWuvpMqtbxRiNT7/2JtCHhevtm6gTbIACim1MF /8Ebt4T8890RPMjsukxcBDql8m8D6M3sAQz97jjxwtfBlATH0XMS5FnubT4iW9MNDL4b w4Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=shxcpAo5; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b10-20020a1709062b4a00b00a234c908275si320606ejg.725.2023.12.17.03.01.33; Sun, 17 Dec 2023 03:01: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=@foxmail.com header.s=s201512 header.b=shxcpAo5; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A813368D14B; Sun, 17 Dec 2023 13:01:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-80.mail.qq.com (out203-205-251-80.mail.qq.com [203.205.251.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6602368D13C for ; Sun, 17 Dec 2023 13:01:21 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1702810872; bh=jibjWQUmXBgCjYsWGJ70nbfhX4tHLmfweLRCaSPSJj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=shxcpAo5FQVo0bQyqSq4W/bWOaiAh2NLhKdgAmXyIc8GH8wjgOrQkP/y4M3xpSoih ZIFUIVtema3O9lbBm0GcuZXHeuJLvdZsMeQwqqBfbgJYWdzbke0N4XvkUJ/mVXnPzN Qj07+CmYMJ110NXDW7rt0de8Ow+wZHGuQ0+yqzm8= Received: from localhost.localdomain ([113.118.106.67]) by newxmesmtplogicsvrszb6-0.qq.com (NewEsmtp) with SMTP id 4B23E98; Sun, 17 Dec 2023 19:01:11 +0800 X-QQ-mid: xmsmtpt1702810872tg6au08hm Message-ID: X-QQ-XMAILINFO: MesT5uKpDagVDjIdEtcOMAUJMbYWvmR/DVfV5oPBmieFEjJv5Bno3i4jOun8m6 VJcJMj9jnvWNNLgu5L6fBS1L9dtWsCXuJxEWKqjcIgWc0Pr2ePuanWYHv+2Lhh4M3XkeJEEs7Je0 dvTCaC0jP2y9sRxmt+Uok0VS+wdU9FS8kT7wPOz9gCQHj7890mdjIttCwzKJjlwdfTEbZcYBOQrx fiBa3lcdR29RrxTeIFyfV+IL2DhbFWmigwDZJs8uzxh3zpvglKtBKyoE7lYmXhp8gMM2HrXNI6k1 KcqLhPl/vztqp/eA1bTEugOtpBOA2ejuL07QbQwuhj7QJHFWQQdYfIBrOSnM3aEFV5VKc2M2frTN hsHXe2Ia+464SK6Hezz4yEfzW3SJysCseABR1c5vSdjl7x0666H2UKgqT4mO+VuCG8TbjOmjg/IN YH35Swnt6pVDKVHJ0i7y1rfP8u6hy9BKSYAelPTFnAk+yKmqt20L2gw85J1DSaVwow9R4SX0dR3R gRa9JfwSVT+yeses9dXlgsVZT0TlvG9RqtJyX1QmrEpdt+2Ti3tYSfJtaGGEpZAlnRNM3ryASVGR TV1nxgFjgk9bUmja6uRHGSRs2/lQ08m6rflvyZn/hgdTVL90O5OAJ/9TzSLRm5n7eXDMS87XEG91 hTdXeG3spKxHdcq6Ke4uOrzm2pQIktRyHNVDp4e0rUiRaw0jptwE7XmOyPIf6yXmGo0Oops1n9Bx RxtST6s1j4yigFpNufYMbLt/LgznDYiTX76HtPqXL4etM5hakvIUm9v4eOf6SxionNVUeZzuTvxx C4iRepefKEE+be5um7UvovOXt0WQoQ3Ymbz+a95z/3DtJ/DrI4pJ9j6Gc79qqDJoc9/w3I1cnJ81 uO8GO4EuNbqfHrxUx1AIAQItQ6XUm77MzU/Nx3QM/Uo+kk0njjHSGE5KUKex7G8pfrcQQalJuQj0 nnehx3B3BJZTVPthoWtmYfFnCg+mZcnLy2yCeyJTgw4LjeIeY5iA== X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 17 Dec 2023 19:01:09 +0800 X-OQ-MSGID: <20231217110109.264409-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231217110109.264409-1-quinkblack@foxmail.com> References: <20231217110109.264409-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] fftools/ffmpeg_enc: assert frame->format isn't NONE before use X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xyX55nJKnGZB From: Zhao Zhili Signed-off-by: Zhao Zhili --- fftools/ffmpeg_enc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 9141dab6a4..ac38e8db75 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -206,6 +206,7 @@ int enc_open(void *opaque, const AVFrame *frame) switch (enc_ctx->codec_type) { case AVMEDIA_TYPE_AUDIO: + av_assert0(frame->format != AV_SAMPLE_FMT_NONE); enc_ctx->sample_fmt = frame->format; enc_ctx->sample_rate = frame->sample_rate; ret = av_channel_layout_copy(&enc_ctx->ch_layout, &frame->ch_layout); @@ -227,6 +228,7 @@ int enc_open(void *opaque, const AVFrame *frame) av_mul_q(ost->frame_aspect_ratio, (AVRational){ enc_ctx->height, enc_ctx->width }) : frame->sample_aspect_ratio; + av_assert0(frame->format != AV_PIX_FMT_NONE); enc_ctx->pix_fmt = frame->format; if (ost->bits_per_raw_sample)