From patchwork Mon Apr 19 14:09:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27017 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp555474iob; Mon, 19 Apr 2021 07:11:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/8GuC500kW5/dXP8Hf8saSD6tKPs4EfRvroOsDyKoYbjPKt6/qdv9Mr0esP5+UEdh/S+s X-Received: by 2002:a05:600c:365a:: with SMTP id y26mr21227139wmq.102.1618841487946; Mon, 19 Apr 2021 07:11:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841487; cv=none; d=google.com; s=arc-20160816; b=kPo9FpMNcaxgjNZ0MREWgZAE8X3bVy6lqhw6UomVawHJjnuPghvRFkUcQmoz00goTx i5E1E/Pe37B7euACA39g+F7f1fGxunmIO9fm8w1kVcRNHb4M0FBbsjo0qLAgxsmobtRm Rq+srh9r6JbB21UlFmDtYPIV+eIKUxbRsS6yti6G9QfyGkICMAVKHluuECTrP/XwtHPj u088hoo2Jc6+p3dr1aZjcDZcyCMc0htZkana2XnXi41kHMAiBHizkp5uRdBRZvfTKTWj 3tKml4aAeWcYqhYISfxtEfx3rmQ4A/G6tNoPuvHaFhb8JtXbrzwQqeaimyOOR2TDtvdF 3E6w== 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=p8IgLpPpNhGZINxPWyz86qHZ07MpR4wNSg1Ik3D7gu4=; b=xKliF+v35igPDMqHxV0osOUUL3PXPwJqvLRUEpYWODlfutuEtLJ16jPAg4KA50eNdN tTj16K2VaTFFRXBiYi9+XNvmA8U5bSDZYBeqcCZz9KJhDkaKoB3DSJh3H7V5HunSK05f Ntd8wM2jxCT+Nzs7nNCP623+d640m6NpRbBNTNBUb5txeZ3IOpyP1+J0wv66S4LFdP0O hc7FirN0AJkYVu6yPIc4+1vwuCUc6Sj/2GaDhVefuF+OaT4hVLHz4W0x9UBojPRBVZxw elHnG3QmwE+h4dXcvKHb3kbucMN6wJpxk11b0n/IliCt0n2GOYjuH7HhCOnYdhYKHCss kIvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=X+N66RGt; 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 g9si3768084edq.301.2021.04.19.07.11.26; Mon, 19 Apr 2021 07:11:27 -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=20161025 header.b=X+N66RGt; 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 AAF60680740; Mon, 19 Apr 2021 17:11:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 153A0680271 for ; Mon, 19 Apr 2021 17:11:15 +0300 (EEST) Received: by mail-qk1-f179.google.com with SMTP id q136so14895035qka.7 for ; Mon, 19 Apr 2021 07:11:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Z9M26Uu0ZxbU2mLO8e222CW0RKIPKR6xnthcOM0GYIA=; b=X+N66RGtY/1tJnc0y9TTZVvAadnO2UY0fR7GBKnwPaAeYGh1WzwehuNS8yvs2okGXC bIUK5TfB1bXIUt7ed5x0q+Rr4f8kSPTm9Gf2x3xW8EgXPd80kfFq3VmLdSh7b5f6q5Iy U6B6Tv0ddy68zexu1xR+YRfVTjmNhEGOPrXmuipF+EeEQ7kBjAw6x15qLfJHCi2mdwPB Em1JPBtlPFtGULaZ3nyDLodSZ1OkZ5HBvBGX+Vyq+2M6UES2GOSRX8gQ+vlKUbB7ezZz zCkumMpOgMmQZ9FBczGjnOOz80RfrUUDJnlY7aUUc+hSatdTRgrucpvTCKTERUbxD1yq yzuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z9M26Uu0ZxbU2mLO8e222CW0RKIPKR6xnthcOM0GYIA=; b=ErKER7ckViJ8IAQC53csJaNUfyrEFN5gE8fr4Ue5xf15ui6paULGsYpQrM5edsHfK+ 7AdoN1LE5AfuGv4+Ly7QYXm2P60GUcw4ggAZqP2L2yN0/YZHR9OFEwWvXkqsYz4o4FG8 gTS3CzILP+SoaxWZsXcmTiHG29p+hVDNba1+PKwNE2hC+h7HTHtmGVWXJNwKupiSR2Bq 9TffRs8fO0vhO8n2VxHyeXA1IL3YBCByOjrzjX4o/eaWP+apRp4+Ky1Ify0P5gu1xjQN M/2ywU/+uYGedih8e5NixhNDFgUEGwyGtqxHNv0zyXQ+KaJ6/U4scqtD6AXcu04OL+GS LvKQ== X-Gm-Message-State: AOAM531E6+/Aj1t5/SWkrHtsJP2NvbUvTGHlrQ9lse/9f/+asnw0MEyb STREYwPWkzX69/NYAk+WfDO1TDV7G6E= X-Received: by 2002:a37:b103:: with SMTP id a3mr12610224qkf.261.1618841473598; Mon, 19 Apr 2021 07:11:13 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:13 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:06 -0300 Message-Id: <20210419141024.8174-10-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/87] avcodec: Remove deprecated API to split/merge 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: yn79vMQPQnxk From: Andreas Rheinhardt Deprecated in d682ae70b4b3a53fb73ec30281f9f4cfbc531edd. Signed-off-by: Andreas Rheinhardt --- libavcodec/avpacket.c | 87 ------------------------------------------- libavcodec/packet.h | 8 ---- libavcodec/version.h | 3 -- 3 files changed, 98 deletions(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 4995a83bf8..622b50d5eb 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -297,93 +297,6 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) return NULL; } -#if FF_API_MERGE_SD_API - -#define FF_MERGE_MARKER 0x8c4d9d108e25e9feULL - -int av_packet_merge_side_data(AVPacket *pkt){ - if(pkt->side_data_elems){ - AVBufferRef *buf; - int i; - uint8_t *p; - uint64_t size= pkt->size + 8LL + AV_INPUT_BUFFER_PADDING_SIZE; - AVPacket old= *pkt; - for (i=0; i INT_MAX) - return AVERROR(EINVAL); - buf = av_buffer_alloc(size); - if (!buf) - return AVERROR(ENOMEM); - pkt->buf = buf; - pkt->data = p = buf->data; - pkt->size = size - AV_INPUT_BUFFER_PADDING_SIZE; - bytestream_put_buffer(&p, old.data, old.size); - for (i=old.side_data_elems-1; i>=0; i--) { - bytestream_put_buffer(&p, old.side_data[i].data, old.side_data[i].size); - bytestream_put_be32(&p, old.side_data[i].size); - *p++ = old.side_data[i].type | ((i==old.side_data_elems-1)*128); - } - bytestream_put_be64(&p, FF_MERGE_MARKER); - av_assert0(p-pkt->data == pkt->size); - memset(p, 0, AV_INPUT_BUFFER_PADDING_SIZE); - av_packet_unref(&old); - pkt->side_data_elems = 0; - pkt->side_data = NULL; - return 1; - } - return 0; -} - -int av_packet_split_side_data(AVPacket *pkt){ - if (!pkt->side_data_elems && pkt->size >12 && AV_RB64(pkt->data + pkt->size - 8) == FF_MERGE_MARKER){ - int i; - unsigned int size; - uint8_t *p; - - p = pkt->data + pkt->size - 8 - 5; - for (i=1; ; i++){ - size = AV_RB32(p); - if (size>INT_MAX - 5 || p - pkt->data < size) - return 0; - if (p[4]&128) - break; - if (p - pkt->data < size + 5) - return 0; - p-= size+5; - } - - if (i > AV_PKT_DATA_NB) - return AVERROR(ERANGE); - - pkt->side_data = av_malloc_array(i, sizeof(*pkt->side_data)); - if (!pkt->side_data) - return AVERROR(ENOMEM); - - p= pkt->data + pkt->size - 8 - 5; - for (i=0; ; i++){ - size= AV_RB32(p); - av_assert0(size<=INT_MAX - 5 && p - pkt->data >= size); - pkt->side_data[i].data = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); - pkt->side_data[i].size = size; - pkt->side_data[i].type = p[4]&127; - if (!pkt->side_data[i].data) - return AVERROR(ENOMEM); - memcpy(pkt->side_data[i].data, p-size, size); - pkt->size -= size + 5; - if(p[4]&128) - break; - p-= size+5; - } - pkt->size -= 8; - pkt->side_data_elems = i+1; - return 1; - } - return 0; -} -#endif - #if FF_API_BUFFER_SIZE_T uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size) #else diff --git a/libavcodec/packet.h b/libavcodec/packet.h index a4cd8f5615..6e6d9c58c9 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -581,14 +581,6 @@ uint8_t* av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType size_t *size); #endif -#if FF_API_MERGE_SD_API -attribute_deprecated -int av_packet_merge_side_data(AVPacket *pkt); - -attribute_deprecated -int av_packet_split_side_data(AVPacket *pkt); -#endif - const char *av_packet_side_data_name(enum AVPacketSideDataType type); /** diff --git a/libavcodec/version.h b/libavcodec/version.h index 31d0d26abc..5e122847ac 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -84,9 +84,6 @@ #ifndef FF_API_STRUCT_VAAPI_CONTEXT #define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_MERGE_SD_API -#define FF_API_MERGE_SD_API (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_TAG_STRING #define FF_API_TAG_STRING (LIBAVCODEC_VERSION_MAJOR < 59) #endif