From patchwork Sun Jan 24 13:00:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linjie Fu X-Patchwork-Id: 25146 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 03B8444ADE5 for ; Sun, 24 Jan 2021 15:08:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4344687FFC; Sun, 24 Jan 2021 15:08:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65487680A2D for ; Sun, 24 Jan 2021 15:08:02 +0200 (EET) Received: by mail-io1-f52.google.com with SMTP id x21so20976906iog.10 for ; Sun, 24 Jan 2021 05:08:02 -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:mime-version :content-transfer-encoding; bh=W+fkLjt0B7BW+0CDU8ngejCgCXunO2lDgHDmjISDYSA=; b=NOKffhvY+QgG5pNwujEcRGGyizS+bc2W24PFhPtUmwZIOKM5D3gBss9Ex4KvV3QWYn /TYqx9gk1DJqBo2gBfiwjSLvub2Q2CjOxFa05mxNhxayg4Fn77mIB6lrIcfdoTsv3wyV MM6AYAxlzVdN3ajUd2yA3Aq7PMCUslyXKQiit7OU9mOIZRfazl+QEEkZnTeGxxIRTvTS RdhO/W8GOWL9iSU98VCVPyfKTqJ2m98kTm486C5VumLMfsbgYGfd2deuIcIM/7pt71+J D9zmcfCq3ESFNBJg+H6Qr+nrySqXtB3qDIVsebsYFcH/3WiZ12Cih4jsslMetaML0JEO 9hUA== 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:mime-version :content-transfer-encoding; bh=W+fkLjt0B7BW+0CDU8ngejCgCXunO2lDgHDmjISDYSA=; b=Bjvyhx+5AdC8NXLcxKleUHqRUJBJXYg9FK+wJ620vU35+wc72OReLzSnBFqu5ERqKK tkhyEGA/MwjCwrjWfBRd+6oFZNED+Lo7K5UQmTg6PuDTSM5Vx6Y8dRCCZwwwIweucLWC BOZblW8U7olms6l5G6WkD5pxfKDxO1+Av5BQurUHOqxy43wZQ/MiOrX9kR7CN26jys5U j4SpwYn5wF5mwDBYNTx9pyyFiYWIEsYmqmo4A7VKzC17d7xAkw78Kpzomgo+vaD1zgzc EXWlUQKAZzEiTARVOWQ8SAdjvp42coAojVer1vV2p+R4PhWpEa0M8XI6QyrfSwZ2AujQ /xCw== X-Gm-Message-State: AOAM531rAvUX3XWFeuNkThkMGh4XX16BQ8uqKX1uPLG2NLTPx7utpL2B iKQfB2igGkhvlRj97eTDPk9JLFO2Ha4= X-Google-Smtp-Source: ABdhPJzRyqncZ56zg3677kKFDR8uKN/bZrBB81yNxznajfnRYvRqSj/d2T89TYvqLSNmavXw9keS5w== X-Received: by 2002:a5d:994c:: with SMTP id v12mr148794ios.201.1611493275240; Sun, 24 Jan 2021 05:01:15 -0800 (PST) Received: from ip-172-31-39-116.us-east-2.compute.internal (ec2-52-14-134-25.us-east-2.compute.amazonaws.com. [52.14.134.25]) by smtp.gmail.com with ESMTPSA id e7sm9885633ilr.13.2021.01.24.05.01.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 05:01:14 -0800 (PST) From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Jan 2021 13:00:33 +0000 Message-Id: <20210124130033.1086545-1-linjie.justin.fu@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_opt: restore to use codec_info_nb_frames to calculate score 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: Linjie Fu , Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Linjie Fu Regression since 87f0c8280. If the extradata of a stream could not be extracted correctly, codec_info_nb_frames would remain zero, while st->event_flag would still be marked as AVSTREAM_EVENT_FLAG_NEW_PACKETS since it's a new packet indeed. The two expressions could be different in this case, hence restore to calculate the correct score. Fix #9029. Signed-off-by: Linjie Fu --- fftools/ffmpeg_opt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index bf2eb26246..ba813ea7bc 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -2228,8 +2228,7 @@ static int open_output_file(OptionsContext *o, const char *filename) for (i = 0; i < nb_input_streams; i++) { int score; ist = input_streams[i]; - score = ist->st->codecpar->width * ist->st->codecpar->height - + 100000000 * !!(ist->st->event_flags & AVSTREAM_EVENT_FLAG_NEW_PACKETS) + score = ist->st->codecpar->width * ist->st->codecpar->height + 100000000*!!ist->st->codec_info_nb_frames + 5000000*!!(ist->st->disposition & AV_DISPOSITION_DEFAULT); if (ist->user_set_discard == AVDISCARD_ALL) continue;