From patchwork Tue May 9 10:30:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41560 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2960397pzb; Tue, 9 May 2023 03:31:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5X0B5JlcYYDLOvhwc1wpTc1ySVLHT3A0giw5CTR16YDWuJ0M0YehnBSsgGt5G0TLxQ+RbX X-Received: by 2002:a17:906:4fce:b0:965:a414:7cd6 with SMTP id i14-20020a1709064fce00b00965a4147cd6mr13951608ejw.17.1683628300761; Tue, 09 May 2023 03:31:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683628300; cv=none; d=google.com; s=arc-20160816; b=UoYAuOAJb+au7491rJ7PUdIiw8A+VpXb+oGPEEAYWcCQHF3p7FdfPnUEEFMMMkadjz kTyaP9yRZ6mySLJ9Crh6RCgLJNoa2q+m94nab6QJEslqpzj18yZ9WA7jEJ4oqgjwe6Ov 492coQIYeZMTenDm4sErXAb+g7TPXthCTYvj16V8E/Yjviyz6o/hkAGjYwwbtW8Fj2xj SVS+9FRpuVI0yMA3w41SLTKnQuo6u1Vo0xflG+qITZacJxR2k7q6y6uunhlqAnQsF9Im UAkqcAygkv70qa5VQN/X2ZN32xrifpBRuQPrfgt8wxtuDiMeDrfLUVB17Euicp1HhVLU iuXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=HFDjaJf8nLHI8qFWa8jkYeZ3MnieWrAP91uylyPKi/Y=; b=ItVr23e0icEjmjTmUixd1i//HGiz8uuuBcByPjRVwoOs/BrMGFcbiBGFXULj41gOkc iUikUYPLO70lpMgHLlQ3nMrKo3xF5GFy5qU8jZ3SWzsVTw3zlLQ8xPH7UVMAVjCHuZHb QpvnDGu+PzWe8dS+qaPSbYm/jHf9ua6BqB8sPuqziipo7sbfRPJS9ZN2P2JAHg9aR7Ym 3boulm0vDHFEcOYB29DJmbjntOR6b22yWqrP+62HjypxgX+bBXuvUwgxdp5c6vmDDv0c WQg1Ejsd7FX3OGHidtttm3q/UTNIO8Q+b7TMhsWlizTqD3RWcxdfvz/tvM9bxVZd8DOS mvfQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f11-20020a17090660cb00b0096628b314fasi1850708ejk.793.2023.05.09.03.31.40; Tue, 09 May 2023 03:31:40 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADA9E68B076; Tue, 9 May 2023 13:31:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D907689D6F for ; Tue, 9 May 2023 13:31:20 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 461592404EC for ; Tue, 9 May 2023 12:31:20 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id f6acYtzpxDQb for ; Tue, 9 May 2023 12:31:19 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 5BF922404EE for ; Tue, 9 May 2023 12:31:19 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id AAF513A031B for ; Tue, 9 May 2023 12:31:18 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 May 2023 12:30:39 +0200 Message-Id: <20230509103041.5537-1-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavc/decode: drop a useless warning 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Jce9TGq2SZcJ Decoders will currently warn if an audio decoder not marked with AV_CODEC_CAP_SUBFRAMES consumes less than the whole packet, but * this happens for regular files * this has no negative consequences * there is no meeaningful action that can or should be taken in response The warning is thus useless noise. --- libavcodec/decode.c | 7 ------- libavcodec/internal.h | 2 -- 2 files changed, 9 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 4f2359f07e..360837a0ad 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -423,13 +423,6 @@ FF_ENABLE_DEPRECATION_WARNINGS } } - if (avctx->codec->type == AVMEDIA_TYPE_AUDIO && - !avci->showed_multi_packet_warning && - ret >= 0 && ret != pkt->size && !(avctx->codec->capabilities & AV_CODEC_CAP_SUBFRAMES)) { - av_log(avctx, AV_LOG_WARNING, "Multiple frames in a packet.\n"); - avci->showed_multi_packet_warning = 1; - } - if (!got_frame) av_frame_unref(frame); diff --git a/libavcodec/internal.h b/libavcodec/internal.h index a283c52e01..dceae182c0 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -148,8 +148,6 @@ typedef struct AVCodecInternal { AVFrame *buffer_frame; int draining_done; - int showed_multi_packet_warning; - /* to prevent infinite loop on errors when draining */ int nb_draining_errors;