From patchwork Wed Sep 6 17:44:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43599 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp87113pzh; Wed, 6 Sep 2023 10:45:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHiZtZxGKukRFtTujcmCnRCKfAJRdISgp/cJMRTUXK7PerYP9eFtjHZ6n9PJQFzkCpAqDrM X-Received: by 2002:a17:907:77c8:b0:9a1:9cc5:ea5f with SMTP id kz8-20020a17090777c800b009a19cc5ea5fmr3151594ejc.7.1694022342600; Wed, 06 Sep 2023 10:45:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694022342; cv=none; d=google.com; s=arc-20160816; b=M5+aRsNPpcY20xwNOkxDaCvTE8pS5UlBsqhg9BhW5pRQSexqX2qnQRJgCEts7rJ6Cc ubgdkaxTMDafHYVMpJbJjc2loHQIUyeII9flLcbo5d14nZ93FROZyQ3e8KNiGNJrtb7x Oy62f3VUbz8MfRAZEG3kNT7Pii+crFQz9he5VGeghFNcJ3yXjPC98q89E+9Mk0OCWVGo BSwiBxG/pCHzmRYCiWTIO4e6xO67TtIhq/AmU2us/5bkX3I1nBXJi84bDMqAYvM/xBN4 BwFnimG6t3k9aXdA8iefURGDSalMR2HwGT4Y8KDdFF7BYCgsF7BB0W35L0b9uL1z8lmL 5b8A== 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=m6POPPBYSuNGLS5LCEmqyvQL1i0oZ5wuPZw73jA8CBg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=jZN56zt/TJvF1M4pAXNlQGYgPPFQpRM7TXu44MGV2zwY35WwMgwGe7UjFFjBkBm2dg YXuqOUfgkpY5BV5QHMpZ+j2YDAkVCj+6GMv4ENZadEfDapXsCvOXG/lYtaT1szN5QRZS GWhUUbk5iCDfSSre9b6mr+X8RBbSErhJW/grK9mWie3ZFKzQfxBB+X8KWwKQSdIhvlCY xLYAYquZ/XsJ3LUq9SeWz1GTjObmSB0x9JyK9eVZF0OZOJf51dsysNJ/IXywPfWuAp+A z+tpHJF5hN6VvyFyN89mvCe6FGKhuWvCzYqYJl1t6a5Ykw6QQ+lLkenSmjrnsmPh6wyc rixw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=SKljAoJu; 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 k2-20020a17090646c200b0098d5b116e6fsi2713730ejs.856.2023.09.06.10.45.42; Wed, 06 Sep 2023 10:45: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=SKljAoJu; 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 54C6C68C824; Wed, 6 Sep 2023 20:44:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BCFC68C80B for ; Wed, 6 Sep 2023 20:44:56 +0300 (EEST) Received: by mail-ot1-f53.google.com with SMTP id 46e09a7af769-6c09f1f4610so119514a34.0 for ; Wed, 06 Sep 2023 10:44:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694022294; x=1694627094; 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=IgQSFak5DBDQMmO/35YRWaRIOnLx/LPlhGuUFo1YfaQ=; b=SKljAoJu6qThLgRHzTPqPhVS4bX6hCtH9FQBsXKwKZCB4tG/CVyoeygQnK/thXYBq3 3jvdG4J15itisJnz3d10rzBVznP6RJffwRjKs2gfOSPvgWdtlvjM2VWpGbfD6nPcNfdc ZVc4JfZmyyuqTNniWPmecscfnF5MciQ7e0JarugkpZSgcwhdkHm8fhytEmu7Ts9qaqGJ cPmARX3i/lXS6imzlDb7ZKY1KwTUj/npcyQ1zmdZj0ee3Bza2Eiqtzuy1JAWuZbvxIEc IUKmJfdrVuqq487DLTJGJPAAS2ih90OB5zrakGadglastn+r8kn2iGjlj8X9qg4btfZe hyhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694022294; x=1694627094; 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=IgQSFak5DBDQMmO/35YRWaRIOnLx/LPlhGuUFo1YfaQ=; b=ZqCn0cxr2LaZI9udd+xyO3m2ZLXoI3JpwTQztl+1Ln937gl+UuSufYqOGCguJH5/Kr UIZGccK4JDHIOaPyLPh5u00ZhhT4Lfw+/ifezGz6fxuv+BBTWsWv9/wR3S/qUWsGcvca aEF1fUKZHFWLQi/+8N/QVlATTxUVhs0QBLlzRwgYAAsBuuT4E4JlSWbm8oYbWyJvUJen Msm9IvYt+F3tiVr5hPaik9PFFkM4faygIQXT+LUH4kqP8rwYX735RmY7wI8sF8BG8ZVT gLd9FGhX89GC1VHXyQROD1e56yPRBUUXMRqGdnGPvrLOIBjXj71CMKQgTVBs7lF3LB1u Pejg== X-Gm-Message-State: AOJu0YwftcL+QEuP6kxuVd/mgImisht9ssuOpIOsk3ZxepHQwP/lxCsb KJaUGiLLU3lMxFYAOdthLmzcpb83GJA= X-Received: by 2002:a05:6830:12c4:b0:6be:fb88:8352 with SMTP id a4-20020a05683012c400b006befb888352mr15544090otq.8.1694022294569; Wed, 06 Sep 2023 10:44:54 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id v5-20020a0568301bc500b006b99f66444bsm6561309ota.71.2023.09.06.10.44.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 10:44:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Sep 2023 14:44:28 -0300 Message-ID: <20230906174431.45558-9-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230906174431.45558-1-jamrial@gmail.com> References: <20230906174431.45558-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/10] 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: e2xpH3gv4iOJ 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..1a431ba7d7 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++) { + const AVPacketSideData *packet_sd = ff_get_coded_side_data(avctx, + 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); /**