From patchwork Thu Apr 20 15:56:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41281 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp616955pzb; Thu, 20 Apr 2023 08:56:42 -0700 (PDT) X-Google-Smtp-Source: AKy350bugwOL4QWGPapr7uuij4UtUtJG8HsoQbKPdJBXE/QDGxTcFbrlyGFaNRr45gR6ZnBUG4Zq X-Received: by 2002:a17:907:1dd6:b0:932:cec7:6801 with SMTP id og22-20020a1709071dd600b00932cec76801mr2056135ejc.54.1682006202491; Thu, 20 Apr 2023 08:56:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682006202; cv=none; d=google.com; s=arc-20160816; b=KlpOdTjRMZzP+nuP7/dtniJfLuSn33BDGR+KYcAw8mpOHnQwzMkjTyBWya6+sFfExv YL/SibXd+fWJx2raPU2hMMlAbH8AWZfYgBuMKeFAsAk4+L+fDxWms0xSyRtczh1SKJM6 leyHD5VaKh2Ypn0ZG0Cev1OX5OVyKr5QtGRKn96s5KxeVk0DhIIGG3UllwIh5dq45/Vs Aw2rOwWE56aPQcofG3OJJeWHKnSENvQkQA6yz33PJBpjhN4q92T5otO4whwKKxj67gD6 Gnpth3WKYLhdgln3gyrZCJXPkaxx2CeCtP+HQaVtIfRF6taiLKEIYV8RZ/VZ2HQXBeXC CdkA== 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=CbtNMqM4h37vGk8637IMSwH+qLhWbDBYmrWtOGh4A4U=; b=OKBDkpRn26vjAT7Kk1IJa+LfB2M3M9GUrYfMPZugSGej5m3Mup3+2aEYxFER6p8tyD N3ADre7dWN41rn6kDOGft6+xbOQDLaUQhAMz7+rnPVogZRlWjZYs3utfU39tIIFnNZeJ FihD6roUUN3CmVc0PkPmb/UFEHrpFZf4BrQiwz9Pq21FKhTHw1PbIHQomZYusof1+Wr3 ZV4cjCMF9YC47r3y4ZyNQo+lQvxomGtKoe/RFdl/7qGehDX5252iCwErhU0DooDozGV6 Rna7oPUcQ9WOI/bS3aABKY+Ms3LV2DaPgooLRpDjrMWu/AGtc28bzhRxvPj/cwDeEQ/B KaIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="h/zDbBdh"; 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 a21-20020a1709062b1500b0094f8ea29af4si1682607ejg.649.2023.04.20.08.56.41; Thu, 20 Apr 2023 08:56:42 -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=20221208 header.b="h/zDbBdh"; 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 6C6CC68815C; Thu, 20 Apr 2023 18:56:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D36D68B3A1 for ; Thu, 20 Apr 2023 18:56:30 +0300 (EEST) Received: by mail-oo1-f46.google.com with SMTP id b8-20020a056820134800b00546f139ded4so763086oow.11 for ; Thu, 20 Apr 2023 08:56:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682006188; x=1684598188; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=VrLkGRS9TuqcdvsnQD5bxX/TRWxZ+j1CZ5rjxz578hg=; b=h/zDbBdhXYQJGFJA28zPvaeRnIeHxK5gc2baUvsEhDxyv87VqblabmKkpQgtANRQxW GjEu2gF1mUwEADsihFBA4DUE/wOQV4NxG3SJBuBmANqGTSnn4V3yQwctOUVOdx9iDroI H0f+9Qnys8IgVDdOccs4+ZBeATIvLjw6DyqdKk486czBT93e7lnqghcAtMbcRktN+ZbD e+YI34HFRxR1nOzw8ExdudFigSK/CKp/Pk8VYhwgh/Xf6v1xLRPQFPaxru5xJ/J7JLYE 079oYekbdhPbKZF3BNKpMP1vDOSo8aohSCW0gn1mTSa3A9sVXJS647lm4C57Xvy5vLAV vmPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682006188; x=1684598188; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VrLkGRS9TuqcdvsnQD5bxX/TRWxZ+j1CZ5rjxz578hg=; b=dhxbfQnjKdvlLIBFIGkoRaSzZDQ2W995+YXzbRJJ6HFI4OFQERjFerABo6JJTGtaVL 7kGYEuw0uPByEDBkih5vL34dVXwKmkzqdTJpWx7bqwHKyju2w5OwWLU24yPcIBQfiqGL yqD37w8RVH/nsWY3PKCkMCOghyYacidk2EhVkF+ywByOxi23HfdhBZuFkmM3MjYlQmBs 6n+VLrILIEqi9YZyf/vJGOyQwWF3HSQj7AA+nulFpKDPL201Hm89510w4AVPfrbfcEZ5 cBKIwjxymX9bMiIz5Fgso1FrNN7LW+9EACZVGSv6Wnxm/kc4QyqR4X4a5qBEe3tFO4et HfHA== X-Gm-Message-State: AAQBX9fl9IXtaYsCQ4fefMtGwXuV25DuOJxxlRWzzQoIukr6iWScmviZ PfhiUtLm7N6F3P0kd5wKpWNU76/tt/I= X-Received: by 2002:a4a:3315:0:b0:545:3076:9e6b with SMTP id q21-20020a4a3315000000b0054530769e6bmr1171435ooq.6.1682006188521; Thu, 20 Apr 2023 08:56:28 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id z184-20020a4a49c1000000b00545b549c2f1sm743719ooa.22.2023.04.20.08.56.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 08:56:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Apr 2023 12:56:17 -0300 Message-Id: <20230420155617.10611-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/pdvdec: honor the requested avctx->skip_frame value 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: UThW8Khaq42C The decoder is tagged as being FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, so might as well make use of it. Signed-off-by: James Almer --- libavcodec/pdvdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/pdvdec.c b/libavcodec/pdvdec.c index d1a3d1d3f9..b1fc19b1c9 100644 --- a/libavcodec/pdvdec.c +++ b/libavcodec/pdvdec.c @@ -64,6 +64,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, uint8_t *dst, *prev = prev_frame->data[0]; int ret, zret; + if (avctx->skip_frame >= AVDISCARD_ALL || + (avctx->skip_frame >= AVDISCARD_NONINTRA && + !(avpkt->flags & AV_PKT_FLAG_KEY))) + return avpkt->size; + zret = inflateReset(zstream); if (zret != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Could not reset inflate: %d.\n", zret);