From patchwork Mon Sep 4 22:11:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43553 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp1475680pzb; Mon, 4 Sep 2023 15:12:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF0Ow9CeA8Z4HysWBsnzgY4lU6PsuBSR8/r3T2cFv55Yo4C5gaRwEI/IR7tknJIj1A82RJA X-Received: by 2002:a17:907:a068:b0:9a1:cbe5:758c with SMTP id ia8-20020a170907a06800b009a1cbe5758cmr8097625ejc.7.1693865526980; Mon, 04 Sep 2023 15:12:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693865526; cv=none; d=google.com; s=arc-20160816; b=zgkqOHV2MyKAfeQWEoyYwG9g8ovHoRBSYqpaE3GOqRmVCVOkqn4PLorwmEaK1WNheZ 2ikWLYLDmlsr9HihiiZ+SaDdU7mf9U4C1Mh1kLCmmgd3icpbG2W531pfj8/c9PTxoYk+ 7nKQHhlm/pnol0f7Lmvo7cQPL7IPahmnTY6eDJcoiQquPNuF1I7+tVyCJRQwwd2ttf4K Mp4DsQ8N8KjR6OEj2hUDCBdvBiEC1Su68O1n3zlnjIkVwyC1+naJt9ctjfF6P7zLescv LnlOOpLDUJaxpd9OQWxZhk+qrC5GuOqbe0V6BihZmkz7BHm8kGfdkvEUr0Mm5ig28CbO 6aSQ== 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=eaBE8/+HX6AILezFzPvJmZLQxRyGKNovRMfA69e41u4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=dbACwA7Br1R2tyrV6k4wQMA8GBeB3G2vS98QZvQpyNovvh67QnfqC1yU7kKEToRwTs tVdfxe6ET1LAlLolWNGDh6SeH9f0RQnMfARk/aeX0bx4fWzgavRwX8C8bc35ZdlQyITF dw1xPdmGvFZfOOZmhr2wtv54HemswZ+rXTnXJ+QPOhQ8omP/wgtHdHhrF/ZlkucP0q3A w8odbmQ5LxUkpmPPi/LOXMBH4UuoUu6lrDf29AgZHnOd3YqZcX7f6ri1UYt5ys8MZ+ub rf3hd222oFxhLcgcrXKcgP422jY7WMcuibRkbpiEL//RK/HkA10UA6SV/wVNVrhfgl9D VNtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=RlBCoIU1; 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 lt14-20020a170906fa8e00b0099cc15f09a1si7056083ejb.118.2023.09.04.15.12.06; Mon, 04 Sep 2023 15:12:06 -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=RlBCoIU1; 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 D4CE968C7D9; Tue, 5 Sep 2023 01:12:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BE7468C7BA for ; Tue, 5 Sep 2023 01:11:58 +0300 (EEST) Received: by mail-ot1-f49.google.com with SMTP id 46e09a7af769-6bf038b8f87so1402842a34.1 for ; Mon, 04 Sep 2023 15:11:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693865516; x=1694470316; 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=KhqOT7qP1bZY9vJgUNvCDjaUHhw6QegQljLbnyKMM6Y=; b=RlBCoIU1L/sdMBdL7SVWkCP17RHgSAWJq9iF+TIbGzJLNTNNhSEsb6AjZRFAYmTx19 yeprsauqtm62M5NMOTQBL8M1nP11Ulq8afGboeyItECz0APV+5K2hw8rb0g+Toa/dt5h x9NMCayWMARzHbuuUkU/aY+QvLD3PFkcmLc56FMUTapwmEcuRqUKpL6+iuMbcqu6B1Xc l1X4CeoWKrPHHiv61oXDw+n86l8D6gbK2GJ4w1/VBjP6cU1H+smeAjP8jsUk0gnrlHdx dxnS7jgQGSNSTedPPMk7zhaI4GUPQ+q8yMTqqoZyxiCB18CZobeVKLQym6ljljcdINPw xPsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693865516; x=1694470316; 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=KhqOT7qP1bZY9vJgUNvCDjaUHhw6QegQljLbnyKMM6Y=; b=LViAC7yEiNLJYStlVsqP36niwY9kVgWonF7S2ziAbjBjiVnOLvUQ+o1cv185m8Vkps RlxAen9HsOjIbLCODHbiKYjN2OQyv6bL9rqzrPt8VGOGEi1k563xO07rz7cuLhw0n3cD h9kBvkLxwJynCVQqrTHw4ydEsLys5mKH6R9QjLPA/YpPkKjkwtgvMHIiYgE0XsRsuYm0 n0HAJuC5r/IlErioZQMOIYn7pWJpe9UMfemOkxu+ftUR4kFDSjXELbAzelMgLzY1oX1E TuKPN5xCgvF0QubX7QASs846MEaIVMXrcrrlHPDMeZrvg5vdrdqn8dLV2kLjcvWpV6wD UtRQ== X-Gm-Message-State: AOJu0YynipbDiD9MAFwJemJ4zGo2elf/8lmsRwY0XSWSbalwUNPqGAIc /wPVl22YweSbTZrd/UFCB/rLEp0q1iE= X-Received: by 2002:a54:4818:0:b0:3a8:6a40:7dc0 with SMTP id j24-20020a544818000000b003a86a407dc0mr6898933oij.18.1693865516546; Mon, 04 Sep 2023 15:11:56 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id v2-20020a4aad82000000b005737ca61829sm4856070oom.13.2023.09.04.15.11.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 15:11:56 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 19:11:49 -0300 Message-ID: <20230904221149.21944-1-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230904150411.56777-14-jamrial@gmail.com> References: <20230904150411.56777-14-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/17] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gZB+BQ82lG2U In favor of AVCodecContext.packet_side_data Signed-off-by: James Almer --- libavcodec/avcodec.c | 34 ++++++++++++++++++++++++++++++++++ libavcodec/avcodec.h | 8 +++++++- libavcodec/utils.c | 24 ++++++++---------------- libavcodec/version_major.h | 1 + 4 files changed, 50 insertions(+), 17 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 7e1ef99234..e600ac3a1e 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -342,6 +342,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_side_data_set_get(&avctx->packet_side_data, 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)) { @@ -477,10 +507,14 @@ av_cold int avcodec_close(AVCodecContext *avctx) av_packet_side_data_set_free(&avctx->packet_side_data); +#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 dda8a2412b..946a3977d7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1890,14 +1890,20 @@ 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 the context's @ref AVCodecContext.packet_side_data + * "packet_side_data" field. */ + attribute_deprecated AVPacketSideData *coded_side_data; + attribute_deprecated int nb_coded_side_data; +#endif /** * A reference to the AVHWFramesContext describing the input (for encoding) @@ -2105,7 +2111,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 packet_side_data; } AVCodecContext; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index bd4131db62..90e573890f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1020,31 +1020,23 @@ 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; - 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; + av_assert0(av_codec_is_encoder(avctx->codec)); + + sd = av_packet_side_data_set_get(&avctx->packet_side_data, 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) { + if (!av_packet_side_data_set_add(&avctx->packet_side_data, AV_PKT_DATA_CPB_PROPERTIES, + (uint8_t *)props, size, 0)) av_freep(&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 cfd0b5023e..440ee857da 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) #define FF_API_AVFFT (LIBAVCODEC_VERSION_MAJOR < 62)