From patchwork Thu Mar 12 17:54:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18138 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 BF55A448A93 for ; Thu, 12 Mar 2020 19:54:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A879668AFC8; Thu, 12 Mar 2020 19:54:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4D3D68AF22 for ; Thu, 12 Mar 2020 19:54:41 +0200 (EET) Received: by mail-wm1-f43.google.com with SMTP id 11so7084670wmo.2 for ; Thu, 12 Mar 2020 10:54:41 -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=8x3271QBNIgiSppY30+pD+4xztax53ToyyK7LASkARU=; b=CodSYeJ0k5TkCtGYt5k53FGspxG/LjpXPsqhZlOyyVxgMWpofzB75H/nL9QDUi9Lp4 4Htu64CpDbtcdZn24YTIuf+uHT5+ER6iPUJp/MglVhfGIidjOPH5Eqo9Q3PLfbFuEXc3 5lgPAf6papaYfO0Alb4PQmBWkIxYYhjNvD5Bly8IjfwMbf3PWJ1fi9+fJX2JicTgC/t9 xX+HtmNSZBpr1PN1RgLVIf1OLEpdDFwJ+CLYoYklERmJRMD9Q5ReD5vCd5TIOHlHjTaX R0BSlE/Fiw3JCz1YlMb9IQijSjuzWdyIO7dwtNnafByU3fjpJK6Y4ginfs0xEZUnkIl7 bRnw== 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=8x3271QBNIgiSppY30+pD+4xztax53ToyyK7LASkARU=; b=NJf2GU0Azj7MzAmm7T/u81AibUJj37AKOpCxQFLuQ+iQFe+6JQ+S6DBE5J0rS9fwpC tEeab0wACJcebrvAsiIWhKQyK6zbVPBtKuY9RoNe1sqA0wvSq7hDZJWSAgTOEFU5KcMm bBjs7ALsslI5yvWajjF9sZoFnd0VKyg0VGXpdvsqpww/anzaSYd+c7r3bHGtCbC9Ugp3 MOPZpJwq5lnGbBG69llKCrGKz8iwj4T/HHDvpFLplfbq18iFowZzJel/QTqPwMMrrGlL Igvz8bGoj0gn91/cC2v4oaERBvsZqe4B3BbaDNayBPtw23IDhDWJ10NucUkSe9et/Ay4 mdyw== X-Gm-Message-State: ANhLgQ1dmcp87iXyvdPZc3hqr9OLvXdL8ByVSIsuuRAIHPvflSp1wCP8 Iei3QL8cM7ELTfqwK/bXUe6z/orl X-Google-Smtp-Source: ADFU+vtbhFnrXduMNedrSDj+lcotaIdAFA5j0SUDmVhV4qkNyq/nP9SbXWPGUbCcHDO7bqB0bx3PLw== X-Received: by 2002:a7b:cc9a:: with SMTP id p26mr5976471wma.0.1584035680927; Thu, 12 Mar 2020 10:54:40 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id h81sm407577wme.42.2020.03.12.10.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 10:54:40 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Mar 2020 18:54:08 +0100 Message-Id: <20200312175408.31391-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200312175408.31391-1-andreas.rheinhardt@gmail.com> References: <20200312175408.31391-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mux: Unify setting number of muxed packets 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/mux.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index bc2eab0c96..bfd1bf491b 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -763,7 +763,8 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) if (ret < 0) { pkt->pts = pts_backup; pkt->dts = dts_backup; - } + } else + s->streams[pkt->stream_index]->nb_frames++; return ret; } @@ -912,11 +913,7 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) return ret; #endif - ret = write_packet(s, pkt); - - if (ret >= 0) - s->streams[pkt->stream_index]->nb_frames++; - return ret; + return write_packet(s, pkt); } #define CHUNK_START 0x1000 @@ -1237,8 +1234,6 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) return ret; ret = write_packet(s, &opkt); - if (ret >= 0) - s->streams[opkt.stream_index]->nb_frames++; av_packet_unref(&opkt); @@ -1263,8 +1258,6 @@ int av_write_trailer(AVFormatContext *s) break; ret = write_packet(s, &pkt); - if (ret >= 0) - s->streams[pkt.stream_index]->nb_frames++; av_packet_unref(&pkt);