From patchwork Mon Apr 19 14:09:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27072 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp567412iob; Mon, 19 Apr 2021 07:25:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysryNfUmCc4yTyc63nIEgCpFnooivjXSPcpWiPNIAssMlsiklaIRaF4qBDt+ajiBNPSq41 X-Received: by 2002:a17:906:8293:: with SMTP id h19mr22280363ejx.217.1618842330038; Mon, 19 Apr 2021 07:25:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842330; cv=none; d=google.com; s=arc-20160816; b=rjTbaHhEneKtBxNEOJIUaFpCksHCVv5n/HXOLwTsQobvi7AWngVNU/Se88wQFF/RZB 83E1iyTjB848LLeglfKpqDQYJnaDIVMMc2+D/2RuY5vD1aikO8l/qZGLyonyWsEyA383 AAlp7dYMBecilY9nzlgbM2/D0e/fbuc8SConNPBdyEALyX4d3PGZqLKslX9q2/OxXLXR 3PVSBUv6JlqAw4R+hh7eeq53yxAMkW3Z2TpP/TkHzR/mVK/bwt0j0yJUFn5VjOUEHyiM a8IIQqWJNyBUg+ZZN8EiY+bTW/yU6dWM+IAUE0FhCZofdwEtjnRyzTMDzjEAOPM+vCwN TjUA== 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=zPLycW5HA8rbAfRJmlSzt71IOXwWGWk9NmmjsGRfkeI=; b=QkcW2tQHsy972KUIaMupw3ArN0McWGtM62cFJD8QIxrEzFXN2ruIY5I329oMXL81Or s9QU6ptu5B/kvqy6LjN24D5ezS08OHhzMnTVcCgMHwyhWabkMqHsH4Kp6YBgvnvG1ymO o+S7/wSINBomrTo8dG90TXSXbrOLrCScDUR1mOMO/GIPUXKrTBJrkc6OVoSXLDTEOEVx szfvOd1DHzaWCziNdAj4o9F81g6Cuqg2l66WmhJGLrhBmkcAcYswkvan0USRuyUCMkGN wrHrJERg5608JuPaTQkwu5g9et28b45EnsXqL3vllafpbJgTl/4+D8Od2rbZRMD7qtBR 2Q7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QCo5JWgq; 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 f11si593803edx.163.2021.04.19.07.25.29; Mon, 19 Apr 2021 07:25:30 -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=QCo5JWgq; 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 0A5C4689FF0; Mon, 19 Apr 2021 17:16:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E593689FD1 for ; Mon, 19 Apr 2021 17:16:18 +0300 (EEST) Received: by mail-qt1-f180.google.com with SMTP id y12so26153129qtx.11 for ; Mon, 19 Apr 2021 07:16:18 -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=quB/Y7YwMZzWaDeEhcndyGYbc2pUraxBVz/y9I17Ggs=; b=QCo5JWgq2/mfJWg0bzdkw+cittzfUR0lVj/xJp4XMsTQo655toelST40k57s25CwS2 n4Iav86ffLgaB3OInC2lyvnwC8/B5dQDdIYPS5Rw+w3NeBvJIganoCELLiYQh414z4KX Y5JIzY0H49AiM+VISt8SVo3sUrGxYSxqWRk5TCQQb02iMHfO3QKfol2EAz4Y1PCNW6H1 ukrjcr7gKPvZNgt76oHGWFq8+DcXJeHVwjQPqfbjh6TOP0qPmrOaA82dPUgp1TAU/Wv9 mudZD7bir1nW0rZ7URkjmLCrwJXyLRsXXmWMA+6O5a9g2xtfFsTIw5kEQ+0fgBk4NGPw 86Gg== 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=quB/Y7YwMZzWaDeEhcndyGYbc2pUraxBVz/y9I17Ggs=; b=Ezb+mD0o0Vehc5Sud/QS142JibGAv7/foiAjciLj3TsXlAQpUb+yv2y7z/xWCql9tk +iMCXyRmDs7YQ5jbC+26FsB221CloxpaQ6urBJRglHWac/8BJtdS0kRyVC4vPux7dJPL AjENUhlJWf3vixtY+9efXRrxb6TFEOyYvjFe3Esz7xvIeFF7Vxd4wtGmlkzkPiIzp90s Ear4NU0L63Eov8fxWdEOLKtjElOdDtIT7zCBH1A0Sez+8+uMv8OWJbxL7ZQjxMfgAxhu sydWLXX9TwyJoE6EFV6S8+WPV25NaVRP7j1MeSDCWTGjOESWzaKtC7HN0NmByEirzYJo uPjQ== X-Gm-Message-State: AOAM5307CVqoKscjqdZ+ElxDHb/fpye7XzQG5B55oODH2nQtOcG7sT5o hKTXaBC0ABEt68S8GX30fgsLs4ZlMn0= X-Received: by 2002:ac8:5cc4:: with SMTP id s4mr11693275qta.214.1618841469847; Mon, 19 Apr 2021 07:11:09 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:09 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:03 -0300 Message-Id: <20210419141024.8174-7-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 06/87] avcodec: Remove deprecated AVPacket API 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: CRJc6zF28y1Q From: Andreas Rheinhardt Deprecated in ce70f28a1732c74a9cd7fec2d56178750bd6e457. Signed-off-by: Andreas Rheinhardt --- libavcodec/avpacket.c | 118 ------------------------------------------ libavcodec/packet.h | 39 -------------- libavcodec/version.h | 3 -- 3 files changed, 160 deletions(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index b726a8db0e..4995a83bf8 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -174,108 +174,6 @@ int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size) return 0; } -#if FF_API_AVPACKET_OLD_API -FF_DISABLE_DEPRECATION_WARNINGS -#define ALLOC_MALLOC(data, size) data = av_malloc(size) -#define ALLOC_BUF(data, size) \ -do { \ - av_buffer_realloc(&pkt->buf, size); \ - data = pkt->buf ? pkt->buf->data : NULL; \ -} while (0) - -#define DUP_DATA(dst, src, size, padding, ALLOC) \ - do { \ - void *data; \ - if (padding) { \ - if ((unsigned)(size) > \ - (unsigned)(size) + AV_INPUT_BUFFER_PADDING_SIZE) \ - goto failed_alloc; \ - ALLOC(data, size + AV_INPUT_BUFFER_PADDING_SIZE); \ - } else { \ - ALLOC(data, size); \ - } \ - if (!data) \ - goto failed_alloc; \ - memcpy(data, src, size); \ - if (padding) \ - memset((uint8_t *)data + size, 0, \ - AV_INPUT_BUFFER_PADDING_SIZE); \ - dst = data; \ - } while (0) - -/* Makes duplicates of data, side_data, but does not copy any other fields */ -static int copy_packet_data(AVPacket *pkt, const AVPacket *src, int dup) -{ - pkt->data = NULL; - pkt->side_data = NULL; - pkt->side_data_elems = 0; - if (pkt->buf) { - AVBufferRef *ref = av_buffer_ref(src->buf); - if (!ref) - return AVERROR(ENOMEM); - pkt->buf = ref; - pkt->data = ref->data; - } else { - DUP_DATA(pkt->data, src->data, pkt->size, 1, ALLOC_BUF); - } - if (src->side_data_elems && dup) { - pkt->side_data = src->side_data; - pkt->side_data_elems = src->side_data_elems; - } - if (src->side_data_elems && !dup) { - return av_copy_packet_side_data(pkt, src); - } - return 0; - -failed_alloc: - av_packet_unref(pkt); - return AVERROR(ENOMEM); -} - -int av_copy_packet_side_data(AVPacket *pkt, const AVPacket *src) -{ - if (src->side_data_elems) { - int i; - DUP_DATA(pkt->side_data, src->side_data, - src->side_data_elems * sizeof(*src->side_data), 0, ALLOC_MALLOC); - if (src != pkt) { - memset(pkt->side_data, 0, - src->side_data_elems * sizeof(*src->side_data)); - } - for (i = 0; i < src->side_data_elems; i++) { - DUP_DATA(pkt->side_data[i].data, src->side_data[i].data, - src->side_data[i].size, 1, ALLOC_MALLOC); - pkt->side_data[i].size = src->side_data[i].size; - pkt->side_data[i].type = src->side_data[i].type; - } - } - pkt->side_data_elems = src->side_data_elems; - return 0; - -failed_alloc: - av_packet_unref(pkt); - return AVERROR(ENOMEM); -} - -int av_dup_packet(AVPacket *pkt) -{ - AVPacket tmp_pkt; - - if (!pkt->buf && pkt->data) { - tmp_pkt = *pkt; - return copy_packet_data(pkt, &tmp_pkt, 1); - } - return 0; -} - -int av_copy_packet(AVPacket *dst, const AVPacket *src) -{ - *dst = *src; - return copy_packet_data(dst, src, 0); -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - void av_packet_free_side_data(AVPacket *pkt) { int i; @@ -285,22 +183,6 @@ void av_packet_free_side_data(AVPacket *pkt) pkt->side_data_elems = 0; } -#if FF_API_AVPACKET_OLD_API -FF_DISABLE_DEPRECATION_WARNINGS -void av_free_packet(AVPacket *pkt) -{ - if (pkt) { - if (pkt->buf) - av_buffer_unref(&pkt->buf); - pkt->data = NULL; - pkt->size = 0; - - av_packet_free_side_data(pkt); - } -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type, uint8_t *data, size_t size) { diff --git a/libavcodec/packet.h b/libavcodec/packet.h index 47e9b8999b..a4cd8f5615 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -519,45 +519,6 @@ int av_grow_packet(AVPacket *pkt, int grow_by); */ int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size); -#if FF_API_AVPACKET_OLD_API -/** - * @warning This is a hack - the packet memory allocation stuff is broken. The - * packet is allocated if it was not really allocated. - * - * @deprecated Use av_packet_ref or av_packet_make_refcounted - */ -attribute_deprecated -int av_dup_packet(AVPacket *pkt); -/** - * Copy packet, including contents - * - * @return 0 on success, negative AVERROR on fail - * - * @deprecated Use av_packet_ref - */ -attribute_deprecated -int av_copy_packet(AVPacket *dst, const AVPacket *src); - -/** - * Copy packet side data - * - * @return 0 on success, negative AVERROR on fail - * - * @deprecated Use av_packet_copy_props - */ -attribute_deprecated -int av_copy_packet_side_data(AVPacket *dst, const AVPacket *src); - -/** - * Free a packet. - * - * @deprecated Use av_packet_unref - * - * @param pkt packet to free - */ -attribute_deprecated -void av_free_packet(AVPacket *pkt); -#endif /** * Allocate new information of a packet. * diff --git a/libavcodec/version.h b/libavcodec/version.h index b2882361bc..3e8e429153 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -60,9 +60,6 @@ #ifndef FF_API_AVPICTURE #define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_AVPACKET_OLD_API -#define FF_API_AVPACKET_OLD_API (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_RTP_CALLBACK #define FF_API_RTP_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 59) #endif