From patchwork Mon Sep 4 15:04:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43540 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp1274102pzb; Mon, 4 Sep 2023 08:06:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxShjSoPgoDaIdGj82dK/ue3umu1hUxeBexOmgHcpTfTI8MkTUAbvJn8hcvv1GBGCfwMvx X-Received: by 2002:a17:907:58d:b0:9a2:1b6d:eeca with SMTP id vw13-20020a170907058d00b009a21b6deecamr6748643ejb.44.1693839977868; Mon, 04 Sep 2023 08:06:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693839977; cv=none; d=google.com; s=arc-20160816; b=utEjWT4gFbMQqW3X/etqbrB6dq6Au16Gw3IeQFJ0r6EUpnNqpSzWlBVUP3wPKxLZAc veKKZScLINGyLFFmlg26Wp9PZkuNWaj4VD/QfTN8vKXpfkoyr/lcyu8Pu9XmP7CZG2uy muescfUfiWnKFdeh93uoT5PGLXIgIkEupNpYzsN6gUx4Y9d/JfkwhdkoOcHVkixB6TGt OxZZwZOE7XfD43xBo+DNqzBNHvkxQwgKNjhGcLrcD5E9wx8TEQakfxm7ePy2J+yyQ7A6 aYivUYhaZojj92mnHGhDN+ibb+yFMvYybKVyGnp/Km7fovOu3odnP3wRs+jfN9RahozF YfnQ== 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=0qTdbXCpUE8PV+DRAODlHFCtepNMKlv/i3Jy7BN3vLE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=voHbHVOWfizqyH6zr7vYwyX624tzPTZmfLxix1wDU1If4KAlmAIUZ2zmnbAijt/zH8 6evcMi6Kv856/nGjcU2c5xtp2PJ2fqK5WAEb33VJHu0qMnq/CWnjR7Mo3VRD4Biz7u1y mqKknHdnL/ZaOGR+KSNaKlRAc3XS3nmWDwwaIuhgt8qHDQqHTv9XJhxVDfR7iFztGxsO 8sNSStwMD7AYrG4IP7YfOn3AJwcvy8PZD9VThkl0/xDF7PTGTM71pnQXiyL2NA14cvOs /8D2Z8MJupCeUVp4cg54/N+BLdF2lzEcdFVA1gr+z6CSO6N2FPqXmhqMvF+qXnCWRMEl ltPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=NgrrIUv8; 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 by23-20020a170906a2d700b0098e266c9592si5937359ejb.262.2023.09.04.08.06.17; Mon, 04 Sep 2023 08:06:17 -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=NgrrIUv8; 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 4F6D668C81A; Mon, 4 Sep 2023 18:04:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f51.google.com (mail-oo1-f51.google.com [209.85.161.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0258868C7DB for ; Mon, 4 Sep 2023 18:04:31 +0300 (EEST) Received: by mail-oo1-f51.google.com with SMTP id 006d021491bc7-5733789a44cso960735eaf.2 for ; Mon, 04 Sep 2023 08:04:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693839869; x=1694444669; darn=ffmpeg.org; 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=SlZrTIpsCNP1jBAhavDAog6lE/fdg1oqSHUtz3w2ATQ=; b=NgrrIUv81Q5hCyu+jhmVlAyTL2x23jNGc3SEdHIfOFpz9hYgG/Kz/rX0wE8/PlTGVb zBzmocKVnNVRaomN90ek6I9tauulLvmCeG+4ocOTKI5Q17Tog9uk8Q8f6fNHzTPLvSLd VHWrVtJRPD2vfxMyshgwzEemJh5rcGfyHLZTAcopgV248p2v0rr2SVucR7tqwdvcKVxt VCC3LVsELKcp9xRZg99Q8D7abW21myAkZyV+oq28T9NyLlXzqJlgbSQx2zpdmE2RNBeg xpYS14CdOK3OxsHZfUO8CcOr99ppvlne2sOJg0z/y1nywkuBm+FXlH0OyTGTNLGTdhI1 RwfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693839869; x=1694444669; 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=SlZrTIpsCNP1jBAhavDAog6lE/fdg1oqSHUtz3w2ATQ=; b=B6Lkt8zCdsqRGaeLrUnhXbqrWiYTu/+Bf5Kr/JwrWkTYfyiPYiHEvXo3bvWHucyIZ5 IaWNhTMJrKpJ58ICps4RHwP5FriKmwKsafHCopNJ9Ze764g4lycrsezOZVc0nr9U3xG0 G31xzyE4Fi2c7jHE71R7xLmxN+4V0pQZgbrxNd9DrVoWvXVPZCfrswS6J2QZt9hYOOVp TuMGZYoYixO0rWycIjUABJGs1VlXULlKtMJxEX/3Cr6vzEUQJp7iS20gsEEL1fQqMuTK dSAuWFlAaeOwWoy8Xbq9fQ4YIsWCnBWcMfY3gSiFNk2PgzSWmOmAEUwAGcUGN1eAKlDP VzHg== X-Gm-Message-State: AOJu0YzHxXNd61UUXxFZWg0PSkPDr+liFH942HLeSa8pRr8uItRr63Sw ISU1IcQUPfO7DxySypCJk1u7uvh3EOY= X-Received: by 2002:a05:6808:1816:b0:3a7:45e0:c0eb with SMTP id bh22-20020a056808181600b003a745e0c0ebmr13131332oib.24.1693839869207; Mon, 04 Sep 2023 08:04:29 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id z14-20020a54458e000000b003a9cd23980esm4946286oib.8.2023.09.04.08.04.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 08:04:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 12:04:01 -0300 Message-ID: <20230904150411.56777-9-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230904150411.56777-1-jamrial@gmail.com> References: <20230904150411.56777-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/17] avcodec/decode: check for global side data in AVCodecContext side data 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: xl50//4ZDxNj Signed-off-by: James Almer --- libavcodec/decode.c | 55 +++++++++++++++++++++++++++++++++++++-------- libavcodec/decode.h | 2 +- 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 169ee79acd..7a012ba419 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1409,25 +1409,31 @@ static int add_metadata_from_side_data(const AVPacket *avpkt, AVFrame *frame) return av_packet_unpack_dictionary(side_metadata, size, frame_md); } -int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, +static const struct { + enum AVPacketSideDataType packet; + enum AVFrameSideDataType frame; +} sd_global_map[] = { + { AV_PKT_DATA_REPLAYGAIN , AV_FRAME_DATA_REPLAYGAIN }, + { AV_PKT_DATA_SPHERICAL, AV_FRAME_DATA_SPHERICAL }, + { AV_PKT_DATA_STEREO3D, AV_FRAME_DATA_STEREO3D }, + { AV_PKT_DATA_AUDIO_SERVICE_TYPE, AV_FRAME_DATA_AUDIO_SERVICE_TYPE }, + { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA }, + { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, + { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, + { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, +}; + +int ff_decode_frame_props_from_pkt(AVCodecContext *avctx, AVFrame *frame, const AVPacket *pkt) { static const struct { enum AVPacketSideDataType packet; enum AVFrameSideDataType frame; } sd[] = { - { AV_PKT_DATA_REPLAYGAIN , AV_FRAME_DATA_REPLAYGAIN }, { AV_PKT_DATA_DISPLAYMATRIX, AV_FRAME_DATA_DISPLAYMATRIX }, - { AV_PKT_DATA_SPHERICAL, AV_FRAME_DATA_SPHERICAL }, - { AV_PKT_DATA_STEREO3D, AV_FRAME_DATA_STEREO3D }, - { AV_PKT_DATA_AUDIO_SERVICE_TYPE, AV_FRAME_DATA_AUDIO_SERVICE_TYPE }, - { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA }, - { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, { AV_PKT_DATA_A53_CC, AV_FRAME_DATA_A53_CC }, { AV_PKT_DATA_AFD, AV_FRAME_DATA_AFD }, - { 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 }, }; @@ -1440,6 +1446,23 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif + for (int i = 0; i < FF_ARRAY_ELEMS(sd_global_map); i++) { + size_t size; + uint8_t *packet_sd = av_packet_get_side_data(pkt, sd_global_map[i].packet, &size); + if (packet_sd) { + AVFrameSideData *frame_sd; + + av_log(avctx, AV_LOG_DEBUG, + "Overwriting global side data of type \"%s\" in output frame with side data " + "from input packet.\n", av_packet_side_data_name(sd_global_map[i].packet)); + + av_frame_remove_side_data(frame, sd_global_map[i].frame); + frame_sd = av_frame_new_side_data(frame, sd_global_map[i].frame, size); + if (!frame_sd) + return AVERROR(ENOMEM); + memcpy(frame_sd->data, packet_sd, size); + } + } for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) { size_t size; uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size); @@ -1476,6 +1499,20 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) const AVPacket *pkt = avctx->internal->last_pkt_props; int ret; + for (int i = 0; i < FF_ARRAY_ELEMS(sd_global_map); i++) { + AVPacketSideData *packet_sd = av_packet_side_data_set_get(&avctx->packet_side_data, + sd_global_map[i].packet); + if (packet_sd) { + AVFrameSideData *frame_sd = av_frame_new_side_data(frame, + sd_global_map[i].frame, + packet_sd->size); + if (!frame_sd) + return AVERROR(ENOMEM); + + memcpy(frame_sd->data, packet_sd->data, packet_sd->size); + } + } + if (!(ffcodec(avctx->codec)->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS)) { ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt); if (ret < 0) diff --git a/libavcodec/decode.h b/libavcodec/decode.h index a52152e4a7..52e5aafc34 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -67,7 +67,7 @@ int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt); /** * Set various frame properties from the provided packet. */ -int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, +int ff_decode_frame_props_from_pkt(AVCodecContext *avctx, AVFrame *frame, const AVPacket *pkt); /**