From patchwork Mon Feb 14 22:41:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34290 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp5923728nkb; Mon, 14 Feb 2022 14:42:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/hJxLy50XVZyjsZ0kX74uM18iqXJ/yo+Yzu/zkMoetXV/muwa6xO6Xe1PJXzGZYP2Qy8Q X-Received: by 2002:a17:906:3d72:: with SMTP id r18mr751874ejf.111.1644878558731; Mon, 14 Feb 2022 14:42:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644878558; cv=none; d=google.com; s=arc-20160816; b=KQwBnUqbVyj1WAJ/ujgWDwzhatRFTSJV2fdg+sNKA/IQJAHCfjHPjKlbjnHbP04F1v v27Pmq2uIqnxaDA9jO93GdzeBDO39SIopG0i7gUKokrPJTm//1RD/k0VfqIw9uNTvf6t Zk4ISYicsrIxRJExpr1xhVBUv0NEjmNHT8JZprdvF6XXRa1VjHw4v6PSumHYV80FqBdY Fjhe60VDieu87s8zbkRj7MYn9M3QzIW/w0ZGTP8Ys+ZczdFqWh1M32ewNDWXzKcC34yB v3wEj9tg65lgTFIe1SDZ5k6lOlLvG+Y7ndHZU2UgM3Lmg/VpKpS9j9VyHzNBYxLSV11Y Irag== 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 :dkim-signature:delivered-to; bh=tbErYO7/DfpIUQJTH1PRu8OeHlLIwudy7C0WrsuPsfI=; b=wVL7DXn70bjaZ8hGs8KQVQmzdFBZwTE8YdOS/qLJXAQl2pTg7rFAL/adMYOl8crdZy WC5GczoPHOavg43+u9kTWewTU2KucM9J1+tc/koDuR0qhPJpw1nLwa/f48+G8U+J/USL R0Vea0pR47e12OK2iXmHLgEXK7zuQlhBxejU4ix5PSsrSqF7okiEv+PilYH3mG4NaBE/ EWmNy2QvEkYal7lQK0x6RFRFwztYZZr2+PDuEm162IKH6cTNAKglmrqvchy9kEZwLxPa HnziA81GkSG70js07LzNbHREt/n12pxDKLpjgBu6k5onL/WItXrWXdhJRcfsF8KeScT7 ndkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BG+89CmL; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g12si26162032edz.238.2022.02.14.14.42.22; Mon, 14 Feb 2022 14:42:38 -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=@gmail.com header.s=20210112 header.b=BG+89CmL; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E2A568B17F; Tue, 15 Feb 2022 00:42:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52BB268AEE9 for ; Tue, 15 Feb 2022 00:42:16 +0200 (EET) Received: by mail-oi1-f170.google.com with SMTP id 4so18970238oil.11 for ; Mon, 14 Feb 2022 14:42:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=f9YIEFeJGmLNWkD+g9IYE1dh1xpPHSMrKbkD/oheJuQ=; b=BG+89CmLbqOwUV9AmA1bOGRgEj9VFUtYu3Kaz0aoBxGL4Cn2yIRyG/N49aXWf0CBnU N6yDlaM+N3x2gBm59KLJyt7DiG17K5moTpO7UmxGNgBTK+B9/gy1NKPBmrxQFNJKTWfF AqeuYSQvM8RcY6EOauAHK2g+SSqy1MolJ3tLuhZty31muuoOConXYoE7TFCvGw44+OO5 uQ74+bYHXkNrfvNWBetJ5cs57W3i2g/jkvvbfX6C9LW9IVZouO+yZnaG12xUkgLYguDV 3RxogDq0lJ4CxzCnu7cn8B8ApkLeO1aza2S4gp9QYYKu2PN0kqYgU7ADB3rxAGikL+J2 lgfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=f9YIEFeJGmLNWkD+g9IYE1dh1xpPHSMrKbkD/oheJuQ=; b=og6ftbJ3z/vztpTtE8+4lLiz6VoXJ1a85lc5/EUpv6dZGFqqjYiKnmNTo1pdVvQlMu 2GhTbVR9ZB/Wgn4/YSYbi/u/FFh5s6BFhyVP+hJDM2SqhPey3s9YsgEBTbuuJYtEpkZD XQVmR+m7ZdtiJ3aaKWMXr+2KQHIpv3C/8BoTjrlDOCViICp5X2Ev2+LIwWdcEjDssEVo dy3WOcS5ENBbe5GRIHgLxjcRjxbOzOeQ93j2Ti35r8RuAJWw4vCYSv076TNO+l88vwFl Os5v/PZs97rf1tIkIxsKCsEh6y4730pzSQg/A/TEz2OS4T2wqMDQQYvTWw/n2YWJ5XmC SyVA== X-Gm-Message-State: AOAM530Xj6q5FBklVL5jV9xJWI6MGf9uLJ4WDKc5agEphzuaVVQsuwm3 i5q7cjMBV9Rbs783Py0L1/IPsQLK91FxXw== X-Received: by 2002:aca:1717:0:b0:2c6:a730:dacb with SMTP id j23-20020aca1717000000b002c6a730dacbmr461568oii.87.1644878534525; Mon, 14 Feb 2022 14:42:14 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a8sm13199885otj.47.2022.02.14.14.42.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 14:42:13 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Feb 2022 19:41:51 -0300 Message-Id: <20220214224156.39862-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] ffmpeg: flush delayed frames in codec copy scenarios 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: XJ/Sm4YRaDVx Bitstream filters inserted between the input and output were never drained, resulting packets being lost if the bsf had any buffered. Signed-off-by: James Almer --- fftools/ffmpeg.c | 11 +++++++---- fftools/ffmpeg.h | 1 + fftools/ffmpeg_filter.c | 1 + fftools/ffmpeg_opt.c | 4 ++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 7beea11933..6aa0986f02 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2733,7 +2733,9 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo } ist->pts = ist->dts; ist->next_pts = ist->next_dts; - } + } else if (!ist->decoding_needed) + eof_reached = 1; + for (i = 0; i < nb_output_streams; i++) { OutputStream *ost = output_streams[i]; @@ -4213,11 +4215,12 @@ static int process_input(int file_index) for (i = 0; i < ifile->nb_streams; i++) { ist = input_streams[ifile->ist_index + i]; avctx = ist->dec_ctx; - if (ist->decoding_needed) { + if (ist->processing_needed) { ret = process_input_packet(ist, NULL, 1); if (ret>0) return 0; - avcodec_flush_buffers(avctx); + if (ist->decoding_needed) + avcodec_flush_buffers(avctx); } } #if HAVE_THREADS @@ -4247,7 +4250,7 @@ static int process_input(int file_index) for (i = 0; i < ifile->nb_streams; i++) { ist = input_streams[ifile->ist_index + i]; - if (ist->decoding_needed) { + if (ist->processing_needed) { ret = process_input_packet(ist, NULL, 0); if (ret>0) return 0; diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 81ec4d5970..1b8bbace3f 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -307,6 +307,7 @@ typedef struct InputStream { int decoding_needed; /* non zero if the packets must be decoded in 'raw_fifo', see DECODING_FOR_* */ #define DECODING_FOR_OST 1 #define DECODING_FOR_FILTER 2 + int processing_needed; /* non zero if the packets must be processed */ AVCodecContext *dec_ctx; const AVCodec *dec; diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 41d87377c7..8ec1f0ffaf 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -277,6 +277,7 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) ist->discard = 0; ist->decoding_needed |= DECODING_FOR_FILTER; + ist->processing_needed = 1; ist->st->discard = AVDISCARD_NONE; ifilter = ALLOC_ARRAY_ELEM(fg->inputs, fg->nb_inputs); diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 3102851885..bf1bbcae4c 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -2610,6 +2610,7 @@ loop_end: if (ost->encoding_needed && ost->source_index >= 0) { InputStream *ist = input_streams[ost->source_index]; ist->decoding_needed |= DECODING_FOR_OST; + ist->processing_needed = 1; if (ost->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO || ost->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { @@ -2622,6 +2623,9 @@ loop_end: exit_program(1); } } + } else if (ost->stream_copy && ost->source_index >= 0) { + InputStream *ist = input_streams[ost->source_index]; + ist->processing_needed = 1; } /* set the filter output constraints */