From patchwork Tue Sep 12 06:11:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 43707 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2583776pzb; Mon, 11 Sep 2023 23:11:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHlCB5f6T/hVLFGjI4UPG63V0Ap4p19/5hRxKDb9ciOvu12hNk/jFX5zd91erFcSwmWDgLZ X-Received: by 2002:aa7:d759:0:b0:52b:d169:b373 with SMTP id a25-20020aa7d759000000b0052bd169b373mr8843557eds.32.1694499096335; Mon, 11 Sep 2023 23:11:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694499096; cv=none; d=google.com; s=arc-20160816; b=Uh+J+1eT6BQu3bUOLnDydBf83hW5r7LiJKGmGEMJzxGaeFWfFxCGAFEQd9Egg1Ow9b MA8xHuDF5LovxZKL7qjcGykDQgeOf0cOZc7q9XIZathhNRdnABGgvlAeWF9EK30Jl09D /ntWb/MMZxlnDOqy1vRbinJDTbjvdAgQ4gT+wrqUUdefYpnBAzB3fWaXIZbkp+OHruuJ aI/SjcbH9wR1tEgFG7c5zuWklzfTy+lL4R9Kyaded3f+/laF1Wu3d2b4FO4Q0pt7YDTf UQcn1OJmWriUcOhFqz+EjoUXJjrwpR8eeIVaF5nJ5i+HnQs9kplyGf8WCXea5u8OQIAV 7HwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:to:from:date :dkim-signature:delivered-to; bh=ojl6KnVcWmxw9qcnBt40YzUhZS3XFE/efbPvcIx0Zyw=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=l30ZBJ12NwMMcioRtQR10+9WyTJGnWWXKDxHbGY2KzxY3iMpDXFm6MaWq7ATZIMvsZ CqwvkJRIQTXoPmgLd6L53YUaqk6lFwirZ6ZhqEw1+p/TOqrCFHTQhFx2xjpl3AZiKLdr dIHhqXUm5pwyhDYTUDr9Ur/4fuvQ3Vlp/JE3sG2cVNv8qFdGXMb3qLY71Ge07g6upMUR GJnZ1ZY9pZ7J/dhsveLXoygUDVkqMqX9p4zd6F/mgejtwL00ZiyngzCm+ZCtkWJ/FeOa 8AdEPr5XMyrLDwwy9bPLHcaPNRCMBOY7ToRsMWt35PIcOAeHlNr9eNbIkR4NhjxjCobP kujg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=FLjecYAL; 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=NONE dis=NONE) header.from=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i39-20020a0564020f2700b0052f86a13858si2102340eda.140.2023.09.11.23.11.35; Mon, 11 Sep 2023 23:11:36 -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=@lynne.ee header.s=s1 header.b=FLjecYAL; 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=NONE dis=NONE) header.from=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7FA7668C980; Tue, 12 Sep 2023 09:11:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 805B268C59D for ; Tue, 12 Sep 2023 09:11:27 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 395E910602D4 for ; Tue, 12 Sep 2023 06:11:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1694499087; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:References:Sender; bh=XhhMMYsrQY7PNKiFrRN5ZDomh58XumoFs+9RGMs13Yk=; b=FLjecYALu1IX43KbwelBx8plhZc+rMQcuomdD3OYJ0ZrYArHrdqHwi29aUKv3wQi tt6mlHj9k39vCR4ocI9Vni+JakK2+pXlwpWgvITNMMABgwFksE8hgWuS9sIfkEQc+kD yH342gWjx82RGsJlr7EIf36jZGPWjdkp3hXdZX5ooQOUi6MsGTBvn/cC9+dAujc4HEK dixJraDyjf8tGxHWA4cEk3AGv/k8E5CspeVCSPx12F/5RxMnrwy4Wgl64ytTTgZHaU2 7vOAFxl0bH+hZ9LTFY5l24yC77GMTlkqtF5Jcxw5T8Z6xuKoz6d1kSadWWALAnJBBl/ BfgSRC4tyg== Date: Tue, 12 Sep 2023 08:11:27 +0200 (CEST) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [RFC PATCH 2/3] decode: allow decoders to override skip_samples 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: SIzeN8yBonTa Very hacky. There must be a better way of doing this. From 843809ac072bbaf9ae0d3d3946723f1fcfb07923 Mon Sep 17 00:00:00 2001 From: Lynne Date: Tue, 12 Sep 2023 08:00:02 +0200 Subject: [PATCH 2/3] decode: allow decoders to override skip_samples --- libavcodec/decode.c | 5 ++++- libavcodec/internal.h | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 169ee79acd..9e8a4532f2 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -312,7 +312,10 @@ static int discard_samples(AVCodecContext *avctx, AVFrame *frame, int64_t *disca side = av_frame_get_side_data(frame, AV_FRAME_DATA_SKIP_SAMPLES); if (side && side->size >= 10) { - avci->skip_samples = AV_RL32(side->data); + if (avci->skip_samples_add) + avci->skip_samples += AV_RL32(side->data); + else + avci->skip_samples = AV_RL32(side->data); avci->skip_samples = FFMAX(0, avci->skip_samples); discard_padding = AV_RL32(side->data + 4); av_log(avctx, AV_LOG_DEBUG, "skip %d / discard %d samples due to side data\n", diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 83e0bc3fb2..8f59a117ba 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -118,6 +118,11 @@ typedef struct AVCodecInternal { */ int skip_samples; + /** + * In case there's side data, add it to skip_samples, instead of overriding it. + */ + int skip_samples_add; + /** * hwaccel-specific private data */ -- 2.40.1