From patchwork Thu Jul 20 20:34: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: 42871 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:672f:b0:130:ccc6:6c4b with SMTP id q47csp77460pzh; Thu, 20 Jul 2023 13:36:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlFMs3HIq8Sq/5rpxfkQZulXpkeYWgIcR6A7ptMhbsF/CvVJn6JsPFiCABRaHfOnCQCtoqhG X-Received: by 2002:a05:6402:1486:b0:514:9df0:e3f3 with SMTP id e6-20020a056402148600b005149df0e3f3mr19787edv.0.1689885363438; Thu, 20 Jul 2023 13:36:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689885363; cv=none; d=google.com; s=arc-20160816; b=tTv6uSkqk14EaeJLeVq6DzP7JomWx9hD1qQus2ElkDXH3hGFH6pqn2jvz8WSYAp0wz ibl4XTxOchmPmeaFbDRNgIFe9JuzAPUqe+tTmQ27UaiyiMZIYEMhEi6MdEBz6IfsZr+c c8w+E7WkVBWTAm4xvdPbg3dsRRqOMqm1jF4Wopm4Dfvl4BIIZd4CwhIegO2fbBhAl26t 31D6bWqFysrMPDfmoww1SpjFeaQatZjK4I7ZbUq4OKjcoZyM4pmFDHgT/YdmAA1qD7kS kC7BK1qzTAS/ap80LJH6/7j0OOtJG4L5R+g+GmEEXU/qwC6bdkqNSEemE6QgH2vr1d88 TRvQ== 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=tvUuqFehbk3BUa9J74J3+3N6ehSbRngCR1dP39FgcIs=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=pUK8AVYgA8ce1UJjxjdFQ/G9bYZJqVJtnSXBw2uN8CcIPP+SOJU2tnxm3qYdTbCWbZ X8ntJOfUKHi/nWR78UCg2fSu5e2hy3T30FrEMyHZ4Uy7FUROcFy1NktGM60QkLs213dw bu+1AwDWFS4moEBhoQiNe2mcfAJihIXPqJ2xSzv39UXZCC11ztdHppjjsXP70RF6thrJ kzbZYn3ERt4Qqu833XHFXBQzuSCk3vo8wGXlNJLcRdCGkhctgrNN8HF5yC6HTjflI1PH UozUKl7xBNQVGpQFxnZUke2yiHRjSvO9dJpsv3FRVAX4ALGBdLBkrDk5MbKEZCkv2Yys mnrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=JuqVMXNe; 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 ca21-20020aa7cd75000000b00521d2fbcfa2si1439380edb.311.2023.07.20.13.36.03; Thu, 20 Jul 2023 13:36: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=JuqVMXNe; 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 9836968C5C4; Thu, 20 Jul 2023 23:34:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30E6268C5FD for ; Thu, 20 Jul 2023 23:34:34 +0300 (EEST) Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-6b9e478e122so1014721a34.1 for ; Thu, 20 Jul 2023 13:34:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689885272; x=1690490072; 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=3QMIM9ShVB2IurWkZEGZXU12AdInGFQDvc7Ow+bQexU=; b=JuqVMXNe251YRAO/xJ4N4RynJQ6bHIraUqVUETtHYF/LE3xWazF8ybqEINT3f+KOpl C6II5lCAzQUZoDIDPJUXI5azWmsi5Z1p6yLDRTASipZRpC85RHu/7S89PNnoLMhoOrUu dlouMaJIClEswk2nWedxQHJVJ80UhFDqTKeDbA3L5tqsYvtlN8kKR4UAIWLf31S9G0mv STA9Ce5sjNZahmrLo+6Q00GNFtU9aiQUX6rogR3CJgjETQ1ycufnuAJQtr6w5bMAeZNK ssvtTFsInJcAJNt0HymATgiMXvaQuTG89KE5cYmFSLpNHeklp82EhXYWuiAy0XIJyPx3 I5YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689885272; x=1690490072; 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=3QMIM9ShVB2IurWkZEGZXU12AdInGFQDvc7Ow+bQexU=; b=d3Sq7Kn9m9r49jo7XPdE9uNKRu3UPfTaOyEJw2jH7L0CQt3Z3b1u/IlqvGNN+YzgiH QvTIaEsboaFaOljtp9ixEJugyp2YLGMkJxI8bt37XOXJpMkTMFQJ3u8JEAVIxrj8xXpb HMtjJdM5OF9GYf7FOGFagBtnY1n5tmGggtL+DHKAJ1a3cNYkv42Z2ae+GbUbMvk7WA/3 2S4090+FOzRVphNceA3tpyh0yCTX1ZwHo9qnm+VX2Ri6hnf1Xon8OrsFcUC8Sj6JeALc 6DTZy3NxEDJQyQ5c8vv7IpDMGaqagLm3GufqYI0keFxGUzSdASzA2NwyG65tb+LlSIij n31g== X-Gm-Message-State: ABy/qLaP9CaMcLsQhRg0Ewqf3JIXKLnuSsTMhLJCSi2QyKUHT1gpu6Ab 6Ri3/NNBiinmAyPkHRWFuKXwEMEgXR8= X-Received: by 2002:a05:6870:969f:b0:1b3:eec8:fa87 with SMTP id o31-20020a056870969f00b001b3eec8fa87mr524743oaq.42.1689885272435; Thu, 20 Jul 2023 13:34:32 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id m24-20020a0568301e7800b006b95e17fcc7sm800094otr.49.2023.07.20.13.34.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 13:34:32 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2023 17:34:10 -0300 Message-ID: <20230720203415.41757-8-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230720203415.41757-1-jamrial@gmail.com> References: <20230720203415.41757-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/13] 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: s47E4UtAqwaW Signed-off-by: James Almer --- libavcodec/decode.c | 56 +++++++++++++++++++++++++++++++++++++-------- libavcodec/decode.h | 2 +- 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index f0e6acc03e..66506b6dfb 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1396,25 +1396,30 @@ 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 }, }; @@ -1427,6 +1432,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_WARNING, + "passing global side data through packet side data is " + "deprecated and will stop working soon. Use AVCodecContext side data\n"); + + 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); @@ -1463,6 +1485,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_get_side_data_from_set(&avctx->side_data_set, + 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 2b9fe59907..0abbdf067c 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); /**