From patchwork Fri Sep 13 05:40:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wang X-Patchwork-Id: 51572 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9fc3:0:b0:48e:c0f8:d0de with SMTP id k3csp100290vqy; Fri, 13 Sep 2024 16:19:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWZbF25Ax49YjuZeG4cnBfTr0t6N9YtMa4cAswS/CQ7j+2K/3/GBsMJ/nIHvZOAtKPaKnPsu0uaJqJyx6hTSK3O@gmail.com X-Google-Smtp-Source: AGHT+IHvemk1cF+CWbvNN7k9QvcLB1ZG4Evbyzk5lTnZlZ41C2hJEDAEQPWkxH2eDerA8F7jYDnZ X-Received: by 2002:a05:6512:128b:b0:52f:228:cf91 with SMTP id 2adb3069b0e04-5366b913c41mr5388422e87.1.1726269551004; Fri, 13 Sep 2024 16:19:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726269550; cv=none; d=google.com; s=arc-20240605; b=RxTaLOceIvycuAw+gDA5QCF3G89qXQKtrdST4jfbsrf+V32plJHec7JrWxdUo+2exY GluszrpvpJ7908rXFgDSp4u+zHyDTROTUNg/VEmlP8GfNzspn4OfZ28Rn5ZwuRMjOl2q b8MOkTVsNo/OTkRtb4AgHyz3JUn23OJPsyonAw7OVGygB22qm6hjvmPOlDe2yHMvmA1v Aq+cN53IIqxzJmym58kxkiGOaD1dXHKVYGOSw7kmAgWgzCRBM8LcF5rcAsauhbmlpv5a orbmPiEZonsSA2RvaWfxYXPOtwr+EYkGlYn5VeajvH7xQZjHjUl0eVsVqOvkpD26dNBV yhgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:date:mime-version:from :dkim-signature:delivered-to; bh=tTSmUdLbJaJbgt08I5GzEy+LKMhenS3NNaqwdLd4fYs=; fh=4yZsIQoPJJREUPwTmtp9+mZwIGSD2GAqdTM0lnjqQjI=; b=A9E7RYiBPMcMiAN1kftVpmNn7ynse+VUfStQETHapbzaKLoQ2cmVagnLo4VNY+wRyK sFIyRZT7vk/w1PKUke+v7B1j8xxA2x+RWCS19+j7kTlB/cpVq+LuxCMO94/6K1Wdq6LH ptcEq+aD1CQuiIM7PI+kDxkyZ55RVw80SbzhzJoiTZnov5QMcrnvMqvcpmVKv5xm+XOD /5gtqBeB5AJtVLCeZTF8WwdVeffHfdS+qpbgU50H93Gf23XDhHSDnYj216M957X2s/QU lfdicRiBfH+EkKSkrr5PLnysxEFZUcUUSPIIBEP4FSJxagGIXv5YDX75NNYu8J8CguY7 xUvg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=kjq+0dBO; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-536870a0bf2si94383e87.422.2024.09.13.16.19.10; Fri, 13 Sep 2024 16:19:10 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=kjq+0dBO; 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=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E877268DE0D; Fri, 13 Sep 2024 08:40:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5271C68DE00 for ; Fri, 13 Sep 2024 08:40:19 +0300 (EEST) Received: by mail-qv1-f47.google.com with SMTP id 6a1803df08f44-6c3f12d3930so14425396d6.3 for ; Thu, 12 Sep 2024 22:40:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726206018; x=1726810818; darn=ffmpeg.org; h=cc:to:subject:message-id:date:mime-version:from:from:to:cc:subject :date:message-id:reply-to; bh=IiTeHpgAlBAiWklKoWdBBJrlq6S95imYFKoMokU9GOE=; b=kjq+0dBOVwHeajX26/4mibLBOGjvfWOmDa+BXqzJ7zFX3L1fr6DOfckigZ1P3yhT+b CCX4hscEKVYSmKXorYEdeFeI86ecf5zSvNsh2P/wAWwVEy4bYB1tjih+y/AWXEd3oGk4 8WYarjSwfn0JwRy2usm0ZteEoifYzZXk3/wFv6ABG3mmn3KhAoDWvmVtPGHVMozCNneZ 3FxuH7mFwuutNIqg63StNHU/DuMXunqwZBsqpt7+XOok/HLjJh3oApOu2kvX4KK7U0MW l/WK2x0FPY87H4FEnXGOtYY3lu8x/d/8nBlWVBi3FNB1N76UeVyfy9hWzwlLUZtYyqEL DZxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726206018; x=1726810818; h=cc:to:subject:message-id:date:mime-version:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=IiTeHpgAlBAiWklKoWdBBJrlq6S95imYFKoMokU9GOE=; b=EwFZ7ZjMlFu5dZU7cDe2cOruoEC4lGSOrSBPJ/d6zY+fvUkUyQhlMq6J6jDBv/GUA8 rplv1GN72ZkolQodf9aFlNel0YiDbOFn9WLJl1YjxTLgbmxBjqLCXIYQoedV2RGc8Hsn 3OheuQ2cyZWbVZwyCCPDG4De57BDs4wM8fjTE0BCzqdBXsskHhPnsADPaV70fQEIbBiP hCrW0SgC6e15RyBnjrnjQ98/BM9PmNCclcAAhdPhpERx/R9/s3XGQwqbco4skuv1pQ9a oAShgYV3RpPzQf71STFhlt1hsEPHj64STQRbHLZeP21jAfDz+CPUvkNisg+3EEfqa3dq 97NQ== X-Gm-Message-State: AOJu0YxmjWApF5lZuxvupQGbHQeAm+WFlFeudtmMiRv80u6rmgxNQNJy 6beDO9lP23vVW65i/QdJm7d3vluef4dpKg7lUE4QEfcDR7XLTt2qXojK10zH4fAyG8+qztxVKIk Kg3GU+oAPdkITkHRLQmxrw9QjTiKF66ne X-Received: by 2002:a05:6214:3d9c:b0:6c5:618f:5c10 with SMTP id 6a1803df08f44-6c5736e855fmr78644296d6.44.1726206017822; Thu, 12 Sep 2024 22:40:17 -0700 (PDT) Received: from 272419586516 named unknown by gmailapi.google.com with HTTPREST; Thu, 12 Sep 2024 22:40:17 -0700 From: kevmo314@gmail.com X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Date: Thu, 12 Sep 2024 22:40:17 -0700 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avcodec/h264: ignore POC when flag is set 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: Kevin Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hCmpcWguS6Zr From: Kevin Wang When the flag AV_CODEC_FLAG_OUTPUT_CORRUPT or AV_CODEC_FLAG2_SHOW_ALL is set, ignore any out of order POC's as they may still be valid frames. Fixes https://trac.ffmpeg.org/ticket/11190. Signed-off-by: Kevin Wang --- libavcodec/h264_slice.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) h->next_outputed_poc = INT_MIN; out_of_order = out->poc < h->next_outputed_poc; diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index a66b75ca80..fc5a829755 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1341,7 +1341,8 @@ static int h264_select_output_frame(H264Context *h) out_idx = i; } if (h->avctx->has_b_frames == 0 && - ((h->delayed_pic[0]->f->flags & AV_FRAME_FLAG_KEY) || h->delayed_pic[0]->mmco_reset)) + // Check if we should ignore the output order and output the frame + ((h->delayed_pic[0]->f->flags & AV_FRAME_FLAG_KEY) || h->delayed_pic[0]->mmco_reset || h->avctx->flags & (AV_CODEC_FLAG_OUTPUT_CORRUPT | AV_CODEC_FLAG2_SHOW_ALL)))