From patchwork Mon Apr 19 14:09:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27111 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp1094176yba; Mon, 19 Apr 2021 07:14:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw62GWnsx5ll5nDuA3WjMWF7m7hoqmQUBKldgFqXu1uAR7o+zWljh7OEOycNn/mMRpi/FsR X-Received: by 2002:aa7:cfd0:: with SMTP id r16mr12744201edy.330.1618841669493; Mon, 19 Apr 2021 07:14:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841669; cv=none; d=google.com; s=arc-20160816; b=p6HiQ8jK03DAufkuOgwSFftCoc6P7YQXGFaD3CH7OZFKrygtTAB1iLhfM19NOBKRwu oj9yuHLMH4CK166Su2pnkxxpoUQ0uvrrv/iYIPgxvybNf+fOTTgaus3YYMkMkVInRsqf PauvH445XanA/oQC+hXrCJ1FZZ9GPvsvomzkadtE5hCxSlswKFXGKYcJSqf2KkdqU8PA n29MRyDLjt5fSeKhvrgRjEP1ExTiNlgvprzdEmkhqkxb0ZUHn4fIDpPoHAgV2IsP4ckr 8FfElOfl4WRBiV3fO8Fv0ZKY8mps6tf6HrzaQxWDzM1iuasGvmtI06Mb5WxkOrQJvxNp njzA== 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=AAWn27mgtSeiXQtctsPXyhpLqvwnuuj9L0QbZg/C7fA=; b=UtIgDqQA+kyRLpfdmZza716D849aL+CpDpuotypl9ZpDXd0YCOxjauX1reMbmDgbrV Y/DOqTw3YPWrqW7sqXuEjIlY97ewS0//mNiAV7D6aShSdSRFEujY7vv3yGCNiyFjE7qD 1Lgyif2xmrahgluaC7HdON4kbDhHrPCNvf+v546u3lYDROGOH0l67fxninIaosTWI1BY FwYJFxAVya6gKBtGMmdfDfE+/lbrPwQGt7QJgmGUsp2Omx6Mbes65Q6X1B9Voyv7eLem nLQVpYfBglDYJSTigpNj9jb9ujvnvKA1gfFFtY4dBkugJt0Z6n0tl3YQ1q+0eeYMKOPa loJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CsSKSTYP; 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 s7si14347827ejd.402.2021.04.19.07.14.28; Mon, 19 Apr 2021 07:14:29 -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=CsSKSTYP; 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 3128E687F99; Mon, 19 Apr 2021 17:11:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55FD8680CEC for ; Mon, 19 Apr 2021 17:11:40 +0300 (EEST) Received: by mail-qk1-f180.google.com with SMTP id i12so4318754qke.3 for ; Mon, 19 Apr 2021 07:11:40 -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=6TuAcaDnOsBkXQyK/UMz3CoL6rMSPiEe6+D6WLhkhvA=; b=CsSKSTYP8glZ5kKm/KuS/9bqaGI9EwEXwlGs/zOQbIu/dwtL5OzYCHzoKYsY1A5SaJ TVLMjWd8Ti2P7efJmagbxyeAZ5UnIe0llsFGJ61wJ2a3SbMOxnWtl2S/OlwgWPSPQhIA dQCIUwwXfZLSBbJMDuQNA5dHcbopmQdZhg+E+uotuRs/3dUQ4dY4J/4hOuNFKkxP71/H zwCcEGp2YFb51Doa1SmdSUKP1RhyOaDw6o+JP6hFjzK4/zWAQtHYX49VLJy/+Q0WP7XE NvpTueR0Cil5LmEjxKv1BfoRwglRFLLu6OCW5FlsSASTrQtSQUemmxwcxtlruBtiL17p pC6w== 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=6TuAcaDnOsBkXQyK/UMz3CoL6rMSPiEe6+D6WLhkhvA=; b=Ld2uDCZHgusEUDk8a028XnJayAOoj2HUnzQQKpyPPwTl+/M+TxHEF+WLibt9dx2sFY cYChtgIUb+IJKLDoilfx41Jq5/T4e4NohQCzcFvWDu8wLOPCYbaYWPEafXzQXYH4Jsqm TbOU8yXi76RdbrcaQWqmy2LdjsclMQg/nf8DG7sOtyG0qo5s+njFl3HOmjRv5oy+gUlX xl+sdKIiiqHlfnIdhlUoAbO09y9Dx5nsndg7EAuRn0poN+PEIMVcXFzXXr/tNXpQezBw hB4/5XAZl5e2qF0GQATvozL/yeEqegS2b6rO/GMDtoO/5P+Ovfm5T2L+t/rFjuyjYXTI 5nPA== X-Gm-Message-State: AOAM530i73OrBNzgPP7zcvGKwXOUdrxSt5HzdZiyiiSFDPkrD7zmqLaq GzChSPxdcvIH/H1XihANVwKrLRCzOiY= X-Received: by 2002:a05:620a:1181:: with SMTP id b1mr12056774qkk.81.1618841498992; Mon, 19 Apr 2021 07:11:38 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:28 -0300 Message-Id: <20210419141024.8174-32-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 31/87] avcodec/parser: Remove deprecated av_parser_change 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: 4S0Kd4wYX70o Content-Length: 3544 From: Andreas Rheinhardt Deprecated in 9a07c1332cfe092b57b5758f22b686ca58806c60. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 12 ------------ libavcodec/parser.c | 36 ------------------------------------ libavcodec/version.h | 3 --- 3 files changed, 51 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e817befa1c..43b83ac348 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3276,18 +3276,6 @@ int av_parser_parse2(AVCodecParserContext *s, int64_t pts, int64_t dts, int64_t pos); -#if FF_API_PARSER_CHANGE -/** - * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed - * @deprecated Use dump_extradata, remove_extra or extract_extradata - * bitstream filters instead. - */ -attribute_deprecated -int av_parser_change(AVCodecParserContext *s, - AVCodecContext *avctx, - uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size, int keyframe); -#endif void av_parser_close(AVCodecParserContext *s); /** diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 08b9945a57..593ea9ddf7 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -184,42 +184,6 @@ int av_parser_parse2(AVCodecParserContext *s, AVCodecContext *avctx, return index; } -#if FF_API_PARSER_CHANGE -int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx, - uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size, int keyframe) -{ - if (s && s->parser->split) { - if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER || - avctx->flags2 & AV_CODEC_FLAG2_LOCAL_HEADER) { - int i = s->parser->split(avctx, buf, buf_size); - buf += i; - buf_size -= i; - } - } - - /* cast to avoid warning about discarding qualifiers */ - *poutbuf = (uint8_t *) buf; - *poutbuf_size = buf_size; - if (avctx->extradata) { - if (keyframe && (avctx->flags2 & AV_CODEC_FLAG2_LOCAL_HEADER)) { - int size = buf_size + avctx->extradata_size; - - *poutbuf_size = size; - *poutbuf = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!*poutbuf) - return AVERROR(ENOMEM); - - memcpy(*poutbuf, avctx->extradata, avctx->extradata_size); - memcpy(*poutbuf + avctx->extradata_size, buf, - buf_size + AV_INPUT_BUFFER_PADDING_SIZE); - return 1; - } - } - - return 0; -} -#endif void av_parser_close(AVCodecParserContext *s) { if (s) { diff --git a/libavcodec/version.h b/libavcodec/version.h index 552e5a7c5d..17cd17c327 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -69,9 +69,6 @@ #ifndef FF_API_OLD_ENCDEC #define FF_API_OLD_ENCDEC (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_PARSER_CHANGE -#define FF_API_PARSER_CHANGE (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_THREAD_SAFE_CALLBACKS #define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60) #endif