From patchwork Wed Jul 12 22:07:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42617 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp2496154pzb; Wed, 12 Jul 2023 15:08:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlEiFytuf2pt4FBAgsl5/9SqVvqRaz82SSaEDVAtaeKoYQ5fJvRCygoNVXSPFNJN1+qREKM3 X-Received: by 2002:a5d:674b:0:b0:312:8e63:71c with SMTP id l11-20020a5d674b000000b003128e63071cmr20553118wrw.32.1689199683329; Wed, 12 Jul 2023 15:08:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689199683; cv=none; d=google.com; s=arc-20160816; b=xKEYdnDN3yhKLYrm1VchJPjW1fqp5lFp+U9sgX31YTRUOlUeQcDtOE1+Z2TAb+c1FN CTv4NA/zS6UmSxPA/tzsKpj0Zulc1tciaEZvyfYfAek9Lfy+NosT/ZI3js/olQ8VGFwE O7GW0ZpTVxtMIFow8c446O7LHljXJB8UHNqIGO8jyB2U2Zitc+hMDP0pZFwpR1F8k2nY JlVj9bfgFfTrydJH4OV4JnXbEwGXj9Nhyg6ECHo8aF9YUJn+mikkgaSoxC5ODrDlXsvU Nae7TL1qV/hGnZD8gdFujdETpry2ygpsvIQ5JbDv2kezG1Q/XsFtV3akXDkDLOI+y35q BYHQ== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Zzugw8WmK/N2loScETIHkjk93x41hW4xA5FEoblBhXg=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=KmyYXraq4KXUy+O+umw/ZsR17A/VyaMdKJ8p4qt4uz+LA2e+dqRHr+/obsXWIIai8E w04T/l7+zF0n2nNwnGMjjbuLx0Y640RKrtCvb9BLmOEqRUULWNOu5GHiAqGJv1zUyTod fjPUbvu780hnzNcIF14gnfE4CCT+Evm76PGpTUFNCR9LoGRYJL6LCI/WBpWWLf1RcQ+Z COf5/padJjyI8t3eiRdO8pqtQzo2yTK/DRzSeDy8w6y5QaHFSnhfPPc/xjUEUCVe1h1e gyyY+u2sR4tbgYI2TSUoFfFLkYvURRJGUxRPqp+MV2oXq3EpUX6TN+U9DxqlQ4WPPL+A C7Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Awm7yHDs; 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 w17-20020a170906131100b00991fe707692si5605024ejb.63.2023.07.12.15.08.02; Wed, 12 Jul 2023 15:08:03 -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=Awm7yHDs; 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 35E0D68C5C4; Thu, 13 Jul 2023 01:07:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f44.google.com (mail-oa1-f44.google.com [209.85.160.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93B9E68C1FF for ; Thu, 13 Jul 2023 01:07:40 +0300 (EEST) Received: by mail-oa1-f44.google.com with SMTP id 586e51a60fabf-1b059dd7c0cso10496fac.0 for ; Wed, 12 Jul 2023 15:07:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689199659; x=1691791659; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=x/tGx59ygzf9mfwxC0mHTZtGAvweONsk/aJA1Z2Ywn4=; b=Awm7yHDss1sOgnOIV9Ht0FRHLBpsuSlGnNg2A1+6rLetbZ/hifA5youWUioYEurDuU /iyNhNA7biHw/dKgEB4HXWSO0gCmRQxHO8VVkzoFOHP6225VOe0a6ElLfURjyNkBd1jW RS5cxypH6BHDxo7qtRV9EH94qB7jWbBcqQShNp6UUEw6IktkMeCzhlsErBKkkZaDlxuF Pna5Ye390soPcBdWfqsbFosIlh7ap8g6v7lR6HIIV758ZMWmKybYTZulY6QhDUxRJX5K zQTPjxa6D2a3roQ39KwUGu3gLVrMm+qJMcVWMQ4BWs79mfF/zf64Co+Ro/zA1YLv0AUz 7noQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689199659; x=1691791659; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x/tGx59ygzf9mfwxC0mHTZtGAvweONsk/aJA1Z2Ywn4=; b=LO3QK7JFduH441iW9LKgyJMRpwx4Hbsrwe96QK11FFf03/alHDvkLSl8kWhLfrFbsN 6YnSCicnBQ09Yzbihz3hhtns0/OPf+tgn59W+hy1h7Dz1FqWSDOwl4Hl9/VAhky1RJQO AgwAlEfBNpj8Z49FdHA58O0wyBOHaFAaGHd4BIUfGsp5CCRxpFIiJyJlKr3E3Vh0iBwg 04Ez2AViixEZ03dgsBY3CZnTxAFouS4m2uPcgq0bMNhJW2UiMZfi/q6o0Ux1EK9vtGTy b6KPX2pCGoemp5frbYE/3igqTID4oqTAumq5Bf/topdWD5uC5zzy+fetd9qFlEeMrbjx XS+Q== X-Gm-Message-State: ABy/qLYDdTdnAnzYyaYtpF/hxrVvAj68P0fXjdt3kbyjQIAjY8IzyAR3 0axXgUZK806IsgDNy4VofCluO1ONUEs= X-Received: by 2002:a05:6870:330b:b0:1b0:7661:dd18 with SMTP id x11-20020a056870330b00b001b07661dd18mr21601717oae.23.1689199658898; Wed, 12 Jul 2023 15:07:38 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id v13-20020a056870e28d00b001b3d5b06b6asm2433756oad.23.2023.07.12.15.07.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 15:07:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jul 2023 19:07:10 -0300 Message-ID: <20230712220712.46338-2-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230712220712.46338-1-jamrial@gmail.com> References: <20230712220712.46338-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/decode: simplify applying or exporting 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: wlwprbZgRr5v Copy packet side data to the output frame in ff_decode_frame_props_from_pkt() instead of in discard_samples(), having the latter only applying the skip if required. This will be useful for the following commit. Signed-off-by: James Almer --- libavcodec/decode.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 4478c8c4fe..57d38cbc54 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -293,26 +293,18 @@ static int discard_samples(AVCodecContext *avctx, AVFrame *frame, int64_t *disca { AVCodecInternal *avci = avctx->internal; int ret = 0; - uint8_t *side; - size_t side_size; + AVFrameSideData *side; uint32_t discard_padding = 0; - uint8_t skip_reason = 0; - uint8_t discard_reason = 0; - side = av_packet_get_side_data(avci->last_pkt_props, AV_PKT_DATA_SKIP_SAMPLES, &side_size); - if (side && side_size >= 10) { - avci->skip_samples = AV_RL32(side); + side = av_frame_get_side_data(frame, AV_FRAME_DATA_SKIP_SAMPLES); + if (side && side->size >= 10) { + avci->skip_samples = AV_RL32(side->data); avci->skip_samples = FFMAX(0, avci->skip_samples); - discard_padding = AV_RL32(side + 4); + discard_padding = AV_RL32(side->data + 4); av_log(avctx, AV_LOG_DEBUG, "skip %d / discard %d samples due to side data\n", avci->skip_samples, (int)discard_padding); - skip_reason = AV_RL8(side + 8); - discard_reason = AV_RL8(side + 9); } - if (!frame->buf[0]) - return AVERROR(EAGAIN); - if (frame->format == AV_SAMPLE_FMT_NONE) frame->format = avctx->sample_fmt; if (!frame->ch_layout.nb_channels) { @@ -392,16 +384,8 @@ FF_ENABLE_DEPRECATION_WARNINGS } } - if ((avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) { - AVFrameSideData *fside = av_frame_new_side_data(frame, AV_FRAME_DATA_SKIP_SAMPLES, 10); - if (fside) { - AV_WL32(fside->data, avci->skip_samples); - AV_WL32(fside->data + 4, discard_padding); - AV_WL8(fside->data + 8, skip_reason); - AV_WL8(fside->data + 9, discard_reason); - avci->skip_samples = 0; - } - } + if (!(avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) + av_frame_remove_side_data(frame, AV_FRAME_DATA_SKIP_SAMPLES); return ret; } @@ -465,15 +449,13 @@ FF_ENABLE_DEPRECATION_WARNINGS } emms_c(); - if (!got_frame) - av_frame_unref(frame); - if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { ret = (!got_frame || frame->flags & AV_FRAME_FLAG_DISCARD) ? AVERROR(EAGAIN) : 0; } else if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) { - ret = discard_samples(avctx, frame, discarded_samples); + ret = !got_frame ? AVERROR(EAGAIN) + : discard_samples(avctx, frame, discarded_samples); } if (ret == AVERROR(EAGAIN)) @@ -1386,6 +1368,7 @@ int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, { AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE }, { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, + { AV_PKT_DATA_SKIP_SAMPLES, AV_FRAME_DATA_SKIP_SAMPLES }, }; frame->pts = pkt->pts;