From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B803A4655B for ; Thu, 20 Jul 2023 20:35:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C63268C635; Thu, 20 Jul 2023 23:34:41 +0300 (EEST) 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 D0BB468C56E for ; Thu, 20 Jul 2023 23:34:37 +0300 (EEST) Received: by mail-ot1-f53.google.com with SMTP id 46e09a7af769-6b9f46dc2e3so935902a34.0 for ; Thu, 20 Jul 2023 13:34:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689885276; x=1690490076; 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=fLEXxGfwrcHKCyHILejhzp4mtJjv0ShRbQhMYjxQvDA=; b=J9UeIbfb3j/Cqyvnb7F3UHebY5PkSYeu9q9SO5u4Wu9SFBuvucoAYD1JX8peyEgCsD +lCZ2ikW+QbntLedPxpxVTQ8xSLRyqEwN1wCt2v8UHCx0szUaghWI+P29OH3cKVrPa6X xxstAoROCP43zXoxt4055fDqB7B3i21IQPPPLCDYMiZytWm9FAZsFW0CA6C9AoIeGftf 8LgTc5GjvJAABFWSavgMXLxZ0dznR26eq9FEZHQtvHHH3VRlTSWN4n1t51zaZ4lfA/1c wEKzN9XNZWCbo0EqrqWYTXxW7pMESnfWY0ruEHFQjAF7QflTl/pRwiSlzLoAo6A+wjJn 54JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689885276; x=1690490076; 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=fLEXxGfwrcHKCyHILejhzp4mtJjv0ShRbQhMYjxQvDA=; b=ME7k1ZMlnd3LlbanGJGykUpiU4TVllI/UfZ9oneO8c6WHPOMRilNM2D3tF+ef664Mh Y1sEtNw12wHTa7/+AxnIKbPRJiFgrDwF20vQxb9KjfEi1YM8MjeWrGh+EZ+JCH2aFlNe b4fnlhqDKzKqLcq0I6Zh9mpLGbc2eNtDWGVfxpzkG8L+egtwDcaZ+HwlB29H76UWcgGw ZLkMETJW1KbMMppsX27g73g9UkQdsQLmHWbVnRP1Jz2i1kn93qi86+TqWCaFCMyIX5eN WD/byl4LhO3Uw93zfWdh3xux7fJolzvfDTJpkawHAv29Yf24R313HwUBot4fancPfWmy 3e6Q== X-Gm-Message-State: ABy/qLbatjdkOY3DOhvmUenWnypyuRRUpans/Zz88O0d3agL81sMIzRu VoNHXsLRJgx5kDSqVk1Q2QVR5xzu7Gw= X-Google-Smtp-Source: APBJJlGMgeLzTavUbU7/3b+eiM3nYwqiLtVxh7PCLBZ17KvqyCGHCLLVjbGGXQwkC8J2c/s1Qj734Q== X-Received: by 2002:a05:6871:80a:b0:1ba:8c54:6722 with SMTP id q10-20020a056871080a00b001ba8c546722mr764348oap.14.1689885275834; Thu, 20 Jul 2023 13:34:35 -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.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 13:34:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2023 17:34:13 -0300 Message-ID: <20230720203415.41757-11-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 11/13] avcodec/avcodec: deprecate coded_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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: In favor of AVCodecContext.side_data_set Signed-off-by: James Almer --- libavcodec/avcodec.c | 34 ++++++++++++++++++++++++++++++++++ libavcodec/avcodec.h | 7 ++++++- libavcodec/utils.c | 24 +++++++++--------------- libavcodec/version_major.h | 1 + 4 files changed, 50 insertions(+), 16 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 16869e97f2..2b9de43c78 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -334,6 +334,36 @@ FF_ENABLE_DEPRECATION_WARNINGS avci->needs_close = 1; } +#if FF_API_CODED_SIDE_DATA +FF_DISABLE_DEPRECATION_WARNINGS + if (av_codec_is_encoder(avctx->codec)) { + const AVPacketSideData *sd = + av_packet_get_side_data_from_set(&avctx->side_data_set, AV_PKT_DATA_CPB_PROPERTIES); + if (sd) { + uint8_t *data; + AVPacketSideData *tmp = av_realloc_array(avctx->coded_side_data, + avctx->nb_coded_side_data + 1U, + sizeof(*tmp)); + if (!tmp) { + ret = AVERROR(ENOMEM); + goto free_and_end; + } + avctx->coded_side_data = tmp; + + data = av_memdup(sd->data, sd->size); + if (!data) { + ret = AVERROR(ENOMEM); + goto free_and_end; + } + + avctx->coded_side_data[avctx->nb_coded_side_data].data = data; + avctx->coded_side_data[avctx->nb_coded_side_data].size = sd->size; + avctx->coded_side_data[avctx->nb_coded_side_data++].type = AV_PKT_DATA_CPB_PROPERTIES; + } + } +FF_ENABLE_DEPRECATION_WARNINGS +#endif + ret=0; if (av_codec_is_decoder(avctx->codec)) { @@ -469,10 +499,14 @@ av_cold int avcodec_close(AVCodecContext *avctx) av_packet_free_side_data_set(&avctx->side_data_set); +#if FF_API_CODED_SIDE_DATA +FF_DISABLE_DEPRECATION_WARNINGS for (i = 0; i < avctx->nb_coded_side_data; i++) av_freep(&avctx->coded_side_data[i].data); av_freep(&avctx->coded_side_data); avctx->nb_coded_side_data = 0; +FF_ENABLE_DEPRECATION_WARNINGS +#endif av_buffer_unref(&avctx->hw_frames_ctx); av_buffer_unref(&avctx->hw_device_ctx); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2902ecf6cb..ba6cfc09a0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1892,14 +1892,19 @@ typedef struct AVCodecContext { #define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002 #define FF_CODEC_PROPERTY_FILM_GRAIN 0x00000004 +#if FF_API_CODED_SIDE_DATA /** * Additional data associated with the entire coded stream. * * - decoding: unused * - encoding: may be set by libavcodec after avcodec_open2(). + * @deprecated use side_data_set */ + attribute_deprecated AVPacketSideData *coded_side_data; + attribute_deprecated int nb_coded_side_data; +#endif /** * A reference to the AVHWFramesContext describing the input (for encoding) @@ -2107,7 +2112,7 @@ typedef struct AVCodecContext { * Additional data associated with the entire stream. * * - decoding: set by user - * - encoding: unused + * - encoding: may be set by libavcodec after avcodec_open2(). */ AVPacketSideDataSet side_data_set; } AVCodecContext; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 672eb15d98..01223de707 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1048,32 +1048,26 @@ AVCPBProperties *av_cpb_properties_alloc(size_t *size) AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx) { - AVPacketSideData *tmp; + AVPacketSideData *sd; AVCPBProperties *props; size_t size; - int i; + int ret; - for (i = 0; i < avctx->nb_coded_side_data; i++) - if (avctx->coded_side_data[i].type == AV_PKT_DATA_CPB_PROPERTIES) - return (AVCPBProperties *)avctx->coded_side_data[i].data; + sd = av_packet_get_side_data_from_set(&avctx->side_data_set, AV_PKT_DATA_CPB_PROPERTIES); + if (sd) + return (AVCPBProperties *)sd->data; props = av_cpb_properties_alloc(&size); if (!props) return NULL; - tmp = av_realloc_array(avctx->coded_side_data, avctx->nb_coded_side_data + 1, sizeof(*tmp)); - if (!tmp) { - av_freep(&props); + ret = av_packet_add_side_data_to_set(&avctx->side_data_set, AV_PKT_DATA_CPB_PROPERTIES, + (uint8_t *)props, size); + if (ret < 0) { + av_free(props); return NULL; } - avctx->coded_side_data = tmp; - avctx->nb_coded_side_data++; - - avctx->coded_side_data[avctx->nb_coded_side_data - 1].type = AV_PKT_DATA_CPB_PROPERTIES; - avctx->coded_side_data[avctx->nb_coded_side_data - 1].data = (uint8_t*)props; - avctx->coded_side_data[avctx->nb_coded_side_data - 1].size = size; - return props; } diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 95c5aec0c5..7b01300c4a 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -49,6 +49,7 @@ #define FF_API_SUBFRAMES (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_TICKS_PER_FRAME (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_DROPCHANGED (LIBAVCODEC_VERSION_MAJOR < 61) +#define FF_API_CODED_SIDE_DATA (LIBAVCODEC_VERSION_MAJOR < 61) // reminder to remove CrystalHD decoders on next major bump #define FF_CODEC_CRYSTAL_HD (LIBAVCODEC_VERSION_MAJOR < 61) -- 2.41.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".