From patchwork Mon Apr 19 14:08:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27078 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp567838iob; Mon, 19 Apr 2021 07:25:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYhncaIKZcNOhDKONE7M7b5mEORaDSIYAGhktZps2qhWPkdPNSNs3dCQCl+B9Yi1NftHuy X-Received: by 2002:a05:6402:1a47:: with SMTP id bf7mr14180631edb.173.1618842357875; Mon, 19 Apr 2021 07:25:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842357; cv=none; d=google.com; s=arc-20160816; b=J7Q0cY0WpsucepG5egiJ3VcbXubsilhhH1aX/cOT5chWNdZWegCSbQZ8t2zjuEoLT9 bAoVJRircEIqAx2jBz5mZE44DpkHCDvbI2mSGOBqYj0P/oLLaTu04Lk7TXEGc+sqr1SC DVl8ipokm8D7V/RqIpXnBTkbwxUDumbHGi8ocQtOxUNY2dhPDRAmdNyUcPC/ZaxQfs9T LEb0BLEg1WlCfxSy8/LihD2xbHzi9ujg5vCHNMCK9em+ORO0fpsQAluj0i8C4pfM/zJa d7AfR5mPkP+hFEx/Xe9ru+iwU2QxK1F1yvlgr3IgnLR9PEWT5zbR+L+lLEBoPCCJ+fwv HwoA== 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=c9HKIZ/eOaN88XId53HW0CfAqW73B9ycPnEnnUIz0w8=; b=BLj2hhd+aQ5h3qqw4RmV7COXx9wQQUDVQDz5s8AvTDSBUm2XI71iMAhFbkjX2rKJda HEUa+IHx12env14iUuhf2q7NajFaRyzhPa6VY/aZNaPFgT5gIYIkRwCGjsTW8yCDCcN8 Y8W+9FYnk9uVnTzxyEaTYpLk9BtDtkB8xuxVamyO6FR5LVSnsylIDr9U+mZ1KCbdkqgO eDqdAUHf6SnU044HgCFDIKZhUKR/NfdfynnvMxld08BH6Db+kXwk7/20rRDA+aTsaZOa bymuhhLhL0wrDldGf2moVGMJiHPK/tUPAXpSzdksfCD5EZN1ULYzB6FVRNw36Oxi9AMx kXzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=biBeM0h9; 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 d12si10653764ejj.422.2021.04.19.07.25.57; Mon, 19 Apr 2021 07:25:57 -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=biBeM0h9; 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 34B7668A0B7; Mon, 19 Apr 2021 17:16:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E4BD68A085 for ; Mon, 19 Apr 2021 17:16:40 +0300 (EEST) Received: by mail-qk1-f172.google.com with SMTP id t17so7398714qkg.4 for ; Mon, 19 Apr 2021 07:16: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=O0vqli+4JcFa4E+lGiQE/xB1aNvil2vr9O2aLzOdTHc=; b=biBeM0h9jMR5KyCmMFpFf6UIFXv2u0Sb5fOcJKmg7Yak9cTmtS0dZt8OuyDtoPvHIt ZmduFu6H5XSi921Z+1HRIQlBLwdRx69jIheTZKx28xrVvg6XPq+nI7PQBJsoPSwYSmn1 4aLwDWZ262l3swN58p4a+e3JheMG2hg6LB13sgzjY2KOWc7uW1Da2DDdz+GkWq1dafRm da/D3fg8Bsx77q66BucNen+yltBBfbo6/LQgqJ1y8FcjJ39v9BkwX4WcAFYXvbiAUqId /F/PEzXuXm9TAYuyj4seg5HWmDf6pMEaQd3+GzxmYG/d1j6sC+Tx9ZATq6OIJX6vZDbw j8wg== 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=O0vqli+4JcFa4E+lGiQE/xB1aNvil2vr9O2aLzOdTHc=; b=UxwzTSTJNFW/oqDHawBSeEH+5w1Fcl+zh6he7/+f1I7lnFTdhRzbuwR2rDfva/aO+7 FdzWCtqqt95wFnj0scBJCUWXH2aS7MuvPw4/rnh0ma5Uip9qVv4USpjI7LGUZilZmFhH /MhUvnCUlzWKZSsDhc+LCQ7PAJuTA/RejfPIEy+jU3s9KW14fBxKE6i8O6FXcmomhYdo +R3SF2z1EeA+hWF5Pk/cwbkgliIby+W5FD+xS5RRoDExD7ffZ4AxRIcTOml1LwVfgP8K G/McQfoz7QNwVXyf2+7z0dse2IZWNmoUdyufaSD2jWp3oAvuh84A+KYs5dRsivUK5BKA IZ9w== X-Gm-Message-State: AOAM532DkhFSgxdk7baHMGSYQc61yyl6gQn569fUAhV1D6luYOPgGnHd M2gKPmpZRai16RtT+Dpaw/KvWzaNyRg= X-Received: by 2002:ac8:5704:: with SMTP id 4mr1671777qtw.379.1618841463798; Mon, 19 Apr 2021 07:11:03 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:03 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:08:58 -0300 Message-Id: <20210419141024.8174-2-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 01/87] avcodec: Remove AVCodec, AVParser and AVBitStreamFilter next 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: GGwxwbXLsTbi From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavcodec/allcodecs.c | 39 --------------------------------- libavcodec/avcodec.h | 40 ---------------------------------- libavcodec/bitstream_filters.c | 6 ----- libavcodec/codec.h | 3 --- libavcodec/parsers.c | 35 ----------------------------- libavcodec/version.h | 3 --- 6 files changed, 126 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 2e9a3581de..3194232500 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -869,45 +869,6 @@ const AVCodec *av_codec_iterate(void **opaque) return c; } -#if FF_API_NEXT -FF_DISABLE_DEPRECATION_WARNINGS -static AVOnce av_codec_next_init = AV_ONCE_INIT; - -static void av_codec_init_next(void) -{ - AVCodec *prev = NULL, *p; - void *i = 0; - while ((p = (AVCodec*)av_codec_iterate(&i))) { - if (prev) - prev->next = p; - prev = p; - } -} - - - -av_cold void avcodec_register(AVCodec *codec) -{ - ff_thread_once(&av_codec_next_init, av_codec_init_next); -} - -AVCodec *av_codec_next(const AVCodec *c) -{ - ff_thread_once(&av_codec_next_init, av_codec_init_next); - - if (c) - return c->next; - else - return (AVCodec*)codec_list[0]; -} - -void avcodec_register_all(void) -{ - ff_thread_once(&av_codec_next_init, av_codec_init_next); -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - static enum AVCodecID remap_deprecated_codec_id(enum AVCodecID id) { switch(id){ diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8a71c04230..483ab9a358 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2728,16 +2728,6 @@ typedef struct AVSubtitle { int64_t pts; ///< Same as packet pts, in AV_TIME_BASE } AVSubtitle; -#if FF_API_NEXT -/** - * If c is NULL, returns the first registered codec, - * if c is non-NULL, returns the next registered codec after c, - * or NULL if c is the last one. - */ -attribute_deprecated -AVCodec *av_codec_next(const AVCodec *c); -#endif - /** * Return the LIBAVCODEC_VERSION_INT constant. */ @@ -2753,20 +2743,6 @@ const char *avcodec_configuration(void); */ const char *avcodec_license(void); -#if FF_API_NEXT -/** - * @deprecated Calling this function is unnecessary. - */ -attribute_deprecated -void avcodec_register(AVCodec *codec); - -/** - * @deprecated Calling this function is unnecessary. - */ -attribute_deprecated -void avcodec_register_all(void); -#endif - /** * Allocate an AVCodecContext and set its fields to default values. The * resulting struct should be freed with avcodec_free_context(). @@ -3553,10 +3529,6 @@ typedef struct AVCodecParser { const uint8_t *buf, int buf_size); void (*parser_close)(AVCodecParserContext *s); int (*split)(AVCodecContext *avctx, const uint8_t *buf, int buf_size); -#if FF_API_NEXT - attribute_deprecated - struct AVCodecParser *next; -#endif } AVCodecParser; /** @@ -3570,13 +3542,6 @@ typedef struct AVCodecParser { */ const AVCodecParser *av_parser_iterate(void **opaque); -#if FF_API_NEXT -attribute_deprecated -AVCodecParser *av_parser_next(const AVCodecParser *c); - -attribute_deprecated -void av_register_codec_parser(AVCodecParser *parser); -#endif AVCodecParserContext *av_parser_init(int codec_id); /** @@ -4065,11 +4030,6 @@ attribute_deprecated const AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f); #endif -#if FF_API_NEXT -attribute_deprecated -const AVBitStreamFilter *av_bsf_next(void **opaque); -#endif - /* memory */ /** diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index 02d33abb18..3de2af92d3 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -75,12 +75,6 @@ const AVBitStreamFilter *av_bsf_iterate(void **opaque) return f; } -#if FF_API_NEXT -const AVBitStreamFilter *av_bsf_next(void **opaque) { - return av_bsf_iterate(opaque); -} -#endif - const AVBitStreamFilter *av_bsf_get_by_name(const char *name) { const AVBitStreamFilter *f = NULL; diff --git a/libavcodec/codec.h b/libavcodec/codec.h index de050b2815..c95078491d 100644 --- a/libavcodec/codec.h +++ b/libavcodec/codec.h @@ -243,9 +243,6 @@ typedef struct AVCodec { ***************************************************************** */ int priv_data_size; -#if FF_API_NEXT - struct AVCodec *next; -#endif /** * @name Frame-level threading support functions * @{ diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index 3d944f5222..40b42e6d1a 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -18,10 +18,7 @@ #include -#include "libavutil/thread.h" - #include "avcodec.h" -#include "version.h" extern AVCodecParser ff_aac_parser; extern AVCodecParser ff_aac_latm_parser; @@ -78,38 +75,6 @@ extern AVCodecParser ff_xma_parser; #include "libavcodec/parser_list.c" -#if FF_API_NEXT -FF_DISABLE_DEPRECATION_WARNINGS -static AVOnce av_parser_next_init = AV_ONCE_INIT; - -static void av_parser_init_next(void) -{ - AVCodecParser *prev = NULL, *p; - int i = 0; - while ((p = (AVCodecParser*)parser_list[i++])) { - if (prev) - prev->next = p; - prev = p; - } -} - -AVCodecParser *av_parser_next(const AVCodecParser *p) -{ - ff_thread_once(&av_parser_next_init, av_parser_init_next); - - if (p) - return p->next; - else - return (AVCodecParser*)parser_list[0]; -} - -void av_register_codec_parser(AVCodecParser *parser) -{ - ff_thread_once(&av_parser_next_init, av_parser_init_next); -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - const AVCodecParser *av_parser_iterate(void **opaque) { uintptr_t i = (uintptr_t)*opaque; diff --git a/libavcodec/version.h b/libavcodec/version.h index 349b4b1269..20641c2d2b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -120,9 +120,6 @@ #ifndef FF_API_LOCKMGR #define FF_API_LOCKMGR (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_NEXT -#define FF_API_NEXT (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_UNSANITIZED_BITRATES #define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:08:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27079 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp568775iob; Mon, 19 Apr 2021 07:27:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkA+zTubyDKEIjW6K0hT4Q5jTgr5N6AH7e3lY4GVnsk+i0uV/3j3wf+BddRo+PmWbyNqjC X-Received: by 2002:a05:6402:441:: with SMTP id p1mr26039578edw.298.1618842434344; Mon, 19 Apr 2021 07:27:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842434; cv=none; d=google.com; s=arc-20160816; b=tRxSNMI13mTv4xjCzide7MaDzQ9ysuQb99a4BzdDhz8/4HmJrPyWJH2rGXT7/vrSoX eXfL3AzqRvZypXmj0ePRGb0TsxLTGH6jNyW85znOo4Dybd+P3GXoV1UXze1+zu6wrx3n 0VcQrLW2aLdWxowmSRou+mViIMdzWayjaBVY8OhLoR3IoDblipdxTmVo92JHaChYHGxm PkGGg4hogZeqcWhL6xlO0Wjm6Usvp0dACa7u4w/HhR2qLcCrK+9QvEGfkUp5TwBguJMi BG3vRX0WrKlnNb4mwa1AFk53R2OhzY0X2U4Sx6FtaagFdqkZFCXsE8A9r71JoVk3bhAz NwAg== 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=bg+mX0LIML4em2/O6FO9iikYF2N9/AVCSzeI5JEZxds=; b=pt5ZWVqV1xDwYRtV/bXUCjZJtdFZwKyX4OdVtujQzvhPl6C2mKWv6MG+iJGMCtiY9C d+Qf0uks4wgGB0Me7alYmt4JPMRPuYf6XXqQzk8InXo7ajk/Qshw42t3/6/xEeU1KioS 8LRC7DxFTqJQrFQcKUqw/dZb++FzV659RnSixRkAre2Qydh/NuxUUHaKcLT3nYAvNySG mc8SCKJ3XwQDtTyp32U3zZwn9lN8Dil3fdA2r8kdJQFGP68/oUDqdBdeh6WDV6iPs52p A857bEDWibn6NK5tfYbdZZTJPk6nbmnHZqiQBwq3fTGDiVZJyOCwPr/kMF3AdlPnoUZ0 RQAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RR4d7phM; 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 a1si8990862edr.67.2021.04.19.07.27.13; Mon, 19 Apr 2021 07:27:14 -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=RR4d7phM; 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 93892680BD2; Mon, 19 Apr 2021 17:18:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6D9668A202 for ; Mon, 19 Apr 2021 17:18:03 +0300 (EEST) Received: by mail-qk1-f173.google.com with SMTP id y136so3782006qkb.1 for ; Mon, 19 Apr 2021 07:18:03 -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=JBh9NkHM92EUCYvqpap9WuB+51u4132JuWLSgOgw8mQ=; b=RR4d7phMqTldGjxLGO55XynhoCGLeLfVQXiPFMDuf1yY9L2U06ksuBKzPXYGeZypey 7tGDdLnqujNrDxEFoUWKXIJIqdwfz17vzA0wr7DegjXJfgI/A41gfNqfNeVn+68korxW asDPBpvJDAq1yhG7ztrzXXFkkSuHIyd9LW3rbjwn9eHEO6pFWsmwG0UBkIeEBRlMX6rr DiKgHGqhgeX+xZ9lJbLkFZzZvThcmWaFg7nsKKncIM6SzKN0pYWZ9mv3MsVtnEauUUOz w6BCFgyEeLs8j2SglYorc8OHzzSPIsEw9U7X59qCHpxYM2SImDQCoKW7z1U2PK0/4jyS wz6A== 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=JBh9NkHM92EUCYvqpap9WuB+51u4132JuWLSgOgw8mQ=; b=JxYpSTeQ6OQdKvqiaZf+CgWSyFuESFdyuUcu+xFnawg9+tob+DdoZcqP/OFT0/LJJ8 rPocxx+tD0/tEdH6iFeIe89A1I81+YZjHyrBoqGz4pxhAI88eGomMjxTr7VH3X9XEdnj cvk+mdPtqZ+VOrHa1Jmm+iFbc8Q6WFbFgtP8/OebrYpYejnXU4NpwF8Ay6cKs1f5vITv pW0yoA4VHtZJ/y58B5UfVtUh9PDJGQfhL8LnR5ZaJmSzqbO4VHclb1+lERwH2uH5r1ds 02Fws6uEVsTmLat/+j5MIQDsrUsgnPo75CA2otLRJGhZinVacre9yWetFLZ4klJbsuk+ coRQ== X-Gm-Message-State: AOAM532fBNrEmKrVGh7dlj4NO29mQnc8Zp0oFxCN5basAZxtEk7U+wr1 jyZMYl2b9hM4LRe+uZr1ht+1d0jSWqw= X-Received: by 2002:a37:dce:: with SMTP id 197mr12049569qkn.180.1618841464982; Mon, 19 Apr 2021 07:11:04 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:04 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:08:59 -0300 Message-Id: <20210419141024.8174-3-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 02/87] avformat: Remove next API for AV(In|Out)putFormat 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: gn0sZK4Z8D0D From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavformat/allformats.c | 98 ---------------------------------------- libavformat/avformat.h | 43 ------------------ libavformat/version.h | 3 -- 3 files changed, 144 deletions(-) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index fa093c7ac2..f450c1709b 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -22,10 +22,6 @@ #include "libavutil/thread.h" #include "libavformat/internal.h" #include "avformat.h" -#include "rtp.h" -#include "rdt.h" -#include "url.h" -#include "version.h" /* (de)muxers */ extern AVOutputFormat ff_a64_muxer; @@ -573,104 +569,10 @@ const AVInputFormat *av_demuxer_iterate(void **opaque) static AVMutex avpriv_register_devices_mutex = AV_MUTEX_INITIALIZER; -#if FF_API_NEXT -FF_DISABLE_DEPRECATION_WARNINGS -static AVOnce av_format_next_init = AV_ONCE_INIT; - -static void av_format_init_next(void) -{ - AVOutputFormat *prevout = NULL, *out; - AVInputFormat *previn = NULL, *in; - - ff_mutex_lock(&avpriv_register_devices_mutex); - - for (int i = 0; (out = (AVOutputFormat*)muxer_list[i]); i++) { - if (prevout) - prevout->next = out; - prevout = out; - } - - if (outdev_list) { - for (int i = 0; (out = (AVOutputFormat*)outdev_list[i]); i++) { - if (prevout) - prevout->next = out; - prevout = out; - } - } - - for (int i = 0; (in = (AVInputFormat*)demuxer_list[i]); i++) { - if (previn) - previn->next = in; - previn = in; - } - - if (indev_list) { - for (int i = 0; (in = (AVInputFormat*)indev_list[i]); i++) { - if (previn) - previn->next = in; - previn = in; - } - } - - ff_mutex_unlock(&avpriv_register_devices_mutex); -} - -AVInputFormat *av_iformat_next(const AVInputFormat *f) -{ - ff_thread_once(&av_format_next_init, av_format_init_next); - - if (f) -#if FF_API_AVIOFORMAT - return f->next; -#else - return (AVInputFormat *) f->next; -#endif - else { - void *opaque = NULL; - return (AVInputFormat *)av_demuxer_iterate(&opaque); - } -} - -AVOutputFormat *av_oformat_next(const AVOutputFormat *f) -{ - ff_thread_once(&av_format_next_init, av_format_init_next); - - if (f) -#if FF_API_AVIOFORMAT - return f->next; -#else - return (AVOutputFormat *) f->next; -#endif - else { - void *opaque = NULL; - return (AVOutputFormat *)av_muxer_iterate(&opaque); - } -} - -void av_register_all(void) -{ - ff_thread_once(&av_format_next_init, av_format_init_next); -} - -void av_register_input_format(AVInputFormat *format) -{ - ff_thread_once(&av_format_next_init, av_format_init_next); -} - -void av_register_output_format(AVOutputFormat *format) -{ - ff_thread_once(&av_format_next_init, av_format_init_next); -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - void avpriv_register_devices(const AVOutputFormat * const o[], const AVInputFormat * const i[]) { ff_mutex_lock(&avpriv_register_devices_mutex); outdev_list = o; indev_list = i; ff_mutex_unlock(&avpriv_register_devices_mutex); -#if FF_API_NEXT - av_format_init_next(); -#endif } diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 8600ee1bf7..6c97aff423 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -533,9 +533,6 @@ typedef struct AVOutputFormat { #define ff_const59 #else #define ff_const59 const -#endif -#if FF_API_NEXT - ff_const59 struct AVOutputFormat *next; #endif /** * size of private data so that it can be allocated in the wrapper @@ -683,10 +680,6 @@ typedef struct AVInputFormat { * New public fields should be added right above. ***************************************************************** */ -#if FF_API_NEXT - ff_const59 struct AVInputFormat *next; -#endif - /** * Raw demuxers store their codec ID here. */ @@ -1941,24 +1934,6 @@ const char *avformat_configuration(void); */ const char *avformat_license(void); -#if FF_API_NEXT -/** - * Initialize libavformat and register all the muxers, demuxers and - * protocols. If you do not call this function, then you can select - * exactly which formats you want to support. - * - * @see av_register_input_format() - * @see av_register_output_format() - */ -attribute_deprecated -void av_register_all(void); - -attribute_deprecated -void av_register_input_format(AVInputFormat *format); -attribute_deprecated -void av_register_output_format(AVOutputFormat *format); -#endif - /** * Do global initialization of network libraries. This is optional, * and not recommended anymore. @@ -1981,24 +1956,6 @@ int avformat_network_init(void); */ int avformat_network_deinit(void); -#if FF_API_NEXT -/** - * If f is NULL, returns the first registered input format, - * if f is non-NULL, returns the next registered input format after f - * or NULL if f is the last one. - */ -attribute_deprecated -AVInputFormat *av_iformat_next(const AVInputFormat *f); - -/** - * If f is NULL, returns the first registered output format, - * if f is non-NULL, returns the next registered output format after f - * or NULL if f is the last one. - */ -attribute_deprecated -AVOutputFormat *av_oformat_next(const AVOutputFormat *f); -#endif - /** * Iterate over all registered muxers. * diff --git a/libavformat/version.h b/libavformat/version.h index 66068d4d56..d82adba668 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -91,9 +91,6 @@ #ifndef FF_API_OLD_RTSP_OPTIONS #define FF_API_OLD_RTSP_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_NEXT -#define FF_API_NEXT (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_DASH_MIN_SEG_DURATION #define FF_API_DASH_MIN_SEG_DURATION (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27071 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp568373iob; Mon, 19 Apr 2021 07:26:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynBjd+eDsOGwHchiqPLhqvu2rT3KnncTxykCRoPdi+2jS4FIerUWzR05ay7DVekDdx+6Sb X-Received: by 2002:a05:6402:1393:: with SMTP id b19mr25707745edv.333.1618842397741; Mon, 19 Apr 2021 07:26:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842397; cv=none; d=google.com; s=arc-20160816; b=cNT6JVJWODVMIlgIEpALD/u5yZFDkeVcnqpfmEvHZOI5803tROnObjAYltDWCsrnti BdQmfSEIT6AdIMHi0ukp+Zrf+WjmBsNMBgpTMjYSXE7duLkJpk5o/WUYljyk1tr4f39M M4W/Cb+2B267Papf3BBrfQlfjfoHVgGaQynohSA4SSlVZoW4ak5Qrr+gcMe4D4NAoVgP Ld/iLPMx3pm4I+/aL2kC24jnEIhzg0hovn80TcUnvCuYsuA/m2NDZ21oCPF7+sMx1Uj9 4COUhD4xrBCSfLx3uLdKDE7WfmVJQZWB95OmXmzVlM0hfdd5LTh16ZC71ENOm+mkrCDM JBFQ== 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=RvsWH3ZFnltENLvTBUDiSqbB3cKyk+sM6P+W1Ot1t9M=; b=B4Fxmq0CFEViDlWhz9t1EWSzsNT0Pt4ii9q+c5PFaMsii/jAf39xf0EcesDcoHO5cN XaWpg5K3k/sVh4Mm0FP6NhDXXJT2ZJh0XsJgKjyHhFxOE5doax8T8Af3D6AnDXA/Sm+1 lZXriI21RCWLjgs5cijh7pr/rF9yN3Q1PsQeFCudsbHaZ+MTFnLXlGd3rk/YcmMUoVdo AB1yFVIS8jnUS+Ylc8gD/O3B4iVn3wTxC86oJ3tEFR3p2NuJu0wlobP95URjq14g41Ib 2z4bmmzOtvbcyKQRWXCryBSvHYb0lcWnBSYrnTVLGSxt6XgA2GWIijaOF9K1RvpQdb/V m78A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=GA22oAoX; 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 y11si12351213edd.539.2021.04.19.07.26.37; Mon, 19 Apr 2021 07:26:37 -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=GA22oAoX; 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 417D968A148; Mon, 19 Apr 2021 17:17:06 +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 AFE3F68A12B for ; Mon, 19 Apr 2021 17:17:04 +0300 (EEST) Received: by mail-qt1-f180.google.com with SMTP id 18so12731666qtz.6 for ; Mon, 19 Apr 2021 07:17:04 -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=QlPqmVoo+gP5vxIbjosIUY8yTiO0ZnmWrBbDjsbOOV8=; b=GA22oAoXsBbgomsxNlnmfAAygrR+C9L4oWq2STb1ohAJq02mubgCccKiyAWn8WriqX nmwNfrqtMaaDI52l+5YqFK+QV+LFxf+Kw+tOAiW2T9Ren2/tQwvkFTB63bM235YuJXrv Mzqe5ul3ldyoKXUKM/nY3+Gq4ZWJqO2Q0EHh7TEqwXTxKQFx9jcQqyEOGQG2B0RjMe+h qy0BQhsHeXbLvc3MDUKyd39sFsyDmF25TrKQX2CKHxgyXdKw5M5Xfy94m5/rFn48OPgi YOPJWsJ3zKsPL/xzv4vQSTze1yWHA6eBjRO3cQi44Pbnveb7iKE+gGltQLV5elQ6CRPO xTzQ== 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=QlPqmVoo+gP5vxIbjosIUY8yTiO0ZnmWrBbDjsbOOV8=; b=bmIkLQFJbgsJfGv4qiXr0IhaqHDJJnJpOJoXIjvNLPShIK26Gm4/Bpk1uNzVTMk3on IHdWOOlF6nKr0qhBWGk4DlnIdepeCS8qaQ5hWmI3UYcjctfSNk9rwd2HRQcntAMy/GMH riPp9b/kdEMqIcdKdwVz21uvtbWK+WMwkA5RjHYwwv26Sb8s70fcU05SbQLTSOS+Fv+w 6aUD326AktM9a8rI3vSrbKoLttK621Cxwge3ckp5o1Jdl+CCmd/w0oy2LzDgNjShFx6I i6UPp9+d3HAJSy5SonxQRvjjnnq5kts5spHXJgz1N6KpVTN5KGxlPBB6bgEpo6yuXFjO 820Q== X-Gm-Message-State: AOAM5315+xz0luDZRozBATuR41t0m5/uKEpDA0W+tu5DN8AiycV9/7S8 4c+LBK9HtT/WmbnEzNhQSR4HMUVtkgg= X-Received: by 2002:a37:a98e:: with SMTP id s136mr3478209qke.16.1618841466461; Mon, 19 Apr 2021 07:11:06 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:05 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:00 -0300 Message-Id: <20210419141024.8174-4-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 03/87] avcodec, avformat: Remove old BSF 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: yCE44GTcVd4L From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 1 - libavcodec/avcodec.h | 52 ---------- libavcodec/bitstream_filter.c | 185 ---------------------------------- libavcodec/version.h | 3 - libavformat/avformat.h | 17 ---- libavformat/utils.c | 58 ----------- 6 files changed, 316 deletions(-) delete mode 100644 libavcodec/bitstream_filter.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 4a597f727a..5b41450b86 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -34,7 +34,6 @@ OBJS = ac3_parser.o \ avpacket.o \ avpicture.o \ bitstream.o \ - bitstream_filter.o \ bitstream_filters.o \ bsf.o \ codec_desc.o \ diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 483ab9a358..5e6967df0d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3978,58 +3978,6 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes); */ int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes); -#if FF_API_OLD_BSF -typedef struct AVBitStreamFilterContext { - void *priv_data; - const struct AVBitStreamFilter *filter; - AVCodecParserContext *parser; - struct AVBitStreamFilterContext *next; - /** - * Internal default arguments, used if NULL is passed to av_bitstream_filter_filter(). - * Not for access by library users. - */ - char *args; -} AVBitStreamFilterContext; - -/** - * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext) - * is deprecated. Use the new bitstream filtering API (using AVBSFContext). - */ -attribute_deprecated -void av_register_bitstream_filter(AVBitStreamFilter *bsf); -/** - * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext) - * is deprecated. Use av_bsf_get_by_name(), av_bsf_alloc(), and av_bsf_init() - * from the new bitstream filtering API (using AVBSFContext). - */ -attribute_deprecated -AVBitStreamFilterContext *av_bitstream_filter_init(const char *name); -/** - * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext) - * is deprecated. Use av_bsf_send_packet() and av_bsf_receive_packet() from the - * new bitstream filtering API (using AVBSFContext). - */ -attribute_deprecated -int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc, - AVCodecContext *avctx, const char *args, - uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size, int keyframe); -/** - * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext) - * is deprecated. Use av_bsf_free() from the new bitstream filtering API (using - * AVBSFContext). - */ -attribute_deprecated -void av_bitstream_filter_close(AVBitStreamFilterContext *bsf); -/** - * @deprecated the old bitstream filtering API (using AVBitStreamFilterContext) - * is deprecated. Use av_bsf_iterate() from the new bitstream filtering API (using - * AVBSFContext). - */ -attribute_deprecated -const AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f); -#endif - /* memory */ /** diff --git a/libavcodec/bitstream_filter.c b/libavcodec/bitstream_filter.c deleted file mode 100644 index ca11ed371e..0000000000 --- a/libavcodec/bitstream_filter.c +++ /dev/null @@ -1,185 +0,0 @@ -/* - * copyright (c) 2006 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include - -#include "avcodec.h" -#include "libavutil/internal.h" -#include "libavutil/mem.h" -#include "libavutil/opt.h" - -#if FF_API_OLD_BSF -FF_DISABLE_DEPRECATION_WARNINGS - -const AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f) -{ - const AVBitStreamFilter *filter = NULL; - void *opaque = NULL; - - while (filter != f) - filter = av_bsf_iterate(&opaque); - - return av_bsf_iterate(&opaque); -} - -void av_register_bitstream_filter(AVBitStreamFilter *bsf) -{ -} - -typedef struct BSFCompatContext { - AVBSFContext *ctx; - int extradata_updated; -} BSFCompatContext; - -AVBitStreamFilterContext *av_bitstream_filter_init(const char *name) -{ - AVBitStreamFilterContext *ctx = NULL; - BSFCompatContext *priv = NULL; - const AVBitStreamFilter *bsf; - - bsf = av_bsf_get_by_name(name); - if (!bsf) - return NULL; - - ctx = av_mallocz(sizeof(*ctx)); - if (!ctx) - return NULL; - - priv = av_mallocz(sizeof(*priv)); - if (!priv) - goto fail; - - - ctx->filter = bsf; - ctx->priv_data = priv; - - return ctx; - -fail: - if (priv) - av_bsf_free(&priv->ctx); - av_freep(&priv); - av_freep(&ctx); - return NULL; -} - -void av_bitstream_filter_close(AVBitStreamFilterContext *bsfc) -{ - BSFCompatContext *priv; - - if (!bsfc) - return; - - priv = bsfc->priv_data; - - av_bsf_free(&priv->ctx); - av_freep(&bsfc->priv_data); - av_free(bsfc); -} - -int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc, - AVCodecContext *avctx, const char *args, - uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size, int keyframe) -{ - BSFCompatContext *priv = bsfc->priv_data; - AVPacket pkt = { 0 }; - int ret; - - if (!priv->ctx) { - ret = av_bsf_alloc(bsfc->filter, &priv->ctx); - if (ret < 0) - return ret; - - ret = avcodec_parameters_from_context(priv->ctx->par_in, avctx); - if (ret < 0) - return ret; - - priv->ctx->time_base_in = avctx->time_base; - - if (bsfc->args && bsfc->filter->priv_class) { - const AVOption *opt = av_opt_next(priv->ctx->priv_data, NULL); - const char * shorthand[2] = {NULL}; - - if (opt) - shorthand[0] = opt->name; - - ret = av_opt_set_from_string(priv->ctx->priv_data, bsfc->args, shorthand, "=", ":"); - if (ret < 0) - return ret; - } - - ret = av_bsf_init(priv->ctx); - if (ret < 0) - return ret; - } - - pkt.data = (uint8_t *)buf; - pkt.size = buf_size; - - ret = av_bsf_send_packet(priv->ctx, &pkt); - if (ret < 0) - return ret; - - *poutbuf = NULL; - *poutbuf_size = 0; - - ret = av_bsf_receive_packet(priv->ctx, &pkt); - if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) - return 0; - else if (ret < 0) - return ret; - - *poutbuf = av_malloc(pkt.size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!*poutbuf) { - av_packet_unref(&pkt); - return AVERROR(ENOMEM); - } - - *poutbuf_size = pkt.size; - memcpy(*poutbuf, pkt.data, pkt.size); - - av_packet_unref(&pkt); - - /* drain all the remaining packets we cannot return */ - while (ret >= 0) { - ret = av_bsf_receive_packet(priv->ctx, &pkt); - av_packet_unref(&pkt); - } - - if (!priv->extradata_updated) { - /* update extradata in avctx from the output codec parameters */ - if (priv->ctx->par_out->extradata_size && (!args || !strstr(args, "private_spspps_buf"))) { - av_freep(&avctx->extradata); - avctx->extradata_size = 0; - avctx->extradata = av_mallocz(priv->ctx->par_out->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!avctx->extradata) - return AVERROR(ENOMEM); - memcpy(avctx->extradata, priv->ctx->par_out->extradata, priv->ctx->par_out->extradata_size); - avctx->extradata_size = priv->ctx->par_out->extradata_size; - } - - priv->extradata_updated = 1; - } - - return 1; -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif diff --git a/libavcodec/version.h b/libavcodec/version.h index 20641c2d2b..1068716eb9 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -87,9 +87,6 @@ #ifndef FF_API_ASS_TIMING #define FF_API_ASS_TIMING (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_OLD_BSF -#define FF_API_OLD_BSF (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_COPY_CONTEXT #define FF_API_COPY_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) #endif diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 6c97aff423..17b54c0997 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2953,23 +2953,6 @@ int avformat_match_stream_specifier(AVFormatContext *s, AVStream *st, int avformat_queue_attached_pictures(AVFormatContext *s); -#if FF_API_OLD_BSF -/** - * Apply a list of bitstream filters to a packet. - * - * @param codec AVCodecContext, usually from an AVStream - * @param pkt the packet to apply filters to. If, on success, the returned - * packet has size == 0 and side_data_elems == 0, it indicates that - * the packet should be dropped - * @param bsfc a NULL-terminated list of filters to apply - * @return >=0 on success; - * AVERROR code on failure - */ -attribute_deprecated -int av_apply_bitstream_filters(AVCodecContext *codec, AVPacket *pkt, - AVBitStreamFilterContext *bsfc); -#endif - enum AVTimebaseSource { AVFMT_TBCF_AUTO = -1, AVFMT_TBCF_DECODER, diff --git a/libavformat/utils.c b/libavformat/utils.c index d4ec3d0190..02768aca1f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -5669,64 +5669,6 @@ int ff_stream_add_bitstream_filter(AVStream *st, const char *name, const char *a return 1; } -#if FF_API_OLD_BSF -FF_DISABLE_DEPRECATION_WARNINGS -int av_apply_bitstream_filters(AVCodecContext *codec, AVPacket *pkt, - AVBitStreamFilterContext *bsfc) -{ - int ret = 0; - while (bsfc) { - AVPacket new_pkt = *pkt; - int a = av_bitstream_filter_filter(bsfc, codec, NULL, - &new_pkt.data, &new_pkt.size, - pkt->data, pkt->size, - pkt->flags & AV_PKT_FLAG_KEY); - if (a == 0 && new_pkt.size == 0 && new_pkt.side_data_elems == 0) { - av_packet_unref(pkt); - memset(pkt, 0, sizeof(*pkt)); - return 0; - } - if(a == 0 && new_pkt.data != pkt->data) { - uint8_t *t = av_malloc(new_pkt.size + AV_INPUT_BUFFER_PADDING_SIZE); //the new should be a subset of the old so cannot overflow - if (t) { - memcpy(t, new_pkt.data, new_pkt.size); - memset(t + new_pkt.size, 0, AV_INPUT_BUFFER_PADDING_SIZE); - new_pkt.data = t; - new_pkt.buf = NULL; - a = 1; - } else { - a = AVERROR(ENOMEM); - } - } - if (a > 0) { - new_pkt.buf = av_buffer_create(new_pkt.data, new_pkt.size, - av_buffer_default_free, NULL, 0); - if (new_pkt.buf) { - pkt->side_data = NULL; - pkt->side_data_elems = 0; - av_packet_unref(pkt); - } else { - av_freep(&new_pkt.data); - a = AVERROR(ENOMEM); - } - } - if (a < 0) { - av_log(codec, AV_LOG_ERROR, - "Failed to open bitstream filter %s for stream %d with codec %s", - bsfc->filter->name, pkt->stream_index, - codec->codec ? codec->codec->name : "copy"); - ret = a; - break; - } - *pkt = new_pkt; - - bsfc = bsfc->next; - } - return ret; -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - int ff_format_output_open(AVFormatContext *s, const char *url, AVDictionary **options) { if (!s->oformat) From patchwork Mon Apr 19 14:09:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27077 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp567994iob; Mon, 19 Apr 2021 07:26:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6+6YMzHV6uRd+yA6lPQtxydGPvonWSgGaCDfbM+UEBIhltw+qlq9uoWeFQGtYGWH4X2rB X-Received: by 2002:a17:906:9bd3:: with SMTP id de19mr21597532ejc.329.1618842370700; Mon, 19 Apr 2021 07:26:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842370; cv=none; d=google.com; s=arc-20160816; b=gC0RvyXSYyH1CECRWF7/TreC8eIxcnkWv3vs4ZP3mzX1yDjobbp5p92Hq4qXjkruDq ldBGdDCLnHNK69RGBcddq7CQhGDACirecQHZ967UW1DKgRHrnsLdu58iIV2Imv/u+q+/ 4OZNbC4AddcJu7ek+eOCcVXgX5KULm6ZkI+u85Vz3gFACl8aFh8dBAP5qmam1cuNESSn 7oIls+OTyAV7SpBO0NEfYJ3ImHZOBpu3CqovamazcO65IKvpdsJFZY4sSKvEdlNkXJbZ EB85q94UIcwTTbu3kW4X+lqRpydbWayY0H55ACRQ+NB7yhnhmTmQZV+rHhwTzZT4w7n7 nUgw== 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=gddU9uoAd/WEL0t/eemZtLjgdVqgzrwsM6a1Lx2VmBw=; b=yTIkP4U/9e+9EVIjqpyGWOfVwK+lzlVWRPsd4JyZazFeAFItcnqrRXNLepSy0NXn7H S/0VgOwM903QjMGoAdRfVOyEz54MoPFVfpoclFJuv54mNANJzpqPNqN2fMuZuSqL8aXC 4zaHJ6HC7EYe7caV6eqSj/sN3rSgktKgvBbui/0XqTI0dOuuRIXJuahLaU+X1U1g/sTu zb9ZYQiWNyuMf7P3X8BMSkDvCkSZJgY1oabFe40z3J3YFzhBH9wAJHhsKYYTMCWJnEAj gIs7NNtUjFe4Mend5ZxsC87m96uDtCPv2g+MVtrrZNw8EURJzoelSOnIg/rno9WxdQuG sVow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WObBC+l2; 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 q9si12216936ejz.674.2021.04.19.07.26.10; Mon, 19 Apr 2021 07:26:10 -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=WObBC+l2; 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 5D81E68A0AE; Mon, 19 Apr 2021 17:17:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4096868A0E9 for ; Mon, 19 Apr 2021 17:16:56 +0300 (EEST) Received: by mail-io1-f51.google.com with SMTP id h141so26622798iof.2 for ; Mon, 19 Apr 2021 07:16:56 -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=9Wj3qHmE5JUn3MtJQWeC39U12zCStsMxY5hyIznsWN8=; b=WObBC+l24atfeat2kp3rsG33MugWeIH+nadIMDb+rLfqZTdAhpkZMQa3c+YJeqouoR 5QLAmK70DHgchUg0Yq2SZgbAEiFGbvUcW/hdYTSP+2yHpKWuKY0sZSla2O+wO3qbYi/V IZIZWUqwFwBMmTWfnbdgoa+Bak6peUcVSZ+xDcIgYC85obS/A1fEa54gt6QwQWKZM2s3 FTgbE92DRDVqYTlrQaxg5Tnud6UWhq1kxzT99tIWq1KHezRwx0exbZwo63CQH3JfcVIe ljOl+KwI2zmQt9eEIgiW+W253lLXse8WVn6aqPYLOPduGD6cDCMA7+tFd3pDV4GRLINr RN5g== 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=9Wj3qHmE5JUn3MtJQWeC39U12zCStsMxY5hyIznsWN8=; b=F9FHf3yofgNUVsp1grtSr28ivjWiHZ70ymMsaPV8cJyYQIqk6YhZdpeVZzNMZmUdO1 KExO04B4uVfxvwsrPTtivmmxSRiMPBF82MZEgEj17lFpXC6RuIkt8CU5o8JvvF1Mp6S0 nbN3xzJP66q+K+4nWRKvIyznkiRbyA8FpIEcHtycnWJMgQaszGh3ZbD4ABXix6koFqtT LE2g9c6lqQ3G00Vam+ZCDRWSJfEilcTSpvJpwGQTph4lCw4AQwDds6SmII3zSBI6hkN7 Vt/IxOR26ZufiXJrjuXgwtJoflEJ2QPSOG3PpxpVOyU6tsymwojPwmVvu9f74nF9iAYM 35Kg== X-Gm-Message-State: AOAM530rA+utELJWYfszSeL8O9RzyFUbc11mrsF1MpY4pR/VST9oW/UT ifKV/x4e2I0cMU78BOrm7uZLfCYzfJI= X-Received: by 2002:ac8:5d52:: with SMTP id g18mr12297574qtx.380.1618841467574; Mon, 19 Apr 2021 07:11:07 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:07 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:01 -0300 Message-Id: <20210419141024.8174-5-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 04/87] avcodec: Remove sidedata-only-packet cruft 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: ugsq3uHZxK6F From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 15 --------------- libavcodec/flacenc.c | 6 ------ libavcodec/options_table.h | 3 --- libavcodec/version.h | 3 --- 4 files changed, 27 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5e6967df0d..b46b858416 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2029,21 +2029,6 @@ typedef struct AVCodecContext { uint64_t vbv_delay; #endif -#if FF_API_SIDEDATA_ONLY_PKT - /** - * Encoding only and set by default. Allow encoders to output packets - * that do not contain any encoded data, only side data. - * - * Some encoders need to output such packets, e.g. to update some stream - * parameters at the end of encoding. - * - * @deprecated this field disables the default behaviour and - * it is kept only for compatibility. - */ - attribute_deprecated - int side_data_only_packets; -#endif - /** * Audio only. The number of "priming" samples (padding) inserted by the * encoder at the beginning of the audio. I.e. this number of leading diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 05a85d830f..38571ec9c9 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1370,13 +1370,7 @@ static int flac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, av_md5_final(s->md5ctx, s->md5sum); write_streaminfo(s, avctx->extradata); -#if FF_API_SIDEDATA_ONLY_PKT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->side_data_only_packets && !s->flushed) { -FF_ENABLE_DEPRECATION_WARNINGS -#else if (!s->flushed) { -#endif uint8_t *side_data = av_packet_new_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, avctx->extradata_size); if (!side_data) diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index e12159f734..956132437a 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -444,9 +444,6 @@ static const AVOption avcodec_options[] = { #if FF_API_OLD_ENCDEC {"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, A|V|D }, #endif -#if FF_API_SIDEDATA_ONLY_PKT -{"side_data_only_packets", NULL, OFFSET(side_data_only_packets), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, A|V|E }, -#endif {"apply_cropping", NULL, OFFSET(apply_cropping), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, V | D }, {"skip_alpha", "Skip processing alpha", OFFSET(skip_alpha), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, V|D }, {"field_order", "Field order", OFFSET(field_order), AV_OPT_TYPE_INT, {.i64 = AV_FIELD_UNKNOWN }, 0, 5, V|D|E, "field_order" }, diff --git a/libavcodec/version.h b/libavcodec/version.h index 1068716eb9..9b017d1980 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_CODED_FRAME #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_SIDEDATA_ONLY_PKT -#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_VDPAU_PROFILE #define FF_API_VDPAU_PROFILE (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27084 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp580567iob; Mon, 19 Apr 2021 07:40:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOsY68mdnvA4Zck/4rs7U5TYl2IJIrBcOVRPzRn4Omz2N2G2Mgz9b2lEfdlIboREmpgfN8 X-Received: by 2002:aa7:d15a:: with SMTP id r26mr3458586edo.283.1618843255720; Mon, 19 Apr 2021 07:40:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618843255; cv=none; d=google.com; s=arc-20160816; b=ZdHDlylI+EzPKtvocKzz7shHzmmXRLDUaNXVBDUEi1vYjSnwHNLgifJmD6ig9dqmAe tZfGYD74uJgemvkNgpMkII3QioiPhR+4R0hpmJXNrdGeWxWbfVZ8bl8aq6j7Ff1RpLUI t0rts4VQWBIVJu07wewBDI16XSRev5YIVk95IppZ7a+LwiNf8jB6GR1+g4ql7ok+WAZd UXBVRP/hLyTSopbu+TbQlAnh/HVjtJfEwEsjeZjaJ9OT/YwROKDbcdjdCGyygyIupTKH 7DjcePbeotFxxij72SlbFHhMR4EjhV6WhffO/b0/2GsV+xSq9/1luvi29vh2L1Jd3kFz 5CSw== 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=2eLHPM9Urzu8/V6RFxdq6GDGai2CoE2ayUxIt4o947I=; b=CyPJlqdOgHK4dcp8hF2vJvWit3WZr6Dr3z9gfF1XSI0oy6w3Je/WuCapSJY7JbLgq1 wjXOFVxFGKGqz06RUr8gyNj0CL/qFZa0fVlFd8oYE/stwhxQukIiAoiHkXRtAFdEHSkf 9YiWK3hSBY05si24PSzeoM5QKM3oHJCStHbl3fG2+0l/kpJBROvczU7bCRmL9+Sfu9z4 Pyqaok0ajMMhwc2W4TtJjbhHna1QYnqNXL6+Z3cUIrtnc0jW0CUjjTBGyh3v9zzAP5Nt FnQbhXmvsNTuoqtfN/Q1xe2b/tmXoug4f1i4+sNgT/8NxTU/84uWnirKWuENy58dPZIE p4Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=B5BkYp7v; 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 kq9si12311614ejb.12.2021.04.19.07.40.55; Mon, 19 Apr 2021 07:40:55 -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=B5BkYp7v; 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 6719368A48A; Mon, 19 Apr 2021 17:40:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0CB568004F for ; Mon, 19 Apr 2021 17:40:46 +0300 (EEST) Received: by mail-qt1-f174.google.com with SMTP id h7so26229534qtx.3 for ; Mon, 19 Apr 2021 07:40:46 -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=JmoKnBP5VBa++NmsVmDs99lWoD0druf0LW2W4p7Uj3I=; b=B5BkYp7vabwyIz7exhqMg0l94SrayVqeX8R57XzduLvyBACRS+7oro0B1KWHwIK9bj h/xpKQFXkmjaKxBp0OiLxDgArpA8eD/c9nZ0pSkVXx3sBJ48AasMRmeydzlCro0he533 Rp4xvJhqspK11RCpd87i9LOlS/ldoYdwgdGJIoL89hzR/nIQYZQw9jYiTWag7+H9tgCU uGcSGHTVMe41HxUbOWbCpL/fMiIq2ZS49V4BdULkiAOnKaFfUdNKpiTM3E/ikw2kfS0j JOn3Ai/zgnmlHhE/CHnDVPi5DKHtzahY1/RYU5cqn55oEfKBMUPjrswgtcQu/zbV22W7 /aEQ== 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=JmoKnBP5VBa++NmsVmDs99lWoD0druf0LW2W4p7Uj3I=; b=rkJ1aPfUmzZCKNRzR0ziG84YBq2cMSyT3epZ74TV+Zd0Dnw1/pzCQGXHESHG0M3ema eLLXu54bj10VN+OmB3gCj2+MkKcNx2qSA1lnkXShAPVmiqa8Z0o8kR/306RjsPFYhVKU ou6eRZ3Auf/7Oc3mqPk1RgPzGo7ZGt5NGBl7iXeM9ckWaUdvHOI61mC7bFmFTQQD6oaO CLZURZR00a6bvMpbZdtVnPx0Yc9TjLLKhJLZiXTwOfDMRg4bPkQ7dhCUBWCvlZ0S38cR BbzH33CowXnTXvoI1Aj0sRUzJtRvA8/lBmWr8pgGLHW2sY52yvZtCu8z3g1gp7pLDM0W sKMg== X-Gm-Message-State: AOAM533Ay5YByDRlE+DPnYQsRit4mEnjLTtrmdqT/Kcuz8rsRPahFCLN Rkeu0VcXqZP5ABHqfkw7zY2lMZ9IRi4= X-Received: by 2002:ac8:7b32:: with SMTP id l18mr7538704qtu.210.1618841468714; Mon, 19 Apr 2021 07:11:08 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:08 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:02 -0300 Message-Id: <20210419141024.8174-6-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 05/87] avcodec, avformat: Remove AVPacket.convergence_duration 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: UmnJ0AFHvW9u From: Andreas Rheinhardt Deprecated in 948f3c19a8bd069768ca411212aaf8c1ed96b10d. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 8 -------- libavcodec/avpacket.c | 16 ---------------- libavcodec/packet.h | 10 ---------- libavcodec/parser.c | 5 ----- libavcodec/version.h | 3 --- libavformat/matroskadec.c | 8 -------- libavformat/matroskaenc.c | 8 -------- libavformat/srtenc.c | 7 ------- libavformat/utils.c | 6 ------ 9 files changed, 71 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b46b858416..81a18e2cde 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3386,14 +3386,6 @@ typedef struct AVCodecParserContext { */ int key_frame; -#if FF_API_CONVERGENCE_DURATION - /** - * @deprecated unused - */ - attribute_deprecated - int64_t convergence_duration; -#endif - // Timestamp generation support: /** * Synchronization point for start of timestamp generation. diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index b5bac5c5f2..b726a8db0e 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -39,11 +39,6 @@ void av_init_packet(AVPacket *pkt) pkt->dts = AV_NOPTS_VALUE; pkt->pos = -1; pkt->duration = 0; -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - pkt->convergence_duration = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->flags = 0; pkt->stream_index = 0; pkt->buf = NULL; @@ -605,11 +600,6 @@ int av_packet_copy_props(AVPacket *dst, const AVPacket *src) dst->dts = src->dts; dst->pos = src->pos; dst->duration = src->duration; -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - dst->convergence_duration = src->convergence_duration; -FF_ENABLE_DEPRECATION_WARNINGS -#endif dst->flags = src->flags; dst->stream_index = src->stream_index; @@ -742,12 +732,6 @@ void av_packet_rescale_ts(AVPacket *pkt, AVRational src_tb, AVRational dst_tb) pkt->dts = av_rescale_q(pkt->dts, src_tb, dst_tb); if (pkt->duration > 0) pkt->duration = av_rescale_q(pkt->duration, src_tb, dst_tb); -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - if (pkt->convergence_duration > 0) - pkt->convergence_duration = av_rescale_q(pkt->convergence_duration, src_tb, dst_tb); -FF_ENABLE_DEPRECATION_WARNINGS -#endif } int avpriv_packet_list_put(PacketList **packet_buffer, diff --git a/libavcodec/packet.h b/libavcodec/packet.h index ca18ae631f..47e9b8999b 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -387,16 +387,6 @@ typedef struct AVPacket { int64_t duration; int64_t pos; ///< byte position in stream, -1 if unknown - -#if FF_API_CONVERGENCE_DURATION - /** - * @deprecated Same as the duration field, but as int64_t. This was required - * for Matroska subtitles, whose duration values could overflow when the - * duration field was still an int. - */ - attribute_deprecated - int64_t convergence_duration; -#endif } AVPacket; #if FF_API_INIT_PACKET diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 11c41d6a0a..08b9945a57 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -67,11 +67,6 @@ found: goto err_out; } s->key_frame = -1; -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - s->convergence_duration = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->dts_sync_point = INT_MIN; s->dts_ref_dts_delta = INT_MIN; s->pts_dts_delta = INT_MIN; diff --git a/libavcodec/version.h b/libavcodec/version.h index 9b017d1980..b2882361bc 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -57,9 +57,6 @@ #ifndef FF_API_VDPAU_PROFILE #define FF_API_VDPAU_PROFILE (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_CONVERGENCE_DURATION -#define FF_API_CONVERGENCE_DURATION (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_AVPICTURE #define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59) #endif diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index e8c76f9cfb..116e331215 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3572,14 +3572,6 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, pkt->pos = pos; pkt->duration = lace_duration; -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - if (st->codecpar->codec_id == AV_CODEC_ID_SUBRIP) { - pkt->convergence_duration = lace_duration; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - res = avpriv_packet_list_put(&matroska->queue, &matroska->queue_end, pkt, NULL, 0); if (res < 0) { av_packet_unref(pkt); diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 0141fb0b8d..b36e86ecb1 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2372,14 +2372,6 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt) mkv_blockgroup_size(pkt->size, track->track_num_size)); -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - /* For backward compatibility, prefer convergence_duration. */ - if (pkt->convergence_duration > 0) { - duration = pkt->convergence_duration; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* All subtitle blocks are considered to be keyframes. */ mkv_write_block(s, pb, MATROSKA_ID_BLOCK, pkt, 1); put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration); diff --git a/libavformat/srtenc.c b/libavformat/srtenc.c index 484dd4d230..9bb0ff94c1 100644 --- a/libavformat/srtenc.c +++ b/libavformat/srtenc.c @@ -73,13 +73,6 @@ static int srt_write_packet(AVFormatContext *avf, AVPacket *pkt) y2 = AV_RL32(p + 12); } -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - if (d <= 0) - /* For backward compatibility, fallback to convergence_duration. */ - d = pkt->convergence_duration; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (s == AV_NOPTS_VALUE || d < 0) { av_log(avf, AV_LOG_WARNING, "Insufficient timestamps in event number %d.\n", srt->index); diff --git a/libavformat/utils.c b/libavformat/utils.c index 02768aca1f..322ccd3af2 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1439,12 +1439,6 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, /* update flags */ if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA || ff_is_intra_only(st->codecpar->codec_id)) pkt->flags |= AV_PKT_FLAG_KEY; -#if FF_API_CONVERGENCE_DURATION -FF_DISABLE_DEPRECATION_WARNINGS - if (pc) - pkt->convergence_duration = pc->convergence_duration; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } /** 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 From patchwork Mon Apr 19 14:09:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27086 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp580156iob; Mon, 19 Apr 2021 07:40:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbwbb61jnZHBcOb7KlerfDlAyElqjzIkm3OgRENux7luOo4agAtHfdCJImkTDyLbeFLtOg X-Received: by 2002:a17:906:1101:: with SMTP id h1mr22617361eja.179.1618843229157; Mon, 19 Apr 2021 07:40:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618843229; cv=none; d=google.com; s=arc-20160816; b=vI9JJs2MWlMhWW6Krfcy67PzyLre+V7ZK7honmq+GurdqFn01BmQ0YS5VlDrw9fJio iT0EPM41BaV2paj/rIs93A+ESa5wfvw57JvkucWYtgoJxFlz93KZ60Io3TB5Z0tc3R39 MSmPiob2CW6CgfnsIUJqfjAt9FPz95kj78rUcVSBhmEsQw9gZgOCdQhq2j/ZlfICU2OT 1j+hJq0hkEOXv6ZbesVNNJAxvszNdMz0RArGAga7iSbGxWIPb0f8zs7ZXO5XmFLUXo8D Lm/S9FoGKP6dTfaXkYJyi+yVERfpzfE2n+/j3LryKdflCx1Qj7vQ0u8mJtAPLiJkM21C IU5Q== 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=wdq/pcrS5j4kir/c+ZABCORiQEnIG5g3V4NFXsTwygA=; b=ivkVUZQK4N1AAJmDu+S33j1XdkQdv+0arImjjIQKlzgHomqvDm1qaCTeHyfcH2vyz3 VxX0Y5ahC+RPcCOaA6IksnPz+hWllV6Q1XX78gSwPOpkbTMYzvxOjBnMTjsoYRbynlMq 0cF0bApRMemU+HDGSwOS/heTUuMo9JpaancTqCyE6cF3GI9JSGnY28DIy88efotLwxFx u1Ks7hIh5FaL9/81swu4LaRRZbm2vSN2SXQn7911QUFnvPItPEboJSAm4E8BVK3OwptV N51MvheS4KbrB+LVM0fVohihtZSJYUZq70ld/+R5y2xNVt920cAtscvid9q+ld0BYqK7 l/6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="pZq//6Nn"; 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 gx23si3791824ejb.463.2021.04.19.07.40.28; Mon, 19 Apr 2021 07:40: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="pZq//6Nn"; 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 4BD4868A451; Mon, 19 Apr 2021 17:40:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C36C68004F for ; Mon, 19 Apr 2021 17:40:19 +0300 (EEST) Received: by mail-io1-f51.google.com with SMTP id s16so29826013iog.9 for ; Mon, 19 Apr 2021 07:40:19 -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=FJjGslHmc2VPqwxxHKZlheTyV9mZwXpbxNPEE8alwNY=; b=pZq//6Nn7NE9amhw5Hg9JPLalOC0bKsOmR4HgqP8gkii6g0z5GmcrEcNpjYkGZRUc3 EblaHkGH+gYW9sOz2iGfMqnOLD1aAVCBTA8jc/T0Rn7Tm6Qtc1rAHVu6Zatxr2oelVhR sA0ej8Dz9FzrC4rp0PHrmkdxvnyH4TkTMqiO2Zg3JRp8UnzOZ2h3C7yALPsV7lGFAHC9 2oazDaCKGhzAmbbYUb7NtwQDuvTR+34WSIWP51cI0ETgkLSeODpdvxvD8oblOVhyodU5 zapbBXQx7gF4mpv0g6+q9WExTTc+Aitx/nnsVDB/p0QQeMznk1uQq61hmCRpLkn3ZmPI O3ig== 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=FJjGslHmc2VPqwxxHKZlheTyV9mZwXpbxNPEE8alwNY=; b=HBtDQwTMoQkGCilrVdJJc//zWfczSPViSlG/wzTirXXgacvzyl3TupwWKWuGGgKQC9 xz6RD6h185bhAhxThei2HxRUJn5VOQmnrTKAQpqTvuwsWVGyPVEArGB2Rc20T+HActWL shIwtJJLLYEIH0pHvPNQvkjbDx/j+U5hULYAw7DChae5njDNZdczOq9gK1jOPGgTaV7v +J3/ayDIwrhce85tIawLZRlFTCDWX4r8lopykme2Lf1FPmlqnD0AjzT5gSwr88qO6dMv MlctU/EC4zrja+DOlsPOEqTmW2QXe5gXCYRCAGHvviXAgEbj92uq10pNmT8ZBszUSONY /aSw== X-Gm-Message-State: AOAM531+bMrsaXW0aOLqm7doxCVCzZQLkCtQTbMu5DGWVvpWle9Q2fXl oMejq64+9iid0F1sZUov5xB8nX/WBAw= X-Received: by 2002:ac8:5913:: with SMTP id 19mr11968754qty.391.1618841471142; Mon, 19 Apr 2021 07:11:11 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:04 -0300 Message-Id: <20210419141024.8174-8-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 07/87] avcodec: Remove deprecated stat-bits fields 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: tfPzIY0+mKMT From: Andreas Rheinhardt Deprecated in 16216b713f9a21865cc07993961cf5d0ece24916. Signed-off-by: Andreas Rheinhardt --- doc/codecs.texi | 9 --------- libavcodec/avcodec.h | 24 ------------------------ libavcodec/mpegvideo_enc.c | 20 -------------------- libavcodec/options_table.h | 11 ----------- libavcodec/snowenc.c | 8 -------- libavcodec/version.h | 3 --- 6 files changed, 75 deletions(-) diff --git a/doc/codecs.texi b/doc/codecs.texi index 9add7629cf..4a481dd5bf 100644 --- a/doc/codecs.texi +++ b/doc/codecs.texi @@ -150,15 +150,6 @@ Set strategy to choose between I/P/B-frames. @item ps @var{integer} (@emph{encoding,video}) Set RTP payload size in bytes. -@item mv_bits @var{integer} -@item header_bits @var{integer} -@item i_tex_bits @var{integer} -@item p_tex_bits @var{integer} -@item i_count @var{integer} -@item p_count @var{integer} -@item skip_count @var{integer} -@item misc_bits @var{integer} -@item frame_bits @var{integer} @item codec_tag @var{integer} @item bug @var{flags} (@emph{decoding,video}) Workaround not auto detected encoder bugs. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 81a18e2cde..ee2350bcb0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1525,30 +1525,6 @@ typedef struct AVCodecContext { /* headers inside the transmitted RTP payload. */ #endif -#if FF_API_STAT_BITS - /* statistics, used for 2-pass encoding */ - attribute_deprecated - int mv_bits; - attribute_deprecated - int header_bits; - attribute_deprecated - int i_tex_bits; - attribute_deprecated - int p_tex_bits; - attribute_deprecated - int i_count; - attribute_deprecated - int p_count; - attribute_deprecated - int skip_count; - attribute_deprecated - int misc_bits; - - /** @deprecated this field is unused */ - attribute_deprecated - int frame_bits; -#endif - /** * pass1 encoding statistics output buffer * - encoding: Set by libavcodec. diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 7909a5630a..e1864f2afb 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1841,20 +1841,6 @@ vbv_retry: if (ret < 0) return -1; -#if FF_API_STAT_BITS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->header_bits = s->header_bits; - avctx->mv_bits = s->mv_bits; - avctx->misc_bits = s->misc_bits; - avctx->i_tex_bits = s->i_tex_bits; - avctx->p_tex_bits = s->p_tex_bits; - avctx->i_count = s->i_count; - // FIXME f/b_count in avctx - avctx->p_count = s->mb_num - s->i_count - s->skip_count; - avctx->skip_count = s->skip_count; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - frame_end(s); if ((CONFIG_MJPEG_ENCODER || CONFIG_AMV_ENCODER) && s->out_format == FMT_MJPEG) @@ -2006,12 +1992,6 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif } s->total_bits += s->frame_bits; -#if FF_API_STAT_BITS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->frame_bits = s->frame_bits; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - pkt->pts = s->current_picture.f->pts; if (!s->low_delay && s->pict_type != AV_PICTURE_TYPE_B) { diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 956132437a..b3d8a79f11 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -105,17 +105,6 @@ static const AVOption avcodec_options[] = { {"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, V|E}, {"ps", "RTP payload size in bytes", OFFSET(rtp_payload_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, #endif -#if FF_API_STAT_BITS -{"mv_bits", NULL, OFFSET(mv_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"header_bits", NULL, OFFSET(header_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"i_tex_bits", NULL, OFFSET(i_tex_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"p_tex_bits", NULL, OFFSET(p_tex_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"i_count", NULL, OFFSET(i_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"p_count", NULL, OFFSET(p_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"skip_count", NULL, OFFSET(skip_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"misc_bits", NULL, OFFSET(misc_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -{"frame_bits", NULL, OFFSET(frame_bits), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#endif {"codec_tag", NULL, OFFSET(codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, {"bug", "work around not autodetected encoder bugs", OFFSET(workaround_bugs), AV_OPT_TYPE_FLAGS, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"}, {"autodetect", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"}, diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 16d2b7c302..1c1080ac76 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1890,14 +1890,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if(avctx->flags&AV_CODEC_FLAG_PASS1) ff_write_pass1_stats(&s->m); s->m.last_pict_type = s->m.pict_type; -#if FF_API_STAT_BITS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->frame_bits = s->m.frame_bits; - avctx->mv_bits = s->m.mv_bits; - avctx->misc_bits = s->m.misc_bits; - avctx->p_tex_bits = s->m.p_tex_bits; -FF_ENABLE_DEPRECATION_WARNINGS -#endif emms_c(); diff --git a/libavcodec/version.h b/libavcodec/version.h index 3e8e429153..03aba06056 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -69,9 +69,6 @@ #ifndef FF_API_CODER_TYPE #define FF_API_CODER_TYPE (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_STAT_BITS -#define FF_API_STAT_BITS (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_PRIVATE_OPT #define FF_API_PRIVATE_OPT (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27075 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp569231iob; Mon, 19 Apr 2021 07:27:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynYZLh9r/bfL2VByBZ/r161LVe0r08ygDaw3I/OaCE5aGf+np8Vm5pG2mhxxMeNLgW9cbt X-Received: by 2002:a50:9fa1:: with SMTP id c30mr26306890edf.66.1618842470986; Mon, 19 Apr 2021 07:27:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842470; cv=none; d=google.com; s=arc-20160816; b=xnR/Y2S2iHqqjWDl6vJOG9KiIfrd+H+/y7vHH8YlhdtwNBOqXWpFD7NouxW81CxIWa j9pPcEP+EqUlFDzpMMYLfPieHsm2bihte1KlYRilGZFcFgRrG3tjpEBoFuQL3F5Vc/wa 4HVyLlHtawMO7URml+oeIqUpb97Pk2i1wvdr1pKLj7D7AT75LqHHe+eP+nFmCFOHetiu 4NFpHOf34jZZnSLL7sW0VLLaP9VoaJstlbm3ygaEdp2O8sEzbV2kCICGSvCQEjyi7FGq 1E1N04OpIDfx+2kCv5xU4PKhJ06d2bd0KFdyEpTHdxsEPpUVaDYH7r14HslUwq6wt8y3 A+WQ== 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=UMQ2mDYF6nEoUgtdnaZdK10VMKcBzNCT+E9setSieAA=; b=EmBwOJb6+ffryuQibMn0Japj8Zhjbf8RdAQhO27sFDC+SfJNG+/C6g+hoWG8uXNfLD QPZ0pNyl6SJPQ1VlTcgyk4da6tWob2Pr79lje62t5jFkLiapROYcVSNYkuNXEP5PeSKW pijm5SLtqCNxrpZP2ESU8r7maUd4+ckUf+hcu+mYkzuvoCxwYV3CO5CbXTz5r0v4oNcy e7EblsQ+xMlTmNTOn4yFjbtNbykS/4NZwFF9kdR1QFcIqQbuPG/FHCztCVLLvMDBpXnx W6Tvaom3j5kwzLbr55n4D4WDiJTyZgHCN4q3wcuF9e+CiIh5iHatae6FuSj3crKv/wCm b3Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bxyonCQe; 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 l1si11746884edv.565.2021.04.19.07.27.50; Mon, 19 Apr 2021 07:27:50 -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=bxyonCQe; 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 A417F68A2CC; Mon, 19 Apr 2021 17:18:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3595A68A2B8 for ; Mon, 19 Apr 2021 17:18:23 +0300 (EEST) Received: by mail-qk1-f181.google.com with SMTP id y136so3783216qkb.1 for ; Mon, 19 Apr 2021 07:18:23 -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=OCKZZ2O0C0a/kTLyzO8JXojIXshtwXSmBCuiNosoeLo=; b=bxyonCQeXTdlz4zF+M+GWWpGwAUKu7HP+jQZsLxV+MczZLzaPOXF8ZZ7+HS4qyviZF xJdB5nHfe3PQGr/d7C9PSeM8SVOaHXr6CF196FimGZFuoI+SIgHj2s61G0pDR6bylulw Zw2CDATSeaZ+hBM2NDLk5Bf2AY1XJzvDFJpuHHL3ayOQGVi3e+d06yRQOKMxn+KxaqIp 2owjpGomnO2+Pi+5JIiI6LLsTOD2w5/X8zoAn4atJdV4Y9Tmivf7jqcQTiP/mxMFyoIG 3UwQ7UQ5LJIbT2QscjcOVEKm1LuuZ3l9s0GQrFyX2Ga4VaFab+gQ708q9lKxqaDF7ANS Cp2A== 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=OCKZZ2O0C0a/kTLyzO8JXojIXshtwXSmBCuiNosoeLo=; b=A8WuJtWMytq1cnivgrUYn+kTwNIwkNBlkF3fYTnV3e3OHaXn3YqPUtKNeNY9VTF2lH Uwv1hwSAXIdVwcQ70uzLBER1PmjUfyghcHai7miBQcBuCKzwYfjBIWBjQCAQB+/NZz0h uCAuyHg08z0axtgkopQFJo93GUAbnt6FlVTiOXPvWS4/ezpQdNR0xUWZpd4L/1b+F/au O8IvuNhuHqoDf6S4FS6HQQ/Cf/so84iNfutpn3HkHNGmwBfqh2iNQUlDeOoRnhJPXV7x +N5JZfhmco1EKQmUuMcwQajTFpjIjjvOeD6NtVTfjnCJMsIkSqVxs1DgUE468/B0gVe+ YrpA== X-Gm-Message-State: AOAM531bXnTugfpfxvp/34RM6ndNEgTYp2Zq7j5C+zWwiTYDyFRKzUL0 Mqzfyh8vTgy56YIctcThfVfrffSrJZg= X-Received: by 2002:a37:d4e:: with SMTP id 75mr11713630qkn.457.1618841472484; Mon, 19 Apr 2021 07:11:12 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:12 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:05 -0300 Message-Id: <20210419141024.8174-9-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 08/87] avcodec: Remove deprecated coder type options 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: RXPIaAoAzzg6 From: Andreas Rheinhardt Deprecated in be00ec832c519427cd92218abac77dafdc1d5487. Signed-off-by: Andreas Rheinhardt --- doc/codecs.texi | 14 -------------- libavcodec/avcodec.h | 12 ------------ libavcodec/ffv1enc.c | 17 ----------------- libavcodec/libopenh264enc.c | 10 ---------- libavcodec/libx264.c | 9 --------- libavcodec/options_table.h | 7 ------- libavcodec/qsvenc.c | 6 ------ libavcodec/qsvenc_h264.c | 3 --- libavcodec/sgienc.c | 7 ------- libavcodec/sunrastenc.c | 26 -------------------------- libavcodec/targaenc.c | 7 ------- libavcodec/version.h | 3 --- 12 files changed, 121 deletions(-) diff --git a/doc/codecs.texi b/doc/codecs.texi index 4a481dd5bf..702caa2a1d 100644 --- a/doc/codecs.texi +++ b/doc/codecs.texi @@ -627,20 +627,6 @@ Set limit motion vectors range (1023 for DivX player). @item global_quality @var{integer} (@emph{encoding,audio,video}) -@item coder @var{integer} (@emph{encoding,video}) - -Possible values: -@table @samp -@item vlc -variable length coder / huffman coder -@item ac -arithmetic coder -@item raw -raw (no encoding) -@item rle -run-length coder -@end table - @item context @var{integer} (@emph{encoding,video}) Set context model. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ee2350bcb0..b468ee7c6f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1443,18 +1443,6 @@ typedef struct AVCodecContext { */ int rc_initial_buffer_occupancy; -#if FF_API_CODER_TYPE -#define FF_CODER_TYPE_VLC 0 -#define FF_CODER_TYPE_AC 1 -#define FF_CODER_TYPE_RAW 2 -#define FF_CODER_TYPE_RLE 3 - /** - * @deprecated use encoder private options instead - */ - attribute_deprecated - int coder_type; -#endif /* FF_API_CODER_TYPE */ - #if FF_API_PRIVATE_OPT /** @deprecated use encoder private options instead */ attribute_deprecated diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index cdad65a4f9..de28ac44f1 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -554,13 +554,6 @@ static av_cold int encode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } -#if FF_API_CODER_TYPE -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->coder_type != -1) - s->ac = avctx->coder_type > 0 ? AC_RANGE_CUSTOM_TAB : AC_GOLOMB_RICE; - else -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (s->ac == 1) // Compatbility with common command line usage s->ac = AC_RANGE_CUSTOM_TAB; else if (s->ac == AC_RANGE_DEFAULT_TAB_FORCE) @@ -1310,13 +1303,6 @@ static const AVClass ffv1_class = { .version = LIBAVUTIL_VERSION_INT, }; -#if FF_API_CODER_TYPE -static const AVCodecDefault ffv1_defaults[] = { - { "coder", "-1" }, - { NULL }, -}; -#endif - AVCodec ff_ffv1_encoder = { .name = "ffv1", .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), @@ -1350,9 +1336,6 @@ AVCodec ff_ffv1_encoder = { AV_PIX_FMT_NONE }, -#if FF_API_CODER_TYPE - .defaults = ffv1_defaults, -#endif .priv_class = &ffv1_class, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 0eade73498..608fa59cdd 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -210,16 +210,6 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) break; } -#if FF_API_CODER_TYPE && FF_API_OPENH264_CABAC -FF_DISABLE_DEPRECATION_WARNINGS - if (s->coder < 0 && avctx->coder_type == FF_CODER_TYPE_AC) - s->coder = 1; - - if (s->coder < 0) - s->coder = s->cabac; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (s->profile == FF_PROFILE_UNKNOWN && s->coder >= 0) s->profile = s->coder == 0 ? FF_PROFILE_H264_CONSTRAINED_BASELINE : #if OPENH264_VER_AT_LEAST(1, 8) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 4ddc4973a4..6d945fc3fb 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -747,12 +747,6 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif if (avctx->keyint_min >= 0) x4->params.i_keyint_min = avctx->keyint_min; -#if FF_API_CODER_TYPE -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->coder_type >= 0) - x4->coder = avctx->coder_type == FF_CODER_TYPE_AC; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (avctx->me_cmp >= 0) x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA; @@ -1174,9 +1168,6 @@ static const AVCodecDefault x264_defaults[] = { { "b_strategy", "-1" }, #endif { "keyint_min", "-1" }, -#if FF_API_CODER_TYPE - { "coder", "-1" }, -#endif { "cmp", "-1" }, { "threads", AV_STRINGIFY(X264_THREADS_AUTO) }, { "thread_type", "0" }, diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index b3d8a79f11..9b77428a50 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -216,13 +216,6 @@ static const AVOption avcodec_options[] = { {"subq", "sub-pel motion estimation quality", OFFSET(me_subpel_quality), AV_OPT_TYPE_INT, {.i64 = 8 }, INT_MIN, INT_MAX, V|E}, {"me_range", "limit motion vectors range (1023 for DivX player)", OFFSET(me_range), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"global_quality", NULL, OFFSET(global_quality), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, -#if FF_API_CODER_TYPE -{"coder", NULL, OFFSET(coder_type), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "coder"}, -{"vlc", "variable length coder / Huffman coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_VLC }, INT_MIN, INT_MAX, V|E, "coder"}, -{"ac", "arithmetic coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_AC }, INT_MIN, INT_MAX, V|E, "coder"}, -{"raw", "raw (no encoding)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_RAW }, INT_MIN, INT_MAX, V|E, "coder"}, -{"rle", "run-length coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_RLE }, INT_MIN, INT_MAX, V|E, "coder"}, -#endif /* FF_API_CODER_TYPE */ #if FF_API_PRIVATE_OPT {"context", "context model", OFFSET(context_model), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, #endif diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 566a5c8552..d30c289fce 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -667,12 +667,6 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extco.RateDistortionOpt = q->rdo > 0 ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; if (avctx->codec_id == AV_CODEC_ID_H264) { -#if FF_API_CODER_TYPE -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->coder_type >= 0) - q->cavlc = avctx->coder_type == FF_CODER_TYPE_VLC; -FF_ENABLE_DEPRECATION_WARNINGS -#endif q->extco.CAVLC = q->cavlc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN; diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index ddafc45ec3..df70f30271 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -169,9 +169,6 @@ static const AVCodecDefault qsv_enc_defaults[] = { { "bf", "3" }, { "qmin", "-1" }, { "qmax", "-1" }, -#if FF_API_CODER_TYPE - { "coder", "-1" }, -#endif { "trellis", "-1" }, { "flags", "+cgop" }, #if FF_API_PRIVATE_OPT diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c index 3aa0c7f4a5..2a898f5a4f 100644 --- a/libavcodec/sgienc.c +++ b/libavcodec/sgienc.c @@ -105,13 +105,6 @@ FF_DISABLE_DEPRECATION_WARNINGS avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; avctx->coded_frame->key_frame = 1; FF_ENABLE_DEPRECATION_WARNINGS -#endif - -#if FF_API_CODER_TYPE -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->coder_type == FF_CODER_TYPE_RAW) - s->rle = 0; -FF_ENABLE_DEPRECATION_WARNINGS #endif width = avctx->width; diff --git a/libavcodec/sunrastenc.c b/libavcodec/sunrastenc.c index 97b2242a6e..af4529815b 100644 --- a/libavcodec/sunrastenc.c +++ b/libavcodec/sunrastenc.c @@ -140,22 +140,6 @@ static av_cold int sunrast_encode_init(AVCodecContext *avctx) { SUNRASTContext *s = avctx->priv_data; -#if FF_API_CODER_TYPE -FF_DISABLE_DEPRECATION_WARNINGS - switch (avctx->coder_type) { - case FF_CODER_TYPE_RLE: - s->type = RT_BYTE_ENCODED; - break; - case FF_CODER_TYPE_RAW: - s->type = RT_STANDARD; - break; - default: - av_log(avctx, AV_LOG_ERROR, "invalid coder_type\n"); - return AVERROR(EINVAL); - } -FF_ENABLE_DEPRECATION_WARNINGS - if (s->type != RT_BYTE_ENCODED && s->type != RT_STANDARD) -#endif // adjust boolean option to RT equivalent s->type++; @@ -224,13 +208,6 @@ static const AVClass sunrast_class = { .version = LIBAVUTIL_VERSION_INT, }; -#if FF_API_CODER_TYPE -static const AVCodecDefault sunrast_defaults[] = { - { "coder", "rle" }, - { NULL }, -}; -#endif - AVCodec ff_sunrast_encoder = { .name = "sunrast", .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), @@ -239,9 +216,6 @@ AVCodec ff_sunrast_encoder = { .priv_data_size = sizeof(SUNRASTContext), .init = sunrast_encode_init, .encode2 = sunrast_encode_frame, -#if FF_API_CODER_TYPE - .defaults = sunrast_defaults, -#endif .priv_class = &sunrast_class, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, AV_PIX_FMT_PAL8, diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c index 79030a012b..f662e4a489 100644 --- a/libavcodec/targaenc.c +++ b/libavcodec/targaenc.c @@ -152,13 +152,6 @@ static int targa_encode_frame(AVCodecContext *avctx, AVPacket *pkt, bpp = pkt->data[16] >> 3; -#if FF_API_CODER_TYPE -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->coder_type == FF_CODER_TYPE_RAW) - s->rle = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - /* try RLE compression */ if (s->rle) datasize = targa_encode_rle(out, picsize, p, bpp, avctx->width, avctx->height); diff --git a/libavcodec/version.h b/libavcodec/version.h index 03aba06056..31d0d26abc 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -66,9 +66,6 @@ #ifndef FF_API_VBV_DELAY #define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_CODER_TYPE -#define FF_API_CODER_TYPE (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_PRIVATE_OPT #define FF_API_PRIVATE_OPT (LIBAVCODEC_VERSION_MAJOR < 59) #endif 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 From patchwork Mon Apr 19 14:09:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27080 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp569697iob; Mon, 19 Apr 2021 07:28:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLmNHcpcqgtrE5hXOEiVzud1+LnJicbkrTrBj2cFfhEkd1L4VAntYCGip+oNp/cgrIlJTm X-Received: by 2002:a17:906:5490:: with SMTP id r16mr23076271ejo.352.1618842502470; Mon, 19 Apr 2021 07:28:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842502; cv=none; d=google.com; s=arc-20160816; b=Hv+LomULiRwIJzJrsIPmi9D8WUCAzRQBEwxvRtd+isnQTJJvLn9JG4a85dt6S1PmJH nPobRV99iO3oUj5giWPnWXFraCWikq+X8aVzy4T0XmFQJIUk39fN9VcPFGBgJ5udfwhd aBgwPM49cg57npjAmViwOmsJevQ9iY+o5RnLsOrVNccflAfRubjhs2lrJgU/P2ub6V/I A5Kn1QPUio0caIWr4lIo+MaqnSc7I4zVT87MKsDQWcXj25aTVaN59x5ancJMbxaHQhCr K87UCaYAXVYv6o1iGKzcokS9eL4PYHcs4kXdCsfRwBjNeHm7oMlt8fmSHbt8G9RMHUlo +OZw== 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=VYh6rADufBCCPCPPZU8+x3zvj3WJXitFPSzkN+cDbSk=; b=SH7rOC1JfHFtgvPEj0krP3rjAmR/mw+uqft49Up5KBPDyHpKSQkQEILT6SkDHhRATH +w9QjOAwiGJz+kB2uULV4jAlb8ddA+eRG36+gKL7uza9iofNaHALcPkj4oiyjluWZnVR RJ8JApFwiqt01NNBktb1AjPzMWxO29/nRyC9+DnYaeKUD1LFqs1wY0v5RTR1nAK7ObSF cF+aOz6SCa4wEEV4OxQXmvTLcDsRDd0HV5pjfNhOlrKQ7a+/FoI3jDwuGU3Xz1XKeKJ3 cHJySZ7990pFoqleeGeDm/b+zTAGu9X6V304yBe0XCgMDClaFDiJHsTVH/rx0vRpO3h7 Zjfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WZIlSGsm; 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 l1si11747847edv.565.2021.04.19.07.28.21; Mon, 19 Apr 2021 07:28:22 -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=WZIlSGsm; 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 B1E3168A320; Mon, 19 Apr 2021 17:19:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 088D268A31A for ; Mon, 19 Apr 2021 17:19:16 +0300 (EEST) Received: by mail-qt1-f175.google.com with SMTP id o2so12732165qtr.4 for ; Mon, 19 Apr 2021 07:19:16 -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=+PEGXsb0opa3upRre20xh+saIK79zHuHS2Gijfqwk/0=; b=WZIlSGsm1mzVj/Ekoqac1MOwR3zI+B9qG5PUJnBTPHfkVWJriCjDyA+sNBgoMdk0+J riKalgYB1yT7pk4mVfD2AeZ77d0gZNW8RhCbsPZ8g1p/5uJgGoSoUDtXMJUVbRBM2F9k sN/kbdQk5QXgniYnGYTj0LoXe5w+1ga8DBUxVrwTKjrjcybBfA6ohMiDACl/Gx7IxDer X+/aVpiz+Iew9Ta6i5iTxVTiSM+oOFOp0Sc4oeWVJa+E96T/dS+lXHvq/t7G7W7So5my 6gmE+jXFihTLi4cb/LZSzLm/0DzgVwz7/Mh94ED7ACW53tLS3HTFFvHk/u+Ttjk68ghe E7Ng== 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=+PEGXsb0opa3upRre20xh+saIK79zHuHS2Gijfqwk/0=; b=S2075oLXAWy+kcMD6b/2H4KGsf1hCtqqDCEa/A5sc80Xyb6+XhPT1A173kIgI+zdYQ KrA6H6bltZodmOFZFvfKe0KBCBQiLkOcUaw4/SCEhslAGrmmRkLJG1wDacqOucoP6uDd /JJS1LQL7BLJcoNu9VmHY2nXvlPdDSxD9TEVoG+Nd1rgSCv03IWHYQdSrHEub/j8/Lnf xHBGN39/AaUuCq9zTQkgOrt/UF6xHhRkTM3yKimbMu82i3t0Q0mJT52tNeBuqhPVfriw I5z3hDvnIMPTxgJXlJsEcGsyYydEx8QwLdg3bKFWoR632Z2Nr5dHc68LDg+HVHe18kK7 a6aw== X-Gm-Message-State: AOAM5308+khHEXPvRmieae2BD5OrAN8iBZ/BPRs25pAsbJ/S8EVlGSN2 r0H2I/hHCOkBcFcu+XaaKCgEg1rkM5w= X-Received: by 2002:a37:bc43:: with SMTP id m64mr12305852qkf.186.1618841474927; Mon, 19 Apr 2021 07:11:14 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:14 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:07 -0300 Message-Id: <20210419141024.8174-11-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 10/87] avcodec: Remove private options from AVCodecContext 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: FUQqLz8UJRkw From: Andreas Rheinhardt Several options that were too codec-specific were deprecated between 0e6c8532215790bbe560a9eea4f3cc82bb55cf92 and 0e9c4fe254073b209970df3e3cb84531bc388e99. Signed-off-by: Andreas Rheinhardt --- doc/codecs.texi | 100 --------------------------------- libavcodec/alacenc.c | 26 --------- libavcodec/avcodec.h | 112 ------------------------------------- libavcodec/ffv1enc.c | 10 ---- libavcodec/flacenc.c | 36 ------------ libavcodec/huffyuvenc.c | 26 --------- libavcodec/j2kenc.c | 7 --- libavcodec/jpeglsenc.c | 7 --- libavcodec/libvpxenc.c | 12 ---- libavcodec/libx264.c | 33 ----------- libavcodec/libxavs.c | 28 ---------- libavcodec/libxvid.c | 7 --- libavcodec/ljpegenc.c | 14 ----- libavcodec/mpeg12dec.c | 7 --- libavcodec/mpeg12enc.c | 7 --- libavcodec/mpegvideo_enc.c | 71 ----------------------- libavcodec/options_table.h | 48 ---------------- libavcodec/pngenc.c | 9 --- libavcodec/qsvenc.c | 6 -- libavcodec/qsvenc_h264.c | 3 - libavcodec/qsvenc_hevc.c | 3 - libavcodec/qsvenc_mpeg2.c | 3 - libavcodec/snowenc.c | 14 ----- libavcodec/utvideoenc.c | 28 ---------- libavcodec/version.h | 3 - 25 files changed, 620 deletions(-) diff --git a/doc/codecs.texi b/doc/codecs.texi index 702caa2a1d..5e10020900 100644 --- a/doc/codecs.texi +++ b/doc/codecs.texi @@ -144,12 +144,6 @@ Default value is 0. @item b_qfactor @var{float} (@emph{encoding,video}) Set qp factor between P and B frames. -@item b_strategy @var{integer} (@emph{encoding,video}) -Set strategy to choose between I/P/B-frames. - -@item ps @var{integer} (@emph{encoding,video}) -Set RTP payload size in bytes. - @item codec_tag @var{integer} @item bug @var{flags} (@emph{decoding,video}) Workaround not auto detected encoder bugs. @@ -239,9 +233,6 @@ consider things that a sane encoder should not do as an error @item block_align @var{integer} -@item mpeg_quant @var{integer} (@emph{encoding,video}) -Use MPEG quantizers instead of H.263. - @item rc_override_count @var{integer} @item maxrate @var{integer} (@emph{encoding,audio,video}) @@ -347,19 +338,6 @@ favor predicting from the previous frame instead of the current @item bits_per_coded_sample @var{integer} -@item pred @var{integer} (@emph{encoding,video}) -Set prediction method. - -Possible values: -@table @samp -@item left - -@item plane - -@item median - -@end table - @item aspect @var{rational number} (@emph{encoding,video}) Set sample aspect ratio. @@ -576,9 +554,6 @@ sab diamond motion estimation @item last_pred @var{integer} (@emph{encoding,video}) Set amount of motion predictors from the previous frame. -@item preme @var{integer} (@emph{encoding,video}) -Set pre motion estimation. - @item precmp @var{integer} (@emph{encoding,video}) Set pre motion estimation compare function. @@ -627,9 +602,6 @@ Set limit motion vectors range (1023 for DivX player). @item global_quality @var{integer} (@emph{encoding,audio,video}) -@item context @var{integer} (@emph{encoding,video}) -Set context model. - @item slice_flags @var{integer} @item mbd @var{integer} (@emph{encoding,video}) @@ -645,12 +617,6 @@ use fewest bits use best rate distortion @end table -@item sc_threshold @var{integer} (@emph{encoding,video}) -Set scene change threshold. - -@item nr @var{integer} (@emph{encoding,video}) -Set noise reduction. - @item rc_init_occupancy @var{integer} (@emph{encoding,video}) Set number of bits which should be loaded into the rc buffer before decoding starts. @@ -738,64 +704,12 @@ Possible values: @item lowres @var{integer} (@emph{decoding,audio,video}) Decode at 1= 1/2, 2=1/4, 3=1/8 resolutions. -@item skip_threshold @var{integer} (@emph{encoding,video}) -Set frame skip threshold. - -@item skip_factor @var{integer} (@emph{encoding,video}) -Set frame skip factor. - -@item skip_exp @var{integer} (@emph{encoding,video}) -Set frame skip exponent. -Negative values behave identical to the corresponding positive ones, except -that the score is normalized. -Positive values exist primarily for compatibility reasons and are not so useful. - -@item skipcmp @var{integer} (@emph{encoding,video}) -Set frame skip compare function. - -Possible values: -@table @samp -@item sad -sum of absolute differences, fast (default) -@item sse -sum of squared errors -@item satd -sum of absolute Hadamard transformed differences -@item dct -sum of absolute DCT transformed differences -@item psnr -sum of squared quantization errors (avoid, low quality) -@item bit -number of bits needed for the block -@item rd -rate distortion optimal, slow -@item zero -0 -@item vsad -sum of absolute vertical differences -@item vsse -sum of squared vertical differences -@item nsse -noise preserving sum of squared differences -@item w53 -5/3 wavelet, only used in snow -@item w97 -9/7 wavelet, only used in snow -@item dctmax - -@item chroma - -@end table - @item mblmin @var{integer} (@emph{encoding,video}) Set min macroblock lagrange factor (VBR). @item mblmax @var{integer} (@emph{encoding,video}) Set max macroblock lagrange factor (VBR). -@item mepc @var{integer} (@emph{encoding,video}) -Set motion estimation bitrate penalty compensation (1.0 = 256). - @item skip_loop_filter @var{integer} (@emph{decoding,video}) @item skip_idct @var{integer} (@emph{decoding,video}) @item skip_frame @var{integer} (@emph{decoding,video}) @@ -835,31 +749,17 @@ Default value is @samp{default}. @item bidir_refine @var{integer} (@emph{encoding,video}) Refine the two motion vectors used in bidirectional macroblocks. -@item brd_scale @var{integer} (@emph{encoding,video}) -Downscale frames for dynamic B-frame decision. - @item keyint_min @var{integer} (@emph{encoding,video}) Set minimum interval between IDR-frames. @item refs @var{integer} (@emph{encoding,video}) Set reference frames to consider for motion compensation. -@item chromaoffset @var{integer} (@emph{encoding,video}) -Set chroma qp offset from luma. - @item trellis @var{integer} (@emph{encoding,audio,video}) Set rate-distortion optimal quantization. @item mv0_threshold @var{integer} (@emph{encoding,video}) -@item b_sensitivity @var{integer} (@emph{encoding,video}) -Adjust sensitivity of b_frame_strategy 1. - @item compression_level @var{integer} (@emph{encoding,audio,video}) -@item min_prediction_order @var{integer} (@emph{encoding,audio}) -@item max_prediction_order @var{integer} (@emph{encoding,audio}) -@item timecode_frame_start @var{integer} (@emph{encoding,video}) -Set GOP timecode frame start number, in non drop frame format. - @item bits_per_raw_sample @var{integer} @item channel_layout @var{integer} (@emph{decoding/encoding,audio}) diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c index ecdd46cac3..7c7a35c002 100644 --- a/libavcodec/alacenc.c +++ b/libavcodec/alacenc.c @@ -557,32 +557,6 @@ static av_cold int alac_encode_init(AVCodecContext *avctx) AV_WB8(alac_extradata+20, s->rc.k_modifier); } -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->min_prediction_order >= 0) { - if (avctx->min_prediction_order < MIN_LPC_ORDER || - avctx->min_prediction_order > ALAC_MAX_LPC_ORDER) { - av_log(avctx, AV_LOG_ERROR, "invalid min prediction order: %d\n", - avctx->min_prediction_order); - return AVERROR(EINVAL); - } - - s->min_prediction_order = avctx->min_prediction_order; - } - - if (avctx->max_prediction_order >= 0) { - if (avctx->max_prediction_order < MIN_LPC_ORDER || - avctx->max_prediction_order > ALAC_MAX_LPC_ORDER) { - av_log(avctx, AV_LOG_ERROR, "invalid max prediction order: %d\n", - avctx->max_prediction_order); - return AVERROR(EINVAL); - } - - s->max_prediction_order = avctx->max_prediction_order; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (s->max_prediction_order < s->min_prediction_order) { av_log(avctx, AV_LOG_ERROR, "invalid prediction orders: min=%d max=%d\n", diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b468ee7c6f..696025ceda 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -804,12 +804,6 @@ typedef struct AVCodecContext { */ float b_quant_factor; -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int b_frame_strategy; -#endif - /** * qscale offset between IP and B-frames * - encoding: Set by user. @@ -825,12 +819,6 @@ typedef struct AVCodecContext { */ int has_b_frames; -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int mpeg_quant; -#endif - /** * qscale factor between P- and I-frames * If > 0 then the last P-frame quantizer will be used (q = lastp_q * factor + offset). @@ -889,15 +877,6 @@ typedef struct AVCodecContext { */ int slice_count; -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int prediction_method; -#define FF_PRED_LEFT 0 -#define FF_PRED_PLANE 1 -#define FF_PRED_MEDIAN 2 -#endif - /** * slice offsets in the frame in bytes * - encoding: Set/allocated by libavcodec. @@ -970,12 +949,6 @@ typedef struct AVCodecContext { */ int last_predictor_count; -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int pre_me; -#endif - /** * motion estimation prepass comparison function * - encoding: Set by user. @@ -1044,16 +1017,6 @@ typedef struct AVCodecContext { */ uint16_t *inter_matrix; -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int scenechange_threshold; - - /** @deprecated use encoder private options instead */ - attribute_deprecated - int noise_reduction; -#endif - /** * precision of the intra DC coefficient - 8 * - encoding: Set by user. @@ -1089,26 +1052,12 @@ typedef struct AVCodecContext { */ int mb_lmax; -#if FF_API_PRIVATE_OPT - /** - * @deprecated use encoder private options instead - */ - attribute_deprecated - int me_penalty_compensation; -#endif - /** * - encoding: Set by user. * - decoding: unused */ int bidir_refine; -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int brd_scale; -#endif - /** * minimum GOP size * - encoding: Set by user. @@ -1123,12 +1072,6 @@ typedef struct AVCodecContext { */ int refs; -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int chromaoffset; -#endif - /** * Note: Value depends upon the compare function used for fullpel ME. * - encoding: Set by user. @@ -1136,12 +1079,6 @@ typedef struct AVCodecContext { */ int mv0_threshold; -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int b_sensitivity; -#endif - /** * Chromaticity coordinates of the source primaries. * - encoding: Set by user @@ -1443,30 +1380,6 @@ typedef struct AVCodecContext { */ int rc_initial_buffer_occupancy; -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int context_model; -#endif - -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int frame_skip_threshold; - - /** @deprecated use encoder private options instead */ - attribute_deprecated - int frame_skip_factor; - - /** @deprecated use encoder private options instead */ - attribute_deprecated - int frame_skip_exp; - - /** @deprecated use encoder private options instead */ - attribute_deprecated - int frame_skip_cmp; -#endif /* FF_API_PRIVATE_OPT */ - /** * trellis RD quantization * - encoding: Set by user. @@ -1474,20 +1387,6 @@ typedef struct AVCodecContext { */ int trellis; -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int min_prediction_order; - - /** @deprecated use encoder private options instead */ - attribute_deprecated - int max_prediction_order; - - /** @deprecated use encoder private options instead */ - attribute_deprecated - int64_t timecode_frame_start; -#endif - #if FF_API_RTP_CALLBACK /** * @deprecated unused @@ -1502,17 +1401,6 @@ typedef struct AVCodecContext { void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb); #endif -#if FF_API_PRIVATE_OPT - /** @deprecated use encoder private options instead */ - attribute_deprecated - int rtp_payload_size; /* The size of the RTP payload: the coder will */ - /* do its best to deliver a chunk with size */ - /* below rtp_payload_size, the chunk will start */ - /* with a start code on some codecs like H.263. */ - /* This doesn't take account of any particular */ - /* headers inside the transmitted RTP payload. */ -#endif - /** * pass1 encoding statistics output buffer * - encoding: Set by libavcodec. diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index de28ac44f1..b610d5d65e 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -696,16 +696,6 @@ static av_cold int encode_init(AVCodecContext *avctx) s->ac = AC_RANGE_CUSTOM_TAB; } } -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->context_model) - s->context_model = avctx->context_model; - if (avctx->context_model > 1U) { - av_log(avctx, AV_LOG_ERROR, "Invalid context model %d, valid values are 0 and 1\n", avctx->context_model); - return AVERROR(EINVAL); - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (s->ac == AC_RANGE_CUSTOM_TAB) { for (i = 1; i < 256; i++) diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 38571ec9c9..9460b1afc8 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -339,42 +339,6 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) if (s->options.max_partition_order < 0) s->options.max_partition_order = ((int[]){ 2, 2, 3, 3, 3, 8, 8, 8, 8, 8, 8, 8, 8})[level]; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->min_prediction_order >= 0) { - if (s->options.lpc_type == FF_LPC_TYPE_FIXED) { - if (avctx->min_prediction_order > MAX_FIXED_ORDER) { - av_log(avctx, AV_LOG_WARNING, - "invalid min prediction order %d, clamped to %d\n", - avctx->min_prediction_order, MAX_FIXED_ORDER); - avctx->min_prediction_order = MAX_FIXED_ORDER; - } - } else if (avctx->min_prediction_order < MIN_LPC_ORDER || - avctx->min_prediction_order > MAX_LPC_ORDER) { - av_log(avctx, AV_LOG_ERROR, "invalid min prediction order: %d\n", - avctx->min_prediction_order); - return AVERROR(EINVAL); - } - s->options.min_prediction_order = avctx->min_prediction_order; - } - if (avctx->max_prediction_order >= 0) { - if (s->options.lpc_type == FF_LPC_TYPE_FIXED) { - if (avctx->max_prediction_order > MAX_FIXED_ORDER) { - av_log(avctx, AV_LOG_WARNING, - "invalid max prediction order %d, clamped to %d\n", - avctx->max_prediction_order, MAX_FIXED_ORDER); - avctx->max_prediction_order = MAX_FIXED_ORDER; - } - } else if (avctx->max_prediction_order < MIN_LPC_ORDER || - avctx->max_prediction_order > MAX_LPC_ORDER) { - av_log(avctx, AV_LOG_ERROR, "invalid max prediction order: %d\n", - avctx->max_prediction_order); - return AVERROR(EINVAL); - } - s->options.max_prediction_order = avctx->max_prediction_order; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (s->options.lpc_type == FF_LPC_TYPE_NONE) { s->options.min_prediction_order = 0; s->options.max_prediction_order = 0; diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 2882433db5..218e57600d 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -227,12 +227,6 @@ FF_DISABLE_DEPRECATION_WARNINGS avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; avctx->coded_frame->key_frame = 1; FF_ENABLE_DEPRECATION_WARNINGS -#endif -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->context_model == 1) - s->context = avctx->context_model; -FF_ENABLE_DEPRECATION_WARNINGS #endif s->bps = desc->comp[0].depth; @@ -309,12 +303,6 @@ FF_ENABLE_DEPRECATION_WARNINGS avctx->bits_per_coded_sample = s->bitstream_bpp; s->decorrelate = s->bitstream_bpp >= 24 && !s->yuv && !(desc->flags & AV_PIX_FMT_FLAG_PLANAR); -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->prediction_method) - s->predictor = avctx->prediction_method; -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->interlaced = avctx->flags & AV_CODEC_FLAG_INTERLACED_ME ? 1 : 0; if (s->context) { if (s->flags & (AV_CODEC_FLAG_PASS1 | AV_CODEC_FLAG_PASS2)) { @@ -332,20 +320,6 @@ FF_ENABLE_DEPRECATION_WARNINGS "vcodec=ffvhuff or format=422p\n"); return AVERROR(EINVAL); } -#if FF_API_PRIVATE_OPT - if (s->context) { - av_log(avctx, AV_LOG_ERROR, - "Error: per-frame huffman tables are not supported " - "by huffyuv; use vcodec=ffvhuff\n"); - return AVERROR(EINVAL); - } - if (s->version > 2) { - av_log(avctx, AV_LOG_ERROR, - "Error: ver>2 is not supported " - "by huffyuv; use vcodec=ffvhuff\n"); - return AVERROR(EINVAL); - } -#endif if (s->interlaced != ( s->height > 288 )) av_log(avctx, AV_LOG_INFO, "using huffyuv 2.2.0 or newer interlacing flag\n"); diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index e3c5a32188..40ba965cdb 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1727,13 +1727,6 @@ static av_cold int j2kenc_init(AVCodecContext *avctx) s->compression_rate_enc = 0; } -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->prediction_method) - s->pred = avctx->prediction_method; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (avctx->pix_fmt == AV_PIX_FMT_PAL8 && (s->pred != FF_DWT97_INT || s->format != CODEC_JP2)) { av_log(s->avctx, AV_LOG_WARNING, "Forcing lossless jp2 for pal8\n"); s->pred = FF_DWT97_INT; diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index d03ce32f41..0f109c1304 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -282,13 +282,6 @@ static int encode_picture_ls(AVCodecContext *avctx, AVPacket *pkt, int i, size, ret; int comps; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->prediction_method) - ctx->pred = avctx->prediction_method; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (avctx->pix_fmt == AV_PIX_FMT_GRAY8 || avctx->pix_fmt == AV_PIX_FMT_GRAY16) comps = 1; diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 3f36943c12..76013a74d3 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -921,12 +921,6 @@ static av_cold int vpx_init(AVCodecContext *avctx, } } -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->frame_skip_threshold) - ctx->drop_threshold = avctx->frame_skip_threshold; -FF_ENABLE_DEPRECATION_WARNINGS -#endif enccfg.rc_dropframe_thresh = ctx->drop_threshold; //0-100 (0 => CBR, 100 => VBR) @@ -1066,12 +1060,6 @@ FF_ENABLE_DEPRECATION_WARNINGS codecctl_int(avctx, VP8E_SET_SHARPNESS, ctx->sharpness); if (CONFIG_LIBVPX_VP8_ENCODER && avctx->codec_id == AV_CODEC_ID_VP8) { -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->noise_reduction) - ctx->noise_sensitivity = avctx->noise_reduction; -FF_ENABLE_DEPRECATION_WARNINGS -#endif codecctl_int(avctx, VP8E_SET_NOISE_SENSITIVITY, ctx->noise_sensitivity); codecctl_int(avctx, VP8E_SET_TOKEN_PARTITIONS, av_log2(avctx->slices)); } diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 6d945fc3fb..4e7097e569 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -680,12 +680,6 @@ static av_cold int X264_init(AVCodecContext *avctx) if (avctx->b_quant_factor > 0) x4->params.rc.f_pb_factor = avctx->b_quant_factor; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->chromaoffset) - x4->chroma_offset = avctx->chromaoffset; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (x4->chroma_offset) x4->params.analyse.i_chroma_qp_offset = x4->chroma_offset; @@ -694,12 +688,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (avctx->max_b_frames >= 0) x4->params.i_bframe = avctx->max_b_frames; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->scenechange_threshold >= 0) - x4->scenechange_threshold = avctx->scenechange_threshold; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (x4->scenechange_threshold >= 0) x4->params.i_scenecut_threshold = x4->scenechange_threshold; @@ -729,22 +717,10 @@ FF_ENABLE_DEPRECATION_WARNINGS x4->params.analyse.i_trellis = avctx->trellis; if (avctx->me_range >= 0) x4->params.analyse.i_me_range = avctx->me_range; -#if FF_API_PRIVATE_OPT - FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->noise_reduction >= 0) - x4->noise_reduction = avctx->noise_reduction; - FF_ENABLE_DEPRECATION_WARNINGS -#endif if (x4->noise_reduction >= 0) x4->params.analyse.i_noise_reduction = x4->noise_reduction; if (avctx->me_subpel_quality >= 0) x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->b_frame_strategy >= 0) - x4->b_frame_strategy = avctx->b_frame_strategy; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (avctx->keyint_min >= 0) x4->params.i_keyint_min = avctx->keyint_min; if (avctx->me_cmp >= 0) @@ -1155,18 +1131,9 @@ static const AVCodecDefault x264_defaults[] = { { "qcomp", "-1" }, // { "rc_lookahead", "-1" }, { "refs", "-1" }, -#if FF_API_PRIVATE_OPT - { "sc_threshold", "-1" }, -#endif { "trellis", "-1" }, -#if FF_API_PRIVATE_OPT - { "nr", "-1" }, -#endif { "me_range", "-1" }, { "subq", "-1" }, -#if FF_API_PRIVATE_OPT - { "b_strategy", "-1" }, -#endif { "keyint_min", "-1" }, { "cmp", "-1" }, { "threads", AV_STRINGIFY(X264_THREADS_AUTO) }, diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index a83b93b836..0f22016731 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -288,13 +288,6 @@ static av_cold int XAVS_init(AVCodecContext *avctx) /* cabac is not included in AVS JiZhun Profile */ x4->params.b_cabac = 0; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->b_frame_strategy) - x4->b_frame_strategy = avctx->b_frame_strategy; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - x4->params.i_bframe_adaptive = x4->b_frame_strategy; avctx->has_b_frames = !!avctx->max_b_frames; @@ -305,13 +298,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (x4->params.i_keyint_min > x4->params.i_keyint_max) x4->params.i_keyint_min = x4->params.i_keyint_max; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->scenechange_threshold) - x4->scenechange_threshold = avctx->scenechange_threshold; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - x4->params.i_scenecut_threshold = x4->scenechange_threshold; // x4->params.b_deblocking_filter = avctx->flags & AV_CODEC_FLAG_LOOP_FILTER; @@ -343,13 +329,6 @@ FF_ENABLE_DEPRECATION_WARNINGS x4->params.analyse.i_trellis = avctx->trellis; -#if FF_API_PRIVATE_OPT - FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->noise_reduction >= 0) - x4->noise_reduction = avctx->noise_reduction; - FF_ENABLE_DEPRECATION_WARNINGS -#endif - x4->params.analyse.i_noise_reduction = x4->noise_reduction; if (avctx->level > 0) @@ -371,13 +350,6 @@ FF_ENABLE_DEPRECATION_WARNINGS x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor); x4->params.rc.f_pb_factor = avctx->b_quant_factor; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->chromaoffset) - x4->chroma_offset = avctx->chromaoffset; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - x4->params.analyse.i_chroma_qp_offset = x4->chroma_offset; x4->params.analyse.b_psnr = avctx->flags & AV_CODEC_FLAG_PSNR; diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index cb9135436a..22582680a0 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -617,13 +617,6 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) x->intra_matrix = x->inter_matrix = NULL; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->mpeg_quant) - x->mpeg_quant = avctx->mpeg_quant; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (x->mpeg_quant) x->vol_flags |= XVID_VOL_MPEGQUANT; if ((avctx->intra_matrix || avctx->inter_matrix)) { diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 74a2cdcc46..9a107e85ce 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -72,13 +72,6 @@ static int ljpeg_encode_bgr(AVCodecContext *avctx, PutBitContext *pb, int left[4], top[4], topleft[4]; int x, y, i; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->prediction_method) - s->pred = avctx->prediction_method + 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - for (i = 0; i < 4; i++) buffer[0][i] = 1 << (9 - 1); @@ -203,13 +196,6 @@ static int ljpeg_encode_yuv(AVCodecContext *avctx, PutBitContext *pb, const int mb_height = (avctx->height + s->vsample[0] - 1) / s->vsample[0]; int mb_x, mb_y; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->prediction_method) - s->pred = avctx->prediction_method + 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - for (mb_y = 0; mb_y < mb_height; mb_y++) { if (put_bytes_left(pb, 0) < mb_width * 4 * 3 * s->hsample[0] * s->vsample[0]) { diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 2d2b7517ad..c4d89e10ce 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -49,7 +49,6 @@ #include "mpegvideodata.h" #include "profiles.h" #include "thread.h" -#include "version.h" #include "xvmc_internal.h" #define A53_MAX_CC_COUNT 2000 @@ -2440,12 +2439,6 @@ static void mpeg_decode_gop(AVCodecContext *avctx, tc = s-> timecode_frame_start = get_bits(&s->gb, 25); -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - avctx->timecode_frame_start = tc; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - s->closed_gop = get_bits1(&s->gb); /* broken_link indicates that after editing the * reference frames of the first B-Frames after GOP I-Frame diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index dccb11b222..fd3e7de94a 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -220,13 +220,6 @@ static av_cold int encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->timecode_frame_start) - s->timecode_frame_start = avctx->timecode_frame_start; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (s->tc_opt_str) { AVRational rate = ff_mpeg12_frame_rate_tab[s->frame_rate_index]; int ret = av_timecode_init_from_string(&s->tc, rate, s->tc_opt_str, s); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index e1864f2afb..f0490a39cc 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -325,17 +325,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) avctx->bits_per_raw_sample = av_clip(avctx->bits_per_raw_sample, 0, 8); -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->rtp_payload_size) - s->rtp_payload_size = avctx->rtp_payload_size; - if (avctx->me_penalty_compensation) - s->me_penalty_compensation = avctx->me_penalty_compensation; - if (avctx->pre_me) - s->me_pre = avctx->pre_me; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - s->bit_rate = avctx->bit_rate; s->width = avctx->width; s->height = avctx->height; @@ -561,20 +550,6 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(EINVAL); } -#if FF_API_PRIVATE_OPT - FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->mpeg_quant) - s->mpeg_quant = 1; - FF_ENABLE_DEPRECATION_WARNINGS - - if (s->mpeg_quant && ( s->codec_id != AV_CODEC_ID_MPEG4 - && s->codec_id != AV_CODEC_ID_MPEG2VIDEO)) { - av_log(avctx, AV_LOG_ERROR, - "mpeg2 style quantization not supported by codec\n"); - return AVERROR(EINVAL); - } -#endif - if ((s->mpv_flags & FF_MPV_FLAG_CBP_RD) && !avctx->trellis) { av_log(avctx, AV_LOG_ERROR, "CBP RD needs trellis quant\n"); return AVERROR(EINVAL); @@ -595,13 +570,6 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(EINVAL); } -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->scenechange_threshold) - s->scenechange_threshold = avctx->scenechange_threshold; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (s->scenechange_threshold < 1000000000 && (avctx->flags & AV_CODEC_FLAG_CLOSED_GOP)) { av_log(avctx, AV_LOG_ERROR, @@ -657,15 +625,6 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR_PATCHWELCOME; } -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->b_frame_strategy) - s->b_frame_strategy = avctx->b_frame_strategy; - if (avctx->b_sensitivity != 40) - s->b_sensitivity = avctx->b_sensitivity; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (s->b_frame_strategy && (avctx->flags & AV_CODEC_FLAG_PASS2)) { av_log(avctx, AV_LOG_INFO, "notice: b_frame_strategy only affects the first pass\n"); @@ -855,13 +814,6 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(EINVAL); } -#if FF_API_PRIVATE_OPT - FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->noise_reduction) - s->noise_reduction = avctx->noise_reduction; - FF_ENABLE_DEPRECATION_WARNINGS -#endif - avctx->has_b_frames = !s->low_delay; s->encoding = 1; @@ -918,19 +870,6 @@ FF_ENABLE_DEPRECATION_WARNINGS s->quant_precision = 5; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->frame_skip_threshold) - s->frame_skip_threshold = avctx->frame_skip_threshold; - if (avctx->frame_skip_factor) - s->frame_skip_factor = avctx->frame_skip_factor; - if (avctx->frame_skip_exp) - s->frame_skip_exp = avctx->frame_skip_exp; - if (avctx->frame_skip_cmp != FF_CMP_DCTMAX) - s->frame_skip_cmp = avctx->frame_skip_cmp; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - ff_set_cmp(&s->mecc, s->mecc.ildct_cmp, avctx->ildct_cmp); ff_set_cmp(&s->mecc, s->mecc.frame_skip_cmp, s->frame_skip_cmp); @@ -983,16 +922,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if ((ret = ff_rate_control_init(s)) < 0) return ret; -#if FF_API_PRIVATE_OPT - FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->brd_scale) - s->brd_scale = avctx->brd_scale; - - if (avctx->prediction_method) - s->pred = avctx->prediction_method + 1; - FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (s->b_frame_strategy == 2) { for (i = 0; i < s->max_b_frames + 2; i++) { s->tmp_frames[i] = av_frame_alloc(); diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 9b77428a50..313150eb73 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -101,10 +101,6 @@ static const AVOption avcodec_options[] = { {"qdiff", "maximum difference between the quantizer scales (VBR)", OFFSET(max_qdiff), AV_OPT_TYPE_INT, {.i64 = 3 }, INT_MIN, INT_MAX, V|E}, {"bf", "set maximum number of B-frames between non-B-frames", OFFSET(max_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, -1, INT_MAX, V|E}, {"b_qfactor", "QP factor between P- and B-frames", OFFSET(b_quant_factor), AV_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E}, -#if FF_API_PRIVATE_OPT -{"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, V|E}, -{"ps", "RTP payload size in bytes", OFFSET(rtp_payload_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif {"codec_tag", NULL, OFFSET(codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, {"bug", "work around not autodetected encoder bugs", OFFSET(workaround_bugs), AV_OPT_TYPE_FLAGS, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"}, {"autodetect", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"}, @@ -140,9 +136,6 @@ static const AVOption avcodec_options[] = { {"aggressive", "consider things that a sane encoder should not do as an error", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_AGGRESSIVE | AV_EF_COMPLIANT | AV_EF_CAREFUL}, INT_MIN, INT_MAX, A|V|S|D|E, "err_detect"}, {"has_b_frames", NULL, OFFSET(has_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX}, {"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX}, -#if FF_API_PRIVATE_OPT -{"mpeg_quant", "use MPEG quantizers instead of H.263", OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif {"rc_override_count", NULL, OFFSET(rc_override_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, {"maxrate", "maximum bitrate (in bits/s). Used for VBV together with bufsize.", OFFSET(rc_max_rate), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT_MAX, V|A|E}, {"minrate", "minimum bitrate (in bits/s). Most useful in setting up a CBR encode. It is of little use otherwise.", @@ -183,12 +176,6 @@ static const AVOption avcodec_options[] = { {"deblock", "use strong deblock filter for damaged MBs", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_DEBLOCK }, INT_MIN, INT_MAX, V|D, "ec"}, {"favor_inter", "favor predicting from the previous frame", 0, AV_OPT_TYPE_CONST, {.i64 = FF_EC_FAVOR_INTER }, INT_MIN, INT_MAX, V|D, "ec"}, {"bits_per_coded_sample", NULL, OFFSET(bits_per_coded_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX}, -#if FF_API_PRIVATE_OPT -{"pred", "prediction method", OFFSET(prediction_method), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "pred"}, -{"left", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_LEFT }, INT_MIN, INT_MAX, V|E, "pred"}, -{"plane", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_PLANE }, INT_MIN, INT_MAX, V|E, "pred"}, -{"median", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_MEDIAN }, INT_MIN, INT_MAX, V|E, "pred"}, -#endif {"aspect", "sample aspect ratio", OFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, 10, V|E}, {"sar", "sample aspect ratio", OFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, 10, V|E}, {"debug", "print specific debug info", OFFSET(debug), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, 0, INT_MAX, V|A|S|E|D, "debug"}, @@ -209,27 +196,15 @@ static const AVOption avcodec_options[] = { {"nomc", "skip motion compensation", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_NOMC }, INT_MIN, INT_MAX, V|A|D, "debug"}, {"dia_size", "diamond type & size for motion estimation", OFFSET(dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"last_pred", "amount of motion predictors from the previous frame", OFFSET(last_predictor_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#if FF_API_PRIVATE_OPT -{"preme", "pre motion estimation", OFFSET(pre_me), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif {"pre_dia_size", "diamond type & size for motion estimation pre-pass", OFFSET(pre_dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"subq", "sub-pel motion estimation quality", OFFSET(me_subpel_quality), AV_OPT_TYPE_INT, {.i64 = 8 }, INT_MIN, INT_MAX, V|E}, {"me_range", "limit motion vectors range (1023 for DivX player)", OFFSET(me_range), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"global_quality", NULL, OFFSET(global_quality), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, -#if FF_API_PRIVATE_OPT -{"context", "context model", OFFSET(context_model), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif {"slice_flags", NULL, OFFSET(slice_flags), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, {"mbd", "macroblock decision algorithm (high quality mode)", OFFSET(mb_decision), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, 2, V|E, "mbd"}, {"simple", "use mbcmp", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_SIMPLE }, INT_MIN, INT_MAX, V|E, "mbd"}, {"bits", "use fewest bits", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_BITS }, INT_MIN, INT_MAX, V|E, "mbd"}, {"rd", "use best rate distortion", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_RD }, INT_MIN, INT_MAX, V|E, "mbd"}, -#if FF_API_PRIVATE_OPT -{"sc_threshold", "scene change threshold", OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif -#if FF_API_PRIVATE_OPT -{"nr", "noise reduction", OFFSET(noise_reduction), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif {"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"threads", "set the number of threads", OFFSET(thread_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, INT_MAX, V|A|E|D, "threads"}, {"auto", "autodetect a suitable number of threads to use", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"}, @@ -243,12 +218,6 @@ static const AVOption avcodec_options[] = { {"level", NULL, OFFSET(level), AV_OPT_TYPE_INT, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E|CC, "avctx.level"}, {"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "avctx.level"}, {"lowres", "decode at 1= 1/2, 2=1/4, 3=1/8 resolutions", OFFSET(lowres), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|A|D}, -#if FF_API_PRIVATE_OPT -{"skip_threshold", "frame skip threshold", OFFSET(frame_skip_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -{"skip_factor", "frame skip factor", OFFSET(frame_skip_factor), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -{"skip_exp", "frame skip exponent", OFFSET(frame_skip_exp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -{"skipcmp", "frame skip compare function", OFFSET(frame_skip_cmp), AV_OPT_TYPE_INT, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, V|E, "cmp_func"}, -#endif {"cmp", "full-pel ME compare function", OFFSET(me_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, {"subcmp", "sub-pel ME compare function", OFFSET(me_sub_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, {"mbcmp", "macroblock compare function", OFFSET(mb_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"}, @@ -274,9 +243,6 @@ static const AVOption avcodec_options[] = { {"msad", "sum of absolute differences, median predicted", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_MEDIAN_SAD }, INT_MIN, INT_MAX, V|E, "cmp_func"}, {"mblmin", "minimum macroblock Lagrange factor (VBR)", OFFSET(mb_lmin), AV_OPT_TYPE_INT, {.i64 = FF_QP2LAMBDA * 2 }, 1, FF_LAMBDA_MAX, V|E}, {"mblmax", "maximum macroblock Lagrange factor (VBR)", OFFSET(mb_lmax), AV_OPT_TYPE_INT, {.i64 = FF_QP2LAMBDA * 31 }, 1, FF_LAMBDA_MAX, V|E}, -#if FF_API_PRIVATE_OPT -{"mepc", "motion estimation bitrate penalty compensation (1.0 = 256)", OFFSET(me_penalty_compensation), AV_OPT_TYPE_INT, {.i64 = 256 }, INT_MIN, INT_MAX, V|E}, -#endif {"skip_loop_filter", "skip loop filtering process for the selected frames", OFFSET(skip_loop_filter), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"}, {"skip_idct" , "skip IDCT/dequantization for the selected frames", OFFSET(skip_idct), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"}, {"skip_frame" , "skip decoding for the selected frames", OFFSET(skip_frame), AV_OPT_TYPE_INT, {.i64 = AVDISCARD_DEFAULT }, INT_MIN, INT_MAX, V|D, "avdiscard"}, @@ -288,25 +254,11 @@ static const AVOption avcodec_options[] = { {"nointra" , "discard all frames except I frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_NONINTRA}, INT_MIN, INT_MAX, V|D, "avdiscard"}, {"all" , "discard all frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVDISCARD_ALL }, INT_MIN, INT_MAX, V|D, "avdiscard"}, {"bidir_refine", "refine the two motion vectors used in bidirectional macroblocks", OFFSET(bidir_refine), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 4, V|E}, -#if FF_API_PRIVATE_OPT -{"brd_scale", "downscale frames for dynamic B-frame decision", OFFSET(brd_scale), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, 10, V|E}, -#endif {"keyint_min", "minimum interval between IDR-frames", OFFSET(keyint_min), AV_OPT_TYPE_INT, {.i64 = 25 }, INT_MIN, INT_MAX, V|E}, {"refs", "reference frames to consider for motion compensation", OFFSET(refs), AV_OPT_TYPE_INT, {.i64 = 1 }, INT_MIN, INT_MAX, V|E}, -#if FF_API_PRIVATE_OPT -{"chromaoffset", "chroma QP offset from luma", OFFSET(chromaoffset), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, -#endif {"trellis", "rate-distortion optimal quantization", OFFSET(trellis), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, {"mv0_threshold", NULL, OFFSET(mv0_threshold), AV_OPT_TYPE_INT, {.i64 = 256 }, 0, INT_MAX, V|E}, -#if FF_API_PRIVATE_OPT -{"b_sensitivity", "adjust sensitivity of b_frame_strategy 1", OFFSET(b_sensitivity), AV_OPT_TYPE_INT, {.i64 = 40 }, 1, INT_MAX, V|E}, -#endif {"compression_level", NULL, OFFSET(compression_level), AV_OPT_TYPE_INT, {.i64 = FF_COMPRESSION_DEFAULT }, INT_MIN, INT_MAX, V|A|E}, -#if FF_API_PRIVATE_OPT -{"min_prediction_order", NULL, OFFSET(min_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, -{"max_prediction_order", NULL, OFFSET(max_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, -{"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = -1 }, -1, INT64_MAX, V|E}, -#endif {"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX}, {"channel_layout", NULL, OFFSET(channel_layout), AV_OPT_TYPE_UINT64, {.i64 = DEFAULT }, 0, UINT64_MAX, A|E|D, "channel_layout"}, {"request_channel_layout", NULL, OFFSET(request_channel_layout), AV_OPT_TYPE_UINT64, {.i64 = DEFAULT }, 0, UINT64_MAX, A|D, "request_channel_layout"}, diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index eebb164440..e2636b7daf 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -1017,15 +1017,6 @@ FF_ENABLE_DEPRECATION_WARNINGS ff_llvidencdsp_init(&s->llvidencdsp); -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->prediction_method) - s->filter_type = av_clip(avctx->prediction_method, - PNG_FILTER_VALUE_NONE, - PNG_FILTER_VALUE_MIXED); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (avctx->pix_fmt == AV_PIX_FMT_MONOBLACK) s->filter_type = PNG_FILTER_VALUE_NONE; diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index d30c289fce..6281e63a54 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -716,12 +716,6 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extco2.LookAheadDS = q->look_ahead_downsampling; q->extco2.RepeatPPS = q->repeat_pps ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->b_frame_strategy >= 0) - q->b_strategy = avctx->b_frame_strategy; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (q->b_strategy >= 0) q->extco2.BRefType = q->b_strategy ? MFX_B_REF_PYRAMID : MFX_B_REF_OFF; if (q->adaptive_i >= 0) diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index df70f30271..06b49c46ee 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -171,9 +171,6 @@ static const AVCodecDefault qsv_enc_defaults[] = { { "qmax", "-1" }, { "trellis", "-1" }, { "flags", "+cgop" }, -#if FF_API_PRIVATE_OPT - { "b_strategy", "-1" }, -#endif { NULL }, }; diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 347f30655e..fc10459628 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -267,9 +267,6 @@ static const AVCodecDefault qsv_enc_defaults[] = { { "qmax", "-1" }, { "trellis", "-1" }, { "flags", "+cgop" }, -#if FF_API_PRIVATE_OPT - { "b_strategy", "-1" }, -#endif { NULL }, }; diff --git a/libavcodec/qsvenc_mpeg2.c b/libavcodec/qsvenc_mpeg2.c index 0e34bb75dc..538b937f74 100644 --- a/libavcodec/qsvenc_mpeg2.c +++ b/libavcodec/qsvenc_mpeg2.c @@ -89,9 +89,6 @@ static const AVCodecDefault qsv_enc_defaults[] = { { "bf", "3" }, { "trellis", "-1" }, { "flags", "+cgop" }, -#if FF_API_PRIVATE_OPT - { "b_strategy", "-1" }, -#endif { NULL }, }; diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 1c1080ac76..fc0e5230a9 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -41,13 +41,6 @@ static av_cold int encode_init(AVCodecContext *avctx) int plane_index, ret; int i; -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->prediction_method) - s->pred = avctx->prediction_method; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if(s->pred == DWT_97 && (avctx->flags & AV_CODEC_FLAG_QSCALE) && avctx->global_quality == 0){ @@ -1759,13 +1752,6 @@ redo_frame: } predict_plane(s, s->spatial_idwt_buffer, plane_index, 0); -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - if(s->avctx->scenechange_threshold) - s->scenechange_threshold = s->avctx->scenechange_threshold; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if( plane_index==0 && pic->pict_type == AV_PICTURE_TYPE_P && !(avctx->flags&AV_CODEC_FLAG_PASS2) diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 32c204a898..8c8a9535a1 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -43,12 +43,6 @@ typedef struct HuffEntry { uint32_t code; } HuffEntry; -#if FF_API_PRIVATE_OPT -static const int ut_pred_order[5] = { - PRED_LEFT, PRED_MEDIAN, PRED_MEDIAN, PRED_NONE, PRED_GRADIENT -}; -#endif - /* Compare huffman tree nodes */ static int ut_huff_cmp_len(const void *a, const void *b) { @@ -140,28 +134,6 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx) ff_bswapdsp_init(&c->bdsp); ff_llvidencdsp_init(&c->llvidencdsp); -#if FF_API_PRIVATE_OPT -FF_DISABLE_DEPRECATION_WARNINGS - /* Check the prediction method, and error out if unsupported */ - if (avctx->prediction_method < 0 || avctx->prediction_method > 4) { - av_log(avctx, AV_LOG_WARNING, - "Prediction method %d is not supported in Ut Video.\n", - avctx->prediction_method); - return AVERROR_OPTION_NOT_FOUND; - } - - if (avctx->prediction_method == FF_PRED_PLANE) { - av_log(avctx, AV_LOG_ERROR, - "Plane prediction is not supported in Ut Video.\n"); - return AVERROR_OPTION_NOT_FOUND; - } - - /* Convert from libavcodec prediction type to Ut Video's */ - if (avctx->prediction_method) - c->frame_pred = ut_pred_order[avctx->prediction_method]; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (c->frame_pred == PRED_GRADIENT) { av_log(avctx, AV_LOG_ERROR, "Gradient prediction is not supported.\n"); return AVERROR_OPTION_NOT_FOUND; diff --git a/libavcodec/version.h b/libavcodec/version.h index 5e122847ac..2cca9839e2 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -66,9 +66,6 @@ #ifndef FF_API_VBV_DELAY #define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_PRIVATE_OPT -#define FF_API_PRIVATE_OPT (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_ASS_TIMING #define FF_API_ASS_TIMING (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27073 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp568939iob; Mon, 19 Apr 2021 07:27:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy43k46oXgcnP6z5Em5MK5ufmmXBxyJ1D6R7nEeyY8SUThotoLNsNUaXrgKL8MnrRhL0CCT X-Received: by 2002:a17:906:86da:: with SMTP id j26mr16373181ejy.187.1618842447119; Mon, 19 Apr 2021 07:27:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842447; cv=none; d=google.com; s=arc-20160816; b=B53jzsMcqa1pkMsXoPRd94N/mOFEyvmKf7T3gPuHp9CghU/QGpprzqKexSijEN+my9 hM5Bz97oPe9Fn+4SA5LYPMYbFskc/9WgNEMKJWe43bB5oNzB8Uqsh8o3fJyHJ0c2U2cL 44IFcwhtNQgTrqRY7nmz/UimbycYWWRp4tS3aCEFzW43fhk7/42q+qyIN+Yk/o8A72hX JVaYUQLjbFwtajstZsSUECC9xbn7gUArDfHLZeMy3lxdwSmbUImrbQxo6agIqxh6qbrv m4ub8ewHGnh+r2sDl3Jm7OueGBJwSjxJ3LbAOasgcEHfCOVMNcgwvDJJ4b7x56W8ne+S 90Gg== 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=e73oLuocGfpiCeEh9Zr6BnH/UP4Eyr84MVSaylcF5Ug=; b=p/sBH73gvTO+oemd4boF6AXcT8WNoHrz9FOKh2DTGyxMLfwwkJWgeJDoOa0TenDXsz Pqjrw6uRQJfIu3yzSiav3CbcQTzrIkGPDhZaRJ71b3qaAAp0Cba+Ko+6R/7kuNOjXs56 fXRvRaXEfGShsMaxjT3TkQwQSW8+nFOUxLYBpSAL7Wmq2psZZMMlQwC1i3E56tY1QStO x9VyD71S4kSkSUN77Yke7wpQryRY2SOrkcDzkb4KYizTNb1NO27L4dCeqGeruxv3SHN/ WzL3rZCq2DxL8grvIyBDKudUoJaump9v6sZsb9blzCjYFGREeG4IxPFr3LIxS99qS9uw 8Bhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hKPurEuY; 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 di10si7754093edb.378.2021.04.19.07.27.26; Mon, 19 Apr 2021 07:27: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=hKPurEuY; 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 9D5E968A27E; Mon, 19 Apr 2021 17:18:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 580C568A202 for ; Mon, 19 Apr 2021 17:18:04 +0300 (EEST) Received: by mail-qk1-f176.google.com with SMTP id t17so7404431qkg.4 for ; Mon, 19 Apr 2021 07:18:04 -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=/F2r3kklO+lecZcbVv0hQsEI+EbY/fkdbR9LHl+7bY8=; b=hKPurEuYP3N45M4WUZ8ZrLjYAdhL9iz0KP8tdpokKwOCHyDrfwrKteYwU7MRwdQx5O PStT07isrTUx2ehJfBlK0nY9dRjNvLdX9CVeJ742CQ4rOi6C0IITONGvBvYzXltiN9pe uLTTJ49u2KDnOR40k+851ZM8Owt8em8osVMJhVQEUEmzla9gZPgSoJ+JBefElyh1SCfd guDX+IkB38L2lZVEJEkMqbK56FCbpJ/lCO84HQmsFiZUMaKm+LLTzKdOcC2IB4krwQwU Yexmj/ooQ2uX+GuI7dLMr2YYZj5rRJWb9jIq/KkcfpBmBrCEik89lgVP3riXlfwHn68a PDhA== 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=/F2r3kklO+lecZcbVv0hQsEI+EbY/fkdbR9LHl+7bY8=; b=DFQpJueTRmSsJEPEX0eAlWZHXLp/UoaSVJ7XythtjTqjZ3prS24GgXoY1cIFDVzLjK nomoO512VSG5BTjixpHXsL2xEgKvsh+iD1GR0G87YtnyqTbYEbORpEMOimA6vx2SQZLF qBXXtQrIRADm8LioVXLgwcMu2W1U0oYUnnS3rVpwXQeN8x5z+/KsALFHF/6x3Ui2ah3A V/f29/d1B2XLyPLqO63XiTy8N3arWEOkDeTb0K5cFPvE0cX7XXE8E5sO4gwp8/mMpr43 14o1DZuBjD0SM1mCyP8WcUeIXaDl2NmR2SbbCR82fGW8i1r+MHDkqh4FM5DRyPsauh0X /Cjg== X-Gm-Message-State: AOAM5339mXM7f6PnJiHObu54jo23qahCWOHGIOFFnFlm8otWk214X2GW s8u4UU3ZeAWcjwI91XwSJwn4kbLvPTs= X-Received: by 2002:a05:620a:2058:: with SMTP id d24mr3495868qka.469.1618841476023; Mon, 19 Apr 2021 07:11:16 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:15 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:08 -0300 Message-Id: <20210419141024.8174-12-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 11/87] avcodec: Remove unneeded getters and setters 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: bs8Gsxrl7eam From: Andreas Rheinhardt Deprecated in c4131a0613c4b2c30c01b2550b41068815d27799. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 39 --------------------------------------- libavcodec/utils.c | 18 ------------------ libavcodec/version.h | 3 --- 3 files changed, 60 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 696025ceda..612135dba5 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2221,47 +2221,8 @@ typedef struct AVCodecContext { int (*get_encode_buffer)(struct AVCodecContext *s, AVPacket *pkt, int flags); } AVCodecContext; -#if FF_API_CODEC_GET_SET -/** - * Accessors for some AVCodecContext fields. These used to be provided for ABI - * compatibility, and do not need to be used anymore. - */ -attribute_deprecated -AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx); -attribute_deprecated -void av_codec_set_pkt_timebase (AVCodecContext *avctx, AVRational val); - -attribute_deprecated -const AVCodecDescriptor *av_codec_get_codec_descriptor(const AVCodecContext *avctx); -attribute_deprecated -void av_codec_set_codec_descriptor(AVCodecContext *avctx, const AVCodecDescriptor *desc); - -attribute_deprecated -unsigned av_codec_get_codec_properties(const AVCodecContext *avctx); - -attribute_deprecated -int av_codec_get_lowres(const AVCodecContext *avctx); -attribute_deprecated -void av_codec_set_lowres(AVCodecContext *avctx, int val); - -attribute_deprecated -int av_codec_get_seek_preroll(const AVCodecContext *avctx); -attribute_deprecated -void av_codec_set_seek_preroll(AVCodecContext *avctx, int val); - -attribute_deprecated -uint16_t *av_codec_get_chroma_intra_matrix(const AVCodecContext *avctx); -attribute_deprecated -void av_codec_set_chroma_intra_matrix(AVCodecContext *avctx, uint16_t *val); -#endif - struct AVSubtitle; -#if FF_API_CODEC_GET_SET -attribute_deprecated -int av_codec_get_max_lowres(const AVCodec *codec); -#endif - struct MpegEncContext; /** diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 896b99dc3f..25f69f59c6 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -429,24 +429,6 @@ enum AVPixelFormat avpriv_find_pix_fmt(const PixelFormatTag *tags, return AV_PIX_FMT_NONE; } -#if FF_API_CODEC_GET_SET -MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase) -MAKE_ACCESSORS(AVCodecContext, codec, const AVCodecDescriptor *, codec_descriptor) -MAKE_ACCESSORS(AVCodecContext, codec, int, lowres) -MAKE_ACCESSORS(AVCodecContext, codec, int, seek_preroll) -MAKE_ACCESSORS(AVCodecContext, codec, uint16_t*, chroma_intra_matrix) - -unsigned av_codec_get_codec_properties(const AVCodecContext *codec) -{ - return codec->properties; -} - -int av_codec_get_max_lowres(const AVCodec *codec) -{ - return codec->max_lowres; -} -#endif - int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec){ return !!(codec->caps_internal & FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM); } diff --git a/libavcodec/version.h b/libavcodec/version.h index 2cca9839e2..87d54a4357 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -87,9 +87,6 @@ #ifndef FF_API_GETCHROMA #define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_CODEC_GET_SET -#define FF_API_CODEC_GET_SET (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_USER_VISIBLE_AVHWACCEL #define FF_API_USER_VISIBLE_AVHWACCEL (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27067 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp569364iob; Mon, 19 Apr 2021 07:28:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybdWnOQ9k7mFyeV8ye0DNRJ7twVd73zoAkkthaSj+zRm4sR++aaJcUntEP9Y5y9L7HN9Ff X-Received: by 2002:a05:6402:145:: with SMTP id s5mr25900676edu.221.1618842480232; Mon, 19 Apr 2021 07:28:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842480; cv=none; d=google.com; s=arc-20160816; b=l7C8gXa5xZmb4IBkBAtYOLONuA9L8LeQxDT2iCGCrbfAwJH9e4zMauf4K5ujTLEt3S lN2l3kDa+Jj74y3FZvK4+tseiKE9S8O3DGVqghSQpmuMp7tPkA+EGhSw1r5+zIAyn5xR TPiRUSWplXoCMSdN+46MbeeX1eI+nsvoZ0QM7ABvH4sxLyGAx/O9MAy0hQw5T8kR5O1m uiQEifIXpZurBhU1o6VZpvReWphjAzmIcbnCp/SVqs+A9UFswDinoFd6b3nGmSi7qw7J 0vb+yGk4Rp9Wuc9CufFzg17GYZBnWVkXLIX6lP2W7WngkLqRMzEHc9LFN8jTQHsJf0dQ CcVA== 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=dBVlnVXRShiRkGl7zhH4KhlfpkCpYYugE2Eoz1reqFU=; b=u3+7NRdxdQshHLKSLcODJFF5kxkaiR9TkSbpadW8/eHc13zYtynUtjM9EvegnPE8Zp tg4SBy89psXuhJwke7yPBY08Cor6wrIq28wrgrfKmUSLQjifcmApjBpBF58IKM5wVM5V j2PcZsJ4xYScey71KEDmzIOpL9MIsKcAzJr9WRT26OiBDQ5KUFGs23CxOuDCevY5tUfU d5MLzQdqUNtBlSVam8ggRS3JLVJr2DI/fFf+Zkwfb1omzxOB7a1alXCtMEnvUWBv11m2 BdJhC9INS8i9QD0IMLHhYqFhLp3circZ3blBVd1SwXHh1au65xcXwP/A9F82O4pUIZTz RW9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Z0kMSmZn; 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 o6si8528788edr.244.2021.04.19.07.27.59; Mon, 19 Apr 2021 07:28:00 -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=Z0kMSmZn; 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 A54CC68A0E1; Mon, 19 Apr 2021 17:18:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C592D68A2B2 for ; Mon, 19 Apr 2021 17:18:25 +0300 (EEST) Received: by mail-qk1-f173.google.com with SMTP id d19so159736qkk.12 for ; Mon, 19 Apr 2021 07:18:25 -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=13yIhhMIdlcploWfhCY/8MIBgRO0cyJWckPp2VAn+qE=; b=Z0kMSmZn+3C6BderI1ZvAHe6tmxLLIKHacO5VZnSa2V90r6eYFsdW+sQRscLD0U62P bpvN7CFat6plxWKLDzgohifFLqTDXRAir6o1K5W9FQcr7P4+qTJHLfZOwGPZk11ykeIV zVSGUNo0dYFYxmTNNZ5j09cH8Cjo3yypkH2vva2LmLHDVtjrw4GbvErNFX3+1GPBQFq3 VJwEOcRW/yw4EXG5mKvIFscE4yX/cwWjaCrhW8GqtSVwp4OJwqhY2pgWCCWZsoq3s/0f phUOVQsKrGeu9LE3AHa4iweQ0PKsDVkbmQfrWQ4/cMuRhWocFL0DDEEty1CYMaKmmWyI b/NA== 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=13yIhhMIdlcploWfhCY/8MIBgRO0cyJWckPp2VAn+qE=; b=VkfQUzwOn/1SkVZTLhoEpyzmG+/EgNeNPoeQRUQPhNUp9e+KZ/jmNPlSQXipC5UviI 7zomDUuQqc6p6wPvhMC7mI9098rD//2IUz72Bf4X15GD7Eety5yazYwApQJt+BcxYjht o0KkqQfmt3CjjE9eP2LAKUkBDJq7lK1lGkMq+u1LTY8DT4Jixk/mqDaU/QVJGvk7usQY oEzFWmyw3F8fIKR5LLUHZCyP3T68Ozw9v1c3JbWfieTayGUKehfQnD8pM266ADJ+9mCA 1OfXZMaPKsfzZVLte+ffRUBwXXTpQr4O0JyTEkqKqbZx2LRKUA1xrOrYIXzy1GC7a7vA Vlag== X-Gm-Message-State: AOAM531dthoEl0XIXS0x2TFIFcjELCetJ4FTxUD+LlDFO2zE76VoAuxw x1nDTwNUxGuDWz0p+fhCTz6un4js9qc= X-Received: by 2002:a37:76c2:: with SMTP id r185mr11811702qkc.204.1618841477200; Mon, 19 Apr 2021 07:11:17 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:16 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:09 -0300 Message-Id: <20210419141024.8174-13-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 12/87] avcodec: Remove deprecated av_codec_get_tag_string 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: g1fDseOTVw7V From: Andreas Rheinhardt Deprecated in f156d35321bb600b2309b78185d600b2fa64d84a. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 16 ---------------- libavcodec/utils.c | 22 ---------------------- libavcodec/version.h | 3 --- 3 files changed, 41 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 612135dba5..0e86064ccb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3636,22 +3636,6 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const en * @} */ -#if FF_API_TAG_STRING -/** - * Put a string representing the codec tag codec_tag in buf. - * - * @param buf buffer to place codec tag in - * @param buf_size size in bytes of buf - * @param codec_tag codec tag to assign - * @return the length of the string that would have been generated if - * enough space had been available, excluding the trailing null - * - * @deprecated see av_fourcc_make_string() and av_fourcc2str(). - */ -attribute_deprecated -size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag); -#endif - void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode); /** diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 25f69f59c6..643ea003df 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -453,28 +453,6 @@ const char *avcodec_get_name(enum AVCodecID id) return "unknown_codec"; } -#if FF_API_TAG_STRING -size_t av_get_codec_tag_string(char *buf, size_t buf_size, unsigned int codec_tag) -{ - int i, len, ret = 0; - -#define TAG_PRINT(x) \ - (((x) >= '0' && (x) <= '9') || \ - ((x) >= 'a' && (x) <= 'z') || ((x) >= 'A' && (x) <= 'Z') || \ - ((x) == '.' || (x) == ' ' || (x) == '-' || (x) == '_')) - - for (i = 0; i < 4; i++) { - len = snprintf(buf, buf_size, - TAG_PRINT(codec_tag & 0xFF) ? "%c" : "[%d]", codec_tag & 0xFF); - buf += len; - buf_size = buf_size > len ? buf_size - len : 0; - ret += len; - codec_tag >>= 8; - } - return ret; -} -#endif - const char *av_get_profile_name(const AVCodec *codec, int profile) { const AVProfile *p; diff --git a/libavcodec/version.h b/libavcodec/version.h index 87d54a4357..6d0f0f1d25 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -81,9 +81,6 @@ #ifndef FF_API_STRUCT_VAAPI_CONTEXT #define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_TAG_STRING -#define FF_API_TAG_STRING (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_GETCHROMA #define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27068 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp568511iob; Mon, 19 Apr 2021 07:26:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1a5MejBeYGMy6oYLm/TowafrkF/RJfVj+8DG3kmQQXxgGj6TN1fnqzgcF0lW1lJ2yFS5G X-Received: by 2002:a05:6402:2552:: with SMTP id l18mr25628628edb.71.1618842410841; Mon, 19 Apr 2021 07:26:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842410; cv=none; d=google.com; s=arc-20160816; b=Opz3zBXs9i6HuopId9LDy9BjRrW9LWKRFkNF5s77cPkgYixXP92w0tRLC8HDIqbCq1 XNs0gV87l8Y99iVMP7Abe5RzQ6KAXDQ8Z6g5aDbNmxy+rrcYGFR5UeDCIl68V+K0Fjpg L3cSzyhMjZeNWY6LqPM9cu5ApWCksXP7Ybi8Sgb3c4KlLIgMHvUZ1L9E8C+CZVnthkwS vCO+Gqk2VyrY0pNDHCH5c63pzghdCCGPwxg0zJDwJFhCn8Y1ykeRnjg8vLwbRsu8+4Bs s8yamFqP4AjgyPSvAHqSYzuA+LjrvUqtJHnK2WBZ/Kr6bhgjTr1AxSGtuooqnNx+1MH9 5whg== 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=sebe6Vc2nLU32qBwpYLgCGBPjUH857MP2/jaPXkeWAY=; b=qJmYzVokGEBd9SBNHIz7XSLWOsWyhZctIE3bNenYZfm8tmSBYLi3P9QNYN8Bz/ggL1 TXhMMySX4EO7tt3v9xBenqTV0j+TK4rFnlOr/vPOpMmhQ+uc/aUvVLQzGxnDylGLcXBz lPdA6Tkji47qZCzmOWLmrNOvrc/MA/TlnLoluwMZhp5XsKXCkvWnvphpxypiybyD6+4z b1XDL7T3oockIY/GA4ixQpF7252/x5HDqZmN4dUhEDKkjFKCjxwjNnmlHeAjJ/x4iLEK pfl5WaZ52RsrHfshYynNYYjrRGDcYKApIw+JTZrYed0UBwLoOc6n/Nsgam/upcEevA3H uywg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=taYQKskm; 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 y25si9453005ejb.256.2021.04.19.07.26.50; Mon, 19 Apr 2021 07:26:50 -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=taYQKskm; 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 5BB4068A177; Mon, 19 Apr 2021 17:17:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F18168A0DE for ; Mon, 19 Apr 2021 17:17:06 +0300 (EEST) Received: by mail-qt1-f175.google.com with SMTP id 18so12731778qtz.6 for ; Mon, 19 Apr 2021 07:17:06 -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=+PG0sBq3IgNP4FwcEG6JcpGFnQmyHFBlAAlJaus5nJU=; b=taYQKskmeX0/vQnxOPMsbQSYPtExRmB7DzLHuSdk1jahoVYmBlh/JS6t4BDGmXyVAk 1LnXJ3624Z3YdFNMQu0ly5HZJJddztWzzstqZ+Q0utSudMy5Ez5uzD3sQt28cebZXIKH M6q8Zce5YGkOSaezvHgj6kTV7TP6hMfOJQLy2buzgP5JIvMZNcrri4sV5OgrN2xuSRG/ 2nvhpHRRP2S44XWMIk46L2IBt5QWu/HjwkChypWJhqLSr1hth58/Yi8v8y7W+31W8l1/ BMpeuPeViLPTZsRIpdpumFAZs4uEZfE9OkPHB7GH6OzDRLBjgNirRs0yYLXxKoSoBYPo a5nQ== 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=+PG0sBq3IgNP4FwcEG6JcpGFnQmyHFBlAAlJaus5nJU=; b=Uyu+nwmHKwOW3PKYFoVwZ5KvuvN58t0RCJu9h3TRtAtV7mEiNlsuLVU1niLL5CDxnU AVnoBsBdAMoBxuR84UsJGrBOf0uh38TGdc0j3s4iX6C4H5IM3oglsGPPmh9k+qlHKH0S pq2K9s9Pqorx8I0wE5KZb4WNVbq6dHhGrkTmG7KTQOKxaIHzF1wBku1HRlIdcZ+cMzFm ZvjYpN/+PJt4rH7hZJREd8tFvhrPrK/3q/NsyaK9VXvGaRUTDBmc4GZT08PGQPzANFua Ek9/r8zXPi8FD6yYKhA2+WqkImsy2IWt94XKa9DYgVWllEk2UDle8AENEyxyn+Xbx+mj c74A== X-Gm-Message-State: AOAM533KtWIuj5Cx8/XQ/Ju0bXG7nDGlc4NgS6ZjyJro7CYEj81/Oo0a x1ElaExWqToWNAdU0SOOyznDXCbANn8= X-Received: by 2002:a05:620a:13ca:: with SMTP id g10mr11748113qkl.380.1618841478285; Mon, 19 Apr 2021 07:11:18 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:18 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:10 -0300 Message-Id: <20210419141024.8174-14-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 13/87] avcodec: Remove lock manager 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: broGEAVjbL/b From: Andreas Rheinhardt Deprecated in a04c2c707de2ce850f79870e84ac9d7ec7aa9143. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 7 ------- libavcodec/avcodec.h | 43 ------------------------------------------- libavcodec/version.h | 3 --- 3 files changed, 53 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 760a98d8ef..8e91350d67 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -102,13 +102,6 @@ static void unlock_avcodec(const AVCodec *codec) ff_mutex_unlock(&codec_mutex); } -#if FF_API_LOCKMGR -int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)) -{ - return 0; -} -#endif - static int64_t get_bit_rate(AVCodecContext *ctx) { int64_t bit_rate; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0e86064ccb..7c6f5c1fc0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3799,49 +3799,6 @@ attribute_deprecated AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel); #endif -#if FF_API_LOCKMGR -/** - * Lock operation used by lockmgr - * - * @deprecated Deprecated together with av_lockmgr_register(). - */ -enum AVLockOp { - AV_LOCK_CREATE, ///< Create a mutex - AV_LOCK_OBTAIN, ///< Lock the mutex - AV_LOCK_RELEASE, ///< Unlock the mutex - AV_LOCK_DESTROY, ///< Free mutex resources -}; - -/** - * Register a user provided lock manager supporting the operations - * specified by AVLockOp. The "mutex" argument to the function points - * to a (void *) where the lockmgr should store/get a pointer to a user - * allocated mutex. It is NULL upon AV_LOCK_CREATE and equal to the - * value left by the last call for all other ops. If the lock manager is - * unable to perform the op then it should leave the mutex in the same - * state as when it was called and return a non-zero value. However, - * when called with AV_LOCK_DESTROY the mutex will always be assumed to - * have been successfully destroyed. If av_lockmgr_register succeeds - * it will return a non-negative value, if it fails it will return a - * negative value and destroy all mutex and unregister all callbacks. - * av_lockmgr_register is not thread-safe, it must be called from a - * single thread before any calls which make use of locking are used. - * - * @param cb User defined callback. av_lockmgr_register invokes calls - * to this callback and the previously registered callback. - * The callback will be used to create more than one mutex - * each of which must be backed by its own underlying locking - * mechanism (i.e. do not use a single static object to - * implement your lock manager). If cb is set to NULL the - * lockmgr will be unregistered. - * - * @deprecated This function does nothing, and always returns 0. Be sure to - * build with thread support to get basic thread safety. - */ -attribute_deprecated -int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op)); -#endif - /** * @return a positive value if s is open (i.e. avcodec_open2() was called on it * with no corresponding avcodec_close()), 0 otherwise. diff --git a/libavcodec/version.h b/libavcodec/version.h index 6d0f0f1d25..c743d2a05c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -87,9 +87,6 @@ #ifndef FF_API_USER_VISIBLE_AVHWACCEL #define FF_API_USER_VISIBLE_AVHWACCEL (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_LOCKMGR -#define FF_API_LOCKMGR (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_UNSANITIZED_BITRATES #define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27020 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp555663iob; Mon, 19 Apr 2021 07:11:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0y7PQhqgWUytbTkWjibxWBkTob9lXsnLsvpSC96YZoOaYtiy06ORrgKnk55XVCPfl8fSA X-Received: by 2002:adf:ffc3:: with SMTP id x3mr14962117wrs.263.1618841501659; Mon, 19 Apr 2021 07:11:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841501; cv=none; d=google.com; s=arc-20160816; b=Oyq94Y58gQqZekAlZh+csQaJe5V6hcaamAZQhXi5WUtBPZPKjd/7UceQs/x+JoOGO0 hCGBsHSkuKATVaqqhX+zAWjy8kgNqyGAbVJh05/g/24lbdC/R6FWWiJrgeLBCXNj/RDb g7FU1QALA12+VrsCaaVzgCCe3CD5WTkE/x5WUq5W53bbbQk8awS8vedCw0t9Li9L/7BQ wWya1HjZOblBLWTO1AD+9H0GJ5Kh/HG+DXHVR8rV8+4fnrRH1eksTbzpeXvAe+g4OCNY uYSROXBVjRd/12xD8Z1GTJ+evSw0d1MJ3+ZEARIb0CuJzNbkfbwIg5K92hjo4Z82YhTm Qg6Q== 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=PYAepqVW4qVYpeXs+qvnmkGVPnfzO21DE5Efm6Lz9SI=; b=iCLp5KYNSBgAfdD6gMfhVUqAjTCMbx+J684qCz7CGtq2wqTt1RiYO3fDlbJoSwuRHc otjw8KQWLa5/fCTZ/I/g5YoFSwMfI6J+skAXsdArFbhgHGVejQLJG5t0v8CPn5pqJGRe YfCSxKWXFTpqKo8WS1Owz4v4GeFEP5W6BJug3scXo6NP3YqzduxkyCJ8Gca1XcFJEwp9 qnioxLVZuNg07iFx/T08MxJIpOBlS8nHmQyIoJ8vNp5K0t4vWebYEpPmKKw5KeVVUl0r WgpSYFApd+P7BdjAb0bLs33lr44i6/kzVoYsDXkIPKWGKv/xZ/Z2w8II+jj6CThKXbc7 +j3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EO1kVEdg; 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 p25si12624840ejc.571.2021.04.19.07.11.41; Mon, 19 Apr 2021 07:11:41 -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=EO1kVEdg; 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 070116806F8; Mon, 19 Apr 2021 17:11:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B70B8680271 for ; Mon, 19 Apr 2021 17:11:20 +0300 (EEST) Received: by mail-qk1-f176.google.com with SMTP id d19so132884qkk.12 for ; Mon, 19 Apr 2021 07:11:20 -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=UJUQ1FatloYwJNPBlOR0eMlZlyttJwi4w5DlFzg9g4M=; b=EO1kVEdgzyZW+C1Gtt6TrKqt/HJejfSEpQUCeXffc7q7c1d9+pkRER13p2nLHAtOnb r1NzUqyV6AqXbFzsEDBFbXtXDJA3HgujG0dQut4UposhMkSqmj/2UoUPYDAMtZyb72fX 8pCkRzFOVLjp9croZdKj78Obf5RsxMLRT6qJ07XaFs9O2kPk8NwHS88YsPOkE9lygW9Y 4EUOB5GKZdCX0rxeLCkPCd1L0VaP0WjXOYoUu60DYWHvGIdwfAxueYB0vXhID7r5Adsi Dcr0CSS6Y2HSVXSn5Oh2klN1470BnJO1ogDinYAmUtr5QMKR1AOStLoFcH96lLpscEu9 EvIA== 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=UJUQ1FatloYwJNPBlOR0eMlZlyttJwi4w5DlFzg9g4M=; b=t5cJdLVb82cENv4KiWoLRDyiZ7X5Q/J8mQz0oDGj6AI4zLkWYlowBbQnoqTLs2uLGE 5Zm3wu2avk0ZDzMSUwOGluj9haLR+MqKr2NrSphIBn5GCMLT4y3J2OpP733VNl1mctC8 EU+O5TdNvaR+LDHl4rZ9ZMRlF+pO4YsizV/3AZLRpK2ikdYu1IpnDl6te/J9/OQmvetc tKXGuPeyP6VQRZ2vw28JTCX2VbEReXUvBTtx1nICRaIUa09Zdgezckt/SlExKaevkSz6 4isDPjXVAa6O9cTHzAjtDw1KbM+l0nGBDPPu3TwrgKqrr4KQNIxgYptIHdCHEya9EjRM 924Q== X-Gm-Message-State: AOAM532UQ+DHOcVtRsdlf2KYxQWd3wgLJaMhv2SfQpYFHP8+n6LJW7g3 O4P3an2KreoC0HAlNybCTPg77a1jjnY= X-Received: by 2002:a05:620a:1522:: with SMTP id n2mr6457616qkk.298.1618841479402; Mon, 19 Apr 2021 07:11:19 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:19 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:11 -0300 Message-Id: <20210419141024.8174-15-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 14/87] avcodec: Remove remnants of user-visiable HW acceleration 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: iDM/o/WkFP6h From: Andreas Rheinhardt Disabled and deprecated in 3536a3efb9fde88d34d526a51b1080247326cd6e. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 21 --------------------- libavcodec/utils.c | 11 ----------- libavcodec/version.h | 3 --- 3 files changed, 35 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7c6f5c1fc0..ff684d17e1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3778,27 +3778,6 @@ void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size); */ unsigned int av_xiphlacing(unsigned char *s, unsigned int v); -#if FF_API_USER_VISIBLE_AVHWACCEL -/** - * Register the hardware accelerator hwaccel. - * - * @deprecated This function doesn't do anything. - */ -attribute_deprecated -void av_register_hwaccel(AVHWAccel *hwaccel); - -/** - * If hwaccel is NULL, returns the first registered hardware accelerator, - * if hwaccel is non-NULL, returns the next registered hardware accelerator - * after hwaccel, or NULL if hwaccel is the last one. - * - * @deprecated AVHWaccel structures contain no user-serviceable parts, so - * this function should not be used. - */ -attribute_deprecated -AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel); -#endif - /** * @return a positive value if s is open (i.e. avcodec_open2() was called on it * with no corresponding avcodec_close()), 0 otherwise. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 643ea003df..0cc3a797f8 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -841,17 +841,6 @@ const AVCodecHWConfig *avcodec_get_hw_config(const AVCodec *codec, int index) return &codec->hw_configs[index]->public; } -#if FF_API_USER_VISIBLE_AVHWACCEL -AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel) -{ - return NULL; -} - -void av_register_hwaccel(AVHWAccel *hwaccel) -{ -} -#endif - unsigned int avpriv_toupper4(unsigned int x) { return av_toupper(x & 0xFF) + diff --git a/libavcodec/version.h b/libavcodec/version.h index c743d2a05c..590a8d6f4e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -84,9 +84,6 @@ #ifndef FF_API_GETCHROMA #define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_USER_VISIBLE_AVHWACCEL -#define FF_API_USER_VISIBLE_AVHWACCEL (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_UNSANITIZED_BITRATES #define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27018 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp555808iob; Mon, 19 Apr 2021 07:11:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpKfYjtfDo+JknmPp8TlnPpXj3ytXUhfhqZnhBnweki7pMHnhwe4qALFt2VGu6OwDsHcEV X-Received: by 2002:a17:906:6d50:: with SMTP id a16mr16299768ejt.31.1618841512520; Mon, 19 Apr 2021 07:11:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841512; cv=none; d=google.com; s=arc-20160816; b=LbcfpW0K5BxTyoT3xsF07qI6/8umzOwo0PR2hhmvTv8tVkN5SwrkNJKmQevmmzgTQZ VI1u15HWTlKmtvFnpw2/hP/L6D/PX/j2MB8BUww6lm8Kpa9bRCVEhWl2IJTiSlaUMmd6 2WXiRlnM8BuK268pwRhvir/QeUanbDQj8YxLSrr70pWgJ9ZvveyLqU9PUB36tNr4fZ6j 67V9UONVRXaSvbLnu8jVNF5ctNq4qNigLICeiJ9ykYyfjlph0ohQkb2CW/YUhxnCXl91 A1ULVmBKInumeXjeA4UCHVdOTFZuiHcXRx8XzDdmpCDPPxVoOpU7AAjZoZTPp2r0H3xn fZTw== 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=4NG9DGOMdvJqLZncDP2XAk6RsENKHRzKHJAJ2Bor6ts=; b=qSmIhHvGdZ5VgUZn7vvD7F9lUhpL/sGaz/J0gK3T1AyCWIYYz4jHtx46hJCyJkhb4+ IPW4Clzg7kwkxRGlKZ60UfqxJOkFRQLjvBAnMx2zsN9mLI+rW0XhhEC5LQYEfdPtRPmr Y+W7ZUh+RYVuNGuU2FOqeqcwWvngD+DpYcf+l4WwzCSFIj/hgwMTMWllVm9xwHOLr2Z8 rdT2xjfjO1MRTOUVpL0TQgb/wjPMF2M6tbFU02kJvB9uNKF2InfzNv9IE0IjQ46Q0vML sz5glAIHt9SgAZi014MZ4KoCqPLbaN+eKqKTaPrjuHCLVKc1l/+71JPmFFJdhC4WtaXW q1Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=BFrceeRK; 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 h12si10852222ejc.210.2021.04.19.07.11.51; Mon, 19 Apr 2021 07:11:52 -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=BFrceeRK; 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 14726680967; Mon, 19 Apr 2021 17:11:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA345680742 for ; Mon, 19 Apr 2021 17:11:21 +0300 (EEST) Received: by mail-qk1-f169.google.com with SMTP id d19so132946qkk.12 for ; Mon, 19 Apr 2021 07:11:21 -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=TFyYbx6lDJ2YroaCm4ixzzMRRWWmgmiGadOHf5JY+OQ=; b=BFrceeRKou4sjldT+dhJhPpnVPhuhNADbQq9R41NP0Ma5khpRsBxg80d5/b8DSIkfF PshBlmYIciYTBvJ/xe+YlEsoOcuvnfoxpg08VZIEfV2KYMlskizjPI1ZZT+fM0nqMyep 78p6iW8UHZr/HAn6OZJ6ja63RxSUvXLPnVEI3eet2w4qKmB8ofjpNqqhVf8Iw95pLIuA g29iNx6Qr2nx/zHjnG9k0FdVQW/QFvPaotSw+5PTq+mSnf2k3wRmtYv+hx8zu+kmydd/ +zlUDSAqUSk/At4slWH8TnWNxThFNEIM27gYG6yukiNqTfGB957zRaegoFeR8WXUoeHG khuQ== 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=TFyYbx6lDJ2YroaCm4ixzzMRRWWmgmiGadOHf5JY+OQ=; b=D775plvX1YgJlKcW2qaR1WEG/QZx4Gjn9buMexBpWRsYqat2W+Lvvs+ZbFJNiomUmE 730ZuavhyQOQf63oJpZy7GSKyAkkpb++ioX+kKlJZPNpdQyBbztPah1borUgLHJoSfAs w0Uvh8oFISi13AuBzlP0Ff0OhUI12fjG7aUbjUuk6WLsiYdynbZeMCqOO6Jd+StQvh6e Vj7lc4cwQX6/t1nEPqF67iFvWkSCBBEsN84cAbXAOuu/UMEN8cBoruroZXIM3Iv7KV9X f8SaxEJeDmX46ZguGE/A20YvMX0Z9e7Cz+1/tYmgpnOgTnz9OevO/NKnPMXP8tJmnl7N 43Ug== X-Gm-Message-State: AOAM532ZW3k/ElUCYGUZs/G7xEoVq0Jm4nnt7/REcqVogOYF2gSbKlZj 7stVLfnNsddqOJfOKj+RjUdUNbPxuO0= X-Received: by 2002:a37:492:: with SMTP id 140mr4232288qke.161.1618841480488; Mon, 19 Apr 2021 07:11:20 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:20 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:12 -0300 Message-Id: <20210419141024.8174-16-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 15/87] avcodec: Remove deprecated avcodec_get_chroma_sub_sample 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: DBD2F0WzxyHG From: Andreas Rheinhardt Effectively deprecated in 2c800eb7375c65ffd56164b03bb035bdb3f1e172. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 9 --------- libavcodec/imgconvert.c | 11 ----------- libavcodec/version.h | 3 --- 3 files changed, 23 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ff684d17e1..69f69a1aa4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3574,15 +3574,6 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, * @{ */ -#if FF_API_GETCHROMA -/** - * @deprecated Use av_pix_fmt_get_chroma_sub_sample - */ - -attribute_deprecated -void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift); -#endif - /** * Return a value representing the fourCC code associated to the * pixel format pix_fmt, or 0 if no associated fourCC code can be diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 8de1563404..a3443d1c72 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -27,23 +27,12 @@ #include "avcodec.h" #include "internal.h" #include "mathops.h" -#include "libavutil/avassert.h" #include "libavutil/colorspace.h" #include "libavutil/common.h" #include "libavutil/pixdesc.h" #include "libavutil/internal.h" #include "libavutil/imgutils.h" -#if FF_API_GETCHROMA -void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift) -{ - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); - av_assert0(desc); - *h_shift = desc->log2_chroma_w; - *v_shift = desc->log2_chroma_h; -} -#endif - #if FF_API_AVCODEC_PIX_FMT int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt, diff --git a/libavcodec/version.h b/libavcodec/version.h index 590a8d6f4e..0e9c92a9f2 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -81,9 +81,6 @@ #ifndef FF_API_STRUCT_VAAPI_CONTEXT #define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_GETCHROMA -#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_UNSANITIZED_BITRATES #define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27015 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp555997iob; Mon, 19 Apr 2021 07:12:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSH/8aolBbAi1qSQ8cJQKgWrsWWXmiMFjWBu5N8aedVubGdyIgjqtDuwMOisM0JAdAzDR1 X-Received: by 2002:a17:907:3f08:: with SMTP id hq8mr22717990ejc.90.1618841522969; Mon, 19 Apr 2021 07:12:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841522; cv=none; d=google.com; s=arc-20160816; b=r88p9cJKXrTvRfym5XE7/AtFj30qQe/k3xyS9aDISgGVQT3nyQ3GwelqRDffbcHgvV 42iQ4RpKf3lTzdQTDiXErvWp6/XgLJ4PMOs3QaQt7vKN69w0++N3xINEziQRfoVaBCIX Se3tABzsIBW4YkQxQvjOwEyzrIFf/56PZB3QCk3ZRRYzwfkLmpoVJl8W44HQcTp8i6/4 onSlqA02xKATOZ1JBo/KebC1W/lsuSZ5hucsjLVWSFTHe2WTnXbkG5fy5Qt1NaYfsBZd 3suwsKKvafCKgPonRiCCUg57Ff1AbmN5G1PorSTHo9ZhukddPoba5MQWTVXl0GMVCVOq RdtA== 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=/VsKwdVJm4TF/YrD6bXkbMjY+QdI8wSCX+RxKw2Aprg=; b=FABxo4jSsPbkV+kU3j7P3MTEdZmoK94/rK4V3hRdaYPRhkgyxTlL/LU777lWa/oW5F haDEZCPlvvDUnXaym0nINh48dgqtNN2rIP9Iaf3PUCnGetzlPm8zmbIJfcKMxOrtHxpR 9ItpWYdkMNttNt92uPG+8vxwP96TuSMlheVW4BLl6RZFCIczi65ssRJz3De8xEN1wTti 7+YyVu2o4FHGoN4Sx9W97n6fWJ9nZR/Xy1pXFzgVj9NjbHtL4scdSlAUNHaGGNLAGDHj nj8JSW1K31aaK/7BmkeLV5QuXe8OhsP0lQUIVJGbpvEg/kNwRuvEGzk6UElm4fd6gvNH 2CXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=di+1ers7; 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 z13si12773531edd.128.2021.04.19.07.12.02; Mon, 19 Apr 2021 07:12:02 -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=di+1ers7; 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 13A1A680745; Mon, 19 Apr 2021 17:11:25 +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 ED0B4680271 for ; Mon, 19 Apr 2021 17:11:22 +0300 (EEST) Received: by mail-qk1-f180.google.com with SMTP id v7so7769369qkj.13 for ; Mon, 19 Apr 2021 07:11:22 -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=yXx0+JsBIYAKH844l9UwQ481DfoqxOCnPdyviey0/Do=; b=di+1ers7CsAXlduKBJ1SRb1M7yY2nelbwc6TfnTpvBGFG4FnDhv1/rqXA81jRTPUsI MLR8jHODQUnCX0xGr9tHBzGEghjmtI320olRV+FD+twcwarCUWNSOanhLprmWn6EWdTj E3MewqNnWkEex118azhhGZN7cNrdf8jSjCeN5MkARUU/punBCwSaVB9wKJPYKfZcDsxF KOb8llU+JjmJioiW/kUdlr2h8RjrDcnDJkzdaSwwjraZBB3sbNt9JI70Q3u8BoiGnwNl wXf3/RqdkWT2pW5YZl2QoZDXQnsI4ERfUbqZnGfE+t9WHEkyM1pDuYT/YDrC4SciZZ+H ldyw== 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=yXx0+JsBIYAKH844l9UwQ481DfoqxOCnPdyviey0/Do=; b=Sc1ZG6j4Qh5RbLahAwibNXMXD7OFAxjFZPEoJs/5dn9oryInhS3FQ2EG/KYs/9g9vE 1VvyVRBHEcspvnBrbNJ698ixa52y4g5nVznbowtTyQW4KgJmb2S5aY6oqRjFnSFmSdJD 4AlUlbJnbg3FMl9/OYuq34ffX3B2Zx/4R+aNpko2x7mEcM3Xkz0kuyVVjsAWHj8t7Gn9 XzCTTUlt0cWO2XOH1TQsi5In2kPV50NhGoCvNdGdtSC1NajBdggSAA0QDhp/ps3k3TmD A3p8RKnCHQAS0wOrMoYd2Gj9L8szvQdSpQCeij3IXWGbjRwBMh9sqkHi5r3zWfQJSE/I s94w== X-Gm-Message-State: AOAM5302OxVkxwtWjylLcUI+EhwFGQV3h6nJGyEy21CRtuOoOfW1paos g9RNsqDzmywcmk22ZWYRA2i77lDmKXs= X-Received: by 2002:a05:620a:1093:: with SMTP id g19mr12409979qkk.112.1618841481598; Mon, 19 Apr 2021 07:11:21 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:13 -0300 Message-Id: <20210419141024.8174-17-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 16/87] avcodec/bitstream: Remove avpriv PutBits API functions 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: kCY1aeGqXtTb From: Andreas Rheinhardt Scheduled for removal in 717503f7166d7032e32b935f2819d450524125d1. Also remove PutBitContext.size_in_bits which has been scheduled for removal in e7cbbd90267de2a0ad1b5fa8ccb29ab7bf8a26b8. Signed-off-by: Andreas Rheinhardt --- libavcodec/bitstream.c | 11 ----------- libavcodec/put_bits.h | 10 ---------- libavcodec/version.h | 3 --- 3 files changed, 24 deletions(-) diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index e425ffdc96..f0488cafd4 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -45,17 +45,6 @@ const uint8_t ff_log2_run[41]={ 24, }; -#if FF_API_AVPRIV_PUT_BITS -void avpriv_align_put_bits(PutBitContext *s) -{ - align_put_bits(s); -} -void avpriv_copy_bits(PutBitContext *pb, const uint8_t *src, int length) -{ - ff_copy_bits(pb, src, length); -} -#endif - void ff_put_string(PutBitContext *pb, const char *string, int terminate_string) { while (*string) { diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index 15c2650724..689c6b282e 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -33,8 +33,6 @@ #include "libavutil/intreadwrite.h" #include "libavutil/avassert.h" -#include "version.h" - #if ARCH_X86_64 // TODO: Benchmark and optionally enable on other 64-bit architectures. typedef uint64_t BitBuf; @@ -52,9 +50,6 @@ typedef struct PutBitContext { BitBuf bit_buf; int bit_left; uint8_t *buf, *buf_ptr, *buf_end; -#if LIBAVCODEC_VERSION_MAJOR < 59 - int size_in_bits; -#endif } PutBitContext; /** @@ -177,11 +172,6 @@ static inline void flush_put_bits_le(PutBitContext *s) s->bit_buf = 0; } -#if FF_API_AVPRIV_PUT_BITS -void avpriv_align_put_bits(PutBitContext *s); -void avpriv_copy_bits(PutBitContext *pb, const uint8_t *src, int length); -#endif - #ifdef BITSTREAM_WRITER_LE #define ff_put_string ff_put_string_unsupported_here #define ff_copy_bits ff_copy_bits_unsupported_here diff --git a/libavcodec/version.h b/libavcodec/version.h index 0e9c92a9f2..fbdc99abca 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -93,9 +93,6 @@ #ifndef FF_API_UNUSED_CODEC_CAPS #define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_AVPRIV_PUT_BITS -#define FF_API_AVPRIV_PUT_BITS (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OLD_ENCDEC #define FF_API_OLD_ENCDEC (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27027 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp556162iob; Mon, 19 Apr 2021 07:12:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEEwpnDM1BWTI3qDwWqaLsei8YVfZClR1z8Y59I+mXy4TTKkg9lU+uV5xypMskRuXh6t5v X-Received: by 2002:a17:906:7206:: with SMTP id m6mr22431712ejk.281.1618841534392; Mon, 19 Apr 2021 07:12:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841534; cv=none; d=google.com; s=arc-20160816; b=ZsaG4BJ5sV+owT5KqFzgB0kuQP/ID0GvFPy1M67s8CDDjYPxBMkssc4/xg/h+JG/nA X12XoIxRg2cZu826Xq9KA+rQF4Get+aqz29VJm/RhuyMppSo7nZmWafwIJhXd6YJ7Qmv Xhb86JY7dUPfMScvQuddhBnTMxNE8C2UiG0kN0mrhto0Ebbghy6GI7A2rSl2g7O6cx1/ V9BNzaGmqRcQB7yeGgNsNm10avKDZOyRKl4jfFPvM++O8J91T74e9VivzelWCRkfByUC jOwPoXkNMPCiCmVobNNXhYpjJerYA6HSTBNiLCricK1XqkJN+tdE3AYqGSKPwoCUguK1 i3Qg== 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=KTBA4Gu5kY5vPciHuHla5L8XkrsBdZ2MfmRbAOIOgsg=; b=vcmq6ke26aXmjWUsKuGJflHl8qvJyLRzQ21kdrr8+9e1tgKnN8h6fliKNXbzn3INlF OaCqFHYE7GzEDtArixrVPp/fF66xbmLx8i5kKUxhuabj8PRnhECjOyZr+mjuVqaOHNy5 A+hhIMP5f9MFOaL3UeTJquGn1VUufOIO8mUpK53iord0gFlbIBE8wN1yWFcSn6nnkZga LGFvm3b3pkI8bnZ5sCWGMVjny/gPqa31FkJrvHyC6EHMFC1pJVTibJQN5ZUB9byx2xo4 0kjgaasBljAZdbv2si8RuiLoP3H/7LXV4jETgg4FuJ8qWb1lZAfGrV2PBvJHScjgkErL topA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OOY58guY; 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 zm10si12656895ejb.623.2021.04.19.07.12.14; Mon, 19 Apr 2021 07:12:14 -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=OOY58guY; 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 0C0006809E9; Mon, 19 Apr 2021 17:11:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 108AF6808CC for ; Mon, 19 Apr 2021 17:11:24 +0300 (EEST) Received: by mail-qk1-f169.google.com with SMTP id q136so14895645qka.7 for ; Mon, 19 Apr 2021 07:11:23 -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=KADQrsRgdayZ56R8MUVdN/6K2b/ja3FQxM9wj1t6dxs=; b=OOY58guY+oi6SZKNvRQRxgm9JF70KpXC907W+HTPTnkt0iHg6l+d5/xT6gWJ9JjcoW tguPLX4QM0HYiZJiXENe6J8wHJLqeqMQJBv9nk2x9FplOFLXK/xoVB59TkExNmnHy9EQ t6uiEg9IMhhrxHap0CpOHzurMWES/pw7ueQWvgiGEHqQlwWQWHB4ohUEVbWm6AZQIrrA JQnkyXQXJ6DKlfyjpZhn1ldsCse+1LyEedAW2h6A0VhgPu8CQVcZhOAFS6kAlTQ89rj2 dCUbIZLMy3GhpbXjmTS0eGZIUF9Dl33pmhwCMeDZG519wrmLyIYnJ0Glq35Ke6tq9Wzy STiQ== 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=KADQrsRgdayZ56R8MUVdN/6K2b/ja3FQxM9wj1t6dxs=; b=I8S6dclpYKgMzHzOtC654T11IT03kqTmKEcGOYfcX9F0iF9xYD922ILbek87ipTGLH j4zHXVA7K76L7+CLGVFDsH/IlvrovFiiI/wmzJZUI1U+A/oU8nJjhT7RyJ4WzSRrPXEB zY2hhc7AXnVwvXv9SAb+btAQKaj2UpOoayReL+cb4Na08LDhZg/KvKRfWoc6NLOc5Dcd zbLjsRvMMlcm7tqq/ekrBtYeVKz6kKc3mx1P9KT3F0fu/SsAjUR339hzJ9TYhHfp3vld LiCgeVijg/Ww+ua1qmcgcluZxc2YX3qT5WmQsDxRE7oxGgKHlHfMaRLAYo6yAFkOoaFh jGFA== X-Gm-Message-State: AOAM530vLtYR9YxA6orEuT0NC74rAfmuQL8UV789vSsToDvdFcZp28tz QHmcIc33IgAjOGwDl2pVht+ZekdEP0Y= X-Received: by 2002:a05:620a:8dd:: with SMTP id z29mr12196167qkz.84.1618841482693; Mon, 19 Apr 2021 07:11:22 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:22 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:14 -0300 Message-Id: <20210419141024.8174-18-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 17/87] avcodec/mpeg4audio: Remove avpriv_mpeg4audio_get_config 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: tdX0ACEMSJus From: Andreas Rheinhardt Superseded by avpriv_mpeg4audio_get_config2. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4audio.c | 18 ------------------ libavcodec/mpeg4audio.h | 13 ------------- 2 files changed, 31 deletions(-) diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index 2286303b54..be50de9052 100644 --- a/libavcodec/mpeg4audio.c +++ b/libavcodec/mpeg4audio.c @@ -169,24 +169,6 @@ int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb, return specific_config_bitindex - start_bit_index; } -#if LIBAVCODEC_VERSION_MAJOR < 59 -int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, - int bit_size, int sync_extension) -{ - GetBitContext gb; - int ret; - - if (bit_size <= 0) - return AVERROR_INVALIDDATA; - - ret = init_get_bits(&gb, buf, bit_size); - if (ret < 0) - return ret; - - return ff_mpeg4audio_get_config_gb(c, &gb, sync_extension, NULL); -} -#endif - int avpriv_mpeg4audio_get_config2(MPEG4AudioConfig *c, const uint8_t *buf, int size, int sync_extension, void *logctx) { diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h index b274e92b62..3187df68d2 100644 --- a/libavcodec/mpeg4audio.h +++ b/libavcodec/mpeg4audio.h @@ -59,19 +59,6 @@ extern const uint8_t ff_mpeg4audio_channels[14]; int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb, int sync_extension, void *logctx); -#if LIBAVCODEC_VERSION_MAJOR < 59 -/** - * Parse MPEG-4 systems extradata from a raw buffer to retrieve audio configuration. - * @param[in] c MPEG4AudioConfig structure to fill. - * @param[in] buf Extradata from container. - * @param[in] bit_size Extradata size in bits. - * @param[in] sync_extension look for a sync extension after config if true. - * @return negative AVERROR code on error, on success AudioSpecificConfig bit index in extradata. - */ -int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, - int bit_size, int sync_extension); -#endif - /** * Parse MPEG-4 systems extradata from a raw buffer to retrieve audio configuration. * @param[in] c MPEG4AudioConfig structure to fill. From patchwork Mon Apr 19 14:09:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27026 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp556328iob; Mon, 19 Apr 2021 07:12:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpXDRQGa0LffmarKWg91QiDCzhXW6ysx/0j9jxPJEvFkPb17I0/Qq7Q5FmhkcCggGppAai X-Received: by 2002:a17:906:cec2:: with SMTP id si2mr22951053ejb.234.1618841546300; Mon, 19 Apr 2021 07:12:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841546; cv=none; d=google.com; s=arc-20160816; b=OA2j30aHepy50K2ghb+7Z8ox4v1rENb9jDGafP9wIuVEUIpCygTT9wbnbfbNnA1qET FP47UlbGVFDuHG1Zr+tPt9GVoShseC4uqBCk6T2dXw7PDC0M0QfXGi9i+2Ag5+22zF6T 69apKJs7ydxHU9obTnn+KosOuNblwMjpp0pqHg02KBqqZqsIrIkIt9QVQAEVdciJJSbs beOrVEN5oayU3Vk2gPlYqALP5XaMjccz1dEWFLgbPyEwBb6JNaHzZB2aZFFkOmseoTKK E8+eaNx9j2nawjSGNbb2ctSd7GJDRBxVDWx+I/ZyEQedH5xY3hDDZWCHHUAYs6vx43Zj tclw== 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=DvC+7gXqshA4NCeinSXL11btm189PxE10Y01QVCWjy8=; b=LtKXCBpTkmASwvehkI8A/vTzQ6tTuplkVYtTz5wd8OZWLEOlwHL7GEU9PDgV95Mauv fevGjSJnEbtCBM3ztSH8DcDP7BTGGmQ1Rr8Ei0VmEmGZ7XuKu+horAcE3d0+y9a5aJie IAJ6k5LQLuW40UcAhQYXom47KAvv8i1g07XDI5iQ4WGbO8e0j+UwfuOAv879UPTJILg2 bBXuTpiGWUHbdemJmfCfIAZKSBt0DxE2SpoVzrNniOpeOVoLjcEBXz/bMQq68oAOJ0av DZJ6xNNAobUC8ycKEdAfAFjr3Ph6nOrS4Ihq+bhTfVtYj4oNBTDybF1aCFW9gNqYqwZt SKXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=G6G8soyN; 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 op17si12663036ejb.131.2021.04.19.07.12.26; Mon, 19 Apr 2021 07:12:26 -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=G6G8soyN; 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 019ED680AEA; Mon, 19 Apr 2021 17:11:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87DE46809AE for ; Mon, 19 Apr 2021 17:11:25 +0300 (EEST) Received: by mail-qk1-f178.google.com with SMTP id t17so7379159qkg.4 for ; Mon, 19 Apr 2021 07:11:25 -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=duTnZBpyfdFFlYf2L8T38E+Wp/q2opQd9yt9qiSBy/I=; b=G6G8soyNwEnvf0iGRpSOl2uIkYzOz19Am2pRsT82J7eaorGVbYbDqmmhXOnRLJEg+S npqjdLp83LOAPUBgrFihLM6VZyLAZ005fguDXEriKHYkUdiqN6Xi77ZWLWQzT2e0qGyc yEwaxdN/A5Q9RbW7Kkf9e+OznA/6Xlk9XJ3i2/mGQ780BlKPpZV9Phw/9BRGPbvYwb0D dj3LAJzw5M68OE0StBJTBqD270QUQlHyA5gmq5L8wdbfrPA/MDc7krJ/4SdEg4slL5C0 4g70+/k623anmlQnd+1EsyJ5KfuwlkfCMaIAnK8S72uc1aiiNgsgty78FwwAsY1ksfUz kkQA== 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=duTnZBpyfdFFlYf2L8T38E+Wp/q2opQd9yt9qiSBy/I=; b=gnTsP7fKOVXRPMRc+/aVkHBPNeQ0jH7zgwX7S9tT0nL51Cn4ngAAlUfvlyZlqw7UEC u0pcGjBe5FAyxkcedsDiwMbAWz3Q+sd4WwvH0yogqJBgLFDZvFc1RNguQwN0wajdMUDt LjfchTT4xTgSZC6dHtNM+eRYtRo2/DVH7qjNr8Q/kZ4zMsv+kBFxRNVQ6r9wcMXgjBwC xcdXZE/XTnipQ5s+hpk2UTOaW0DHPivhJZP0f3TFk6H/+pRVeTzkVIljvme+63MXDYV4 6/VdYK6kgwL91hCJ2NxxD8KPSt7gNbcjTg0vEuOPb4Wwsgb76GZrvdX1P6LhRih8jpVk ulUw== X-Gm-Message-State: AOAM532tAAjivwo1eMyIzSHHPcJpYv79ra9+iGbxZxm5XKKQ1ZnSXllj 0caq/n+EnST+7MPOmY1ogggc7Z6OED0= X-Received: by 2002:a37:2ec4:: with SMTP id u187mr12416218qkh.472.1618841483845; Mon, 19 Apr 2021 07:11:23 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:23 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:15 -0300 Message-Id: <20210419141024.8174-19-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 18/87] avcodec/codec2utils: Remove legacy avpriv functions 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: tVqLfmpCN0T2 From: Andreas Rheinhardt Unused since 37d742b607d47122d23d548ffd7ad9b09cbc5298. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 7 +--- libavcodec/codec2utils.c | 82 ---------------------------------------- libavcodec/codec2utils.h | 18 --------- 3 files changed, 2 insertions(+), 105 deletions(-) delete mode 100644 libavcodec/codec2utils.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5b41450b86..c11645616d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -978,9 +978,6 @@ OBJS-$(CONFIG_VP8_QSV_HWACCEL) += qsvdec.o OBJS-$(CONFIG_ISO_MEDIA) += mpeg4audio.o mpegaudiodata.o OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o -OBJS-$(CONFIG_CODEC2_DEMUXER) += codec2utils.o -OBJS-$(CONFIG_CODEC2_MUXER) += codec2utils.o -OBJS-$(CONFIG_CODEC2RAW_DEMUXER) += codec2utils.o OBJS-$(CONFIG_DNXHD_DEMUXER) += dnxhddata.o OBJS-$(CONFIG_FITS_DEMUXER) += fits.o OBJS-$(CONFIG_LATM_MUXER) += mpeg4audio.o @@ -1023,8 +1020,8 @@ OBJS-$(CONFIG_LIBAOM_AV1_DECODER) += libaomdec.o OBJS-$(CONFIG_LIBAOM_AV1_ENCODER) += libaomenc.o OBJS-$(CONFIG_LIBARIBB24_DECODER) += libaribb24.o ass.o OBJS-$(CONFIG_LIBCELT_DECODER) += libcelt_dec.o -OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o codec2utils.o -OBJS-$(CONFIG_LIBCODEC2_ENCODER) += libcodec2.o codec2utils.o +OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o +OBJS-$(CONFIG_LIBCODEC2_ENCODER) += libcodec2.o OBJS-$(CONFIG_LIBDAV1D_DECODER) += libdav1d.o OBJS-$(CONFIG_LIBDAVS2_DECODER) += libdavs2.o OBJS-$(CONFIG_LIBFDK_AAC_DECODER) += libfdk-aacdec.o diff --git a/libavcodec/codec2utils.c b/libavcodec/codec2utils.c deleted file mode 100644 index a942662403..0000000000 --- a/libavcodec/codec2utils.c +++ /dev/null @@ -1,82 +0,0 @@ -/* - * codec2 utility functions - * Copyright (c) 2017 Tomas Härdin - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include "internal.h" -#include "libavcodec/codec2utils.h" - -#if LIBAVCODEC_VERSION_MAJOR < 59 -int avpriv_codec2_mode_bit_rate(void *logctx, int mode) -{ - int frame_size = avpriv_codec2_mode_frame_size(logctx, mode); - int block_align = avpriv_codec2_mode_block_align(logctx, mode); - - if (frame_size <= 0 || block_align <= 0) { - return 0; - } - - return 8 * 8000 * block_align / frame_size; -} - -int avpriv_codec2_mode_frame_size(void *logctx, int mode) -{ - int frame_size_table[CODEC2_MODE_MAX+1] = { - 160, // 3200 - 160, // 2400 - 320, // 1600 - 320, // 1400 - 320, // 1300 - 320, // 1200 - 320, // 700 - 320, // 700B - 320, // 700C - }; - - if (mode < 0 || mode > CODEC2_MODE_MAX) { - av_log(logctx, AV_LOG_ERROR, "unknown codec2 mode %i, can't find frame_size\n", mode); - return 0; - } else { - return frame_size_table[mode]; - } -} - -int avpriv_codec2_mode_block_align(void *logctx, int mode) -{ - int block_align_table[CODEC2_MODE_MAX+1] = { - 8, // 3200 - 6, // 2400 - 8, // 1600 - 7, // 1400 - 7, // 1300 - 6, // 1200 - 4, // 700 - 4, // 700B - 4, // 700C - }; - - if (mode < 0 || mode > CODEC2_MODE_MAX) { - av_log(logctx, AV_LOG_ERROR, "unknown codec2 mode %i, can't find block_align\n", mode); - return 0; - } else { - return block_align_table[mode]; - } -} -#endif diff --git a/libavcodec/codec2utils.h b/libavcodec/codec2utils.h index 37f0693dc7..6812ae895c 100644 --- a/libavcodec/codec2utils.h +++ b/libavcodec/codec2utils.h @@ -24,8 +24,6 @@ #include -#include "version.h" - //Highest mode we're willing to use. //Don't want to let users accidentally produce files that can't be decoded in the future. //CODEC2_MODE_WB (9) is experimental/unstable as of 2017-11-23. @@ -47,22 +45,6 @@ { "700B", "700B", 0, AV_OPT_TYPE_CONST, {.i64 = 7}, .flags=option_flags, .unit="codec2_mode"},\ { "700C", "700C", 0, AV_OPT_TYPE_CONST, {.i64 = 8}, .flags=option_flags, .unit="codec2_mode"} -#if LIBAVCODEC_VERSION_MAJOR < 59 -//The three following functions are here to avoid needing libavformat/codec2.c to depend on libcodec2 - -//Computes bitrate from mode, with frames rounded up to the nearest octet. -//So 700 bit/s (28 bits/frame) becomes 800 bits/s (32 bits/frame). -//logctx is used for av_log() -//Returns <0 if mode is invalid -int avpriv_codec2_mode_bit_rate(void *logctx, int mode); - -//Mimics codec2_samples_per_frame() -int avpriv_codec2_mode_frame_size(void *logctx, int mode); - -//Mimics (codec2_bits_per_frame()+7)/8 -int avpriv_codec2_mode_block_align(void *logctx, int mode); -#endif - #define CODEC2_EXTRADATA_SIZE 4 //Used in codec2raw demuxer and libcodec2 encoder From patchwork Mon Apr 19 14:09:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27089 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp661716iob; Mon, 19 Apr 2021 09:16:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDcOjXIMIBdeGhuq2WPPme92dEYjAsyAi9wnF7R+M6I9V13fuU5DENNAcojxw05GJBc51K X-Received: by 2002:a17:906:2dd9:: with SMTP id h25mr22461909eji.6.1618848995967; Mon, 19 Apr 2021 09:16:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618848995; cv=none; d=google.com; s=arc-20160816; b=swhi/EejDbkPVV1mhTU/NG3GULS4tg4YKzwm8fYR0+b2q7NE6V/PVKd6rg+1DXIb+M b4JTrlWhkEjoLFdaQXKkBB2QJl4TTr2MfJDdcssw4zO/9X8YkfpAJQPm6B8oOXuLebni 7BmuzRiMJqs7g0ZysP/kDlzW2I1W5VpIjaWIns7wcVkxaaOxfXK3VVybeQfAOiw5lyDj poOiDAlrbiOdsutWw7rhRBZnCXklsL2nuls/bQuVeqPOcE4HGKdlQFqQrkf/l3AySGka luZI3AbSwGZ8JjlfoB7dppca5ATc1K2r4hGY1Lc3QZvEtpylzffXcKqcV0hbPsuhY8cP lIzQ== 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=yxnPULovE/OTx69TqO0Dmy45KQzUEp6y35PqLVdecgE=; b=QcEHSrgpxu0VwWDyLiFuqcm2c05n/PVffkE2WietNygFnOa2hmsu3itUdDZUIsj4Qu 64FdyUWBrmV9Z7bcW7X3Z7lF/G/HbzKAYp6oS+tvuHg3RUqiaDrqMBkITrsZZzt5pqaA j9xtkeJMgJfn9NAyHGXwXH3XDmiVjCi1A8FFPdJNoU+z47jwi5p28xPPd8QTc+GyBiGf cTNISX3bW5iC79zJQwX/x2WUny+FpzfIu8MOpBrxQqWjAGHLH7Un/iqQ1/3/Wx6DO8fo D158RY7KNXears8S69ej6luFtqqTCStm+zuGYyLDKIgq2u9ICtGT6QZG5nyIVO4aXmL7 mPuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pKSg6C12; 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 y13si11332229edr.168.2021.04.19.09.16.35; Mon, 19 Apr 2021 09:16:35 -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=pKSg6C12; 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 6121068026B; Mon, 19 Apr 2021 19:16:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f54.google.com (mail-vs1-f54.google.com [209.85.217.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B7F568026B for ; Mon, 19 Apr 2021 19:16:25 +0300 (EEST) Received: by mail-vs1-f54.google.com with SMTP id t23so1522699vso.11 for ; Mon, 19 Apr 2021 09:16:25 -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=M39YEesVR8B6UqOxJGlwKciQ64jzpICsFlM3XnLhCrs=; b=pKSg6C12ihjeyAGyUl7DXCsuoHMlcX+CpkpRVSxFQRsmXCAT4Gjbl4HeXhHl8vikMK NfIp8J6rlyktzmN9uNVRvSw1VBOmT0ZNXPd+qqFrNN77vq1fjyRRkocKquLigCwNxK5t aLlmvPHFhnBWIu/0K4rlhiOXq3SI7pVzV0r+0QiOEBJ4O/acRnLsjZL0BOZ2lbbLQ7HA PdkGo309WD2pFV4OyY7nmo6IhmdVVCCTdXQSXcgu0s4i7eWxrDt1bxV8DIhfgKT+Ur53 rV1jKP/43/VKHsXBtqk9MgMIDs99KZX3rMaGAQw7kTsZ/z9fQDPj5Xe7b6CM9cf1yDqH CCkw== 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=M39YEesVR8B6UqOxJGlwKciQ64jzpICsFlM3XnLhCrs=; b=Sl2a1cefYpvWdYlu/YnSotUSlxQ7PcjllCFr7mYbyx4v6Ns5e1K/MVe8jsbryyifuf TtC6w87S3a1ouEt+yb0ZAq62dkcM6vpb6mfNoX7d3VBjIJj9ufxkUZnafpI7g9ev+nD6 KgAqVHuwGj43tozFnSBQkjuM3PMAg2nsqsTRfFMdtpPdoD2r81FlZ3AJo0Rg3A/sMXgb zBvjNvkUdyWF9cBLABAg/EUbJesbN6n/0vcy6ogsSINk4z7jQeTjwWdbvB8MGYqp0vFC fxlZjm4hCPT1eTtWFLFPsonTsurGEHH4SNYLbJo32Ai49yrb5f3FPQ++UlI2fEmxpYSI JQrA== X-Gm-Message-State: AOAM532QilbbX4a0CUgJ8BVdKjqKIOKBC/f43D9Rx9vCrj5ZKc5f6kJ8 kVpPZ4cjM1AbGrUTBtDItRK+QzGpDY8= X-Received: by 2002:a0c:f901:: with SMTP id v1mr21277023qvn.26.1618841484958; Mon, 19 Apr 2021 07:11:24 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:24 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:16 -0300 Message-Id: <20210419141024.8174-20-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 19/87] avcodec/mpegvideo_enc: Remove deprecated RTP-callback 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: 58hxWqnNlt7R From: Andreas Rheinhardt Deprecated in 462a54e2291e1fa18e1f1254d09739dfbb795617. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 14 -------------- libavcodec/mpegvideo_enc.c | 21 --------------------- libavcodec/version.h | 3 --- 3 files changed, 38 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 69f69a1aa4..064af12f31 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1387,20 +1387,6 @@ typedef struct AVCodecContext { */ int trellis; -#if FF_API_RTP_CALLBACK - /** - * @deprecated unused - */ - /* The RTP callback: This function is called */ - /* every time the encoder has a packet to send. */ - /* It depends on the encoder if the data starts */ - /* with a Start Code (it should). H.263 does. */ - /* mb_nb contains the number of macroblocks */ - /* encoded in the RTP payload. */ - attribute_deprecated - void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb); -#endif - /** * pass1 encoding statistics output buffer * - encoding: Set by libavcodec. diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index f0490a39cc..1613d06023 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2946,14 +2946,6 @@ static int encode_thread(AVCodecContext *c, void *arg){ } } -#if FF_API_RTP_CALLBACK -FF_DISABLE_DEPRECATION_WARNINGS - if (s->avctx->rtp_callback){ - int number_mb = (mb_y - s->resync_mb_y)*s->mb_width + mb_x - s->resync_mb_x; - s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, current_packet_size, number_mb); - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif update_mb_info(s, 1); switch(s->codec_id){ @@ -3429,19 +3421,6 @@ FF_ENABLE_DEPRECATION_WARNINGS write_slice_end(s); -#if FF_API_RTP_CALLBACK -FF_DISABLE_DEPRECATION_WARNINGS - /* Send the last GOB if RTP */ - if (s->avctx->rtp_callback) { - int number_mb = (mb_y - s->resync_mb_y)*s->mb_width - s->resync_mb_x; - int pdif = put_bits_ptr(&s->pb) - s->ptr_lastgob; - /* Call the RTP callback to send the last GOB */ - emms_c(); - s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, pdif, number_mb); - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return 0; } diff --git a/libavcodec/version.h b/libavcodec/version.h index fbdc99abca..0e20d5c2e2 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_RTP_CALLBACK -#define FF_API_RTP_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_VBV_DELAY #define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27022 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp556470iob; Mon, 19 Apr 2021 07:12:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxomZNHkwXplui0iN1boLRRiFChwEkbGghdXSN2736NFMDxU3U7jlMKTpxGImf4W/SAtbCx X-Received: by 2002:a17:906:af5a:: with SMTP id ly26mr21807989ejb.372.1618841560093; Mon, 19 Apr 2021 07:12:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841560; cv=none; d=google.com; s=arc-20160816; b=eulvs6CBz3FGL396VLJm2DYoSGafom/cM8Q5XPttdNTI+EP4FtXifd0Bqjl8C2EMnm TEIgmIETgBX0S0x+74zqzlgYDmAmSQlLFSQIrL1aHW0LTFGHBYXZGq+hoEMOuCCHUp8+ Qbs2eIVxHlmRlnGnbuZSmbV/hBpD+3QZET+fDViaCSOHj6xIgLYXh4mWv+NHj3DNvmV4 DwdYSd/XaHAj4oYv4qd2G8TKRdGTscKFD0wAAHU5PCpXMAKWvxzjiV6y5CaKYTQEk3xv ZQ0g0yV+lpQU/zcxtfhef0ZGV9eqyCaZlkeHliL0aipgyWBm3AWQ76BUE2WwYYu8/DFj BQAw== 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=4s2HxEt/Rd7pZcd1Eicgi5XvwUKjawWKJXCMJ3LPmMw=; b=hrzsdIxcRXpzhCBHJY4gfbvhgDzQMuE+WnZ7oDtU+r3sSVcfuFPxBV/un1H3vlCc1x pdQI/mrvLPlHD92jKA6tgx9RJHNvkeWFtQOORVrYhWAkUwTvxH1GL2XYldY2e9x97TuH Hxgj4B8i7khV0JokKD8ZuKQnaupB9Lmo58YmtrCixaQPHMQC5SpW88ELH0XVcArNUJl/ 3pI6ouiN53ND0KW84lnwOaBYxdeZBEN3tY8Z274n8MFLrmoAr2d5KZrxRJ337x7lIVCC N9JZcVCBUI6lVzgtuKV4OdE6HmXrRRiWEHkp47F2Vpm3Dko2XAL6aQUmD9hVETwKeqz9 p7kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sq+tVH7U; 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 w2si14021736edi.199.2021.04.19.07.12.39; Mon, 19 Apr 2021 07:12:40 -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=sq+tVH7U; 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 E6610680A25; Mon, 19 Apr 2021 17:11:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E93416809C9 for ; Mon, 19 Apr 2021 17:11:27 +0300 (EEST) Received: by mail-qk1-f170.google.com with SMTP id e13so26001152qkl.6 for ; Mon, 19 Apr 2021 07:11:27 -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=zez1wkLNX9pnYMscrjNyptBi67kEQ2/+NwFCsWVPgLc=; b=sq+tVH7UhI6oNqgqmzsMFqchbs060+tHsyeLEhLN9f6bubvYn813WJBsSLfkqhuthS WXBqdyF2lDIhMDx/ZWI+D5DFRhQEr5bLbnAL69N2ZueZOV+j48nC1HIiQfNOgJE5YNfE oQ/hj4/BmNqW9GNouo3s2RY/TMshRHC27iVkaqP1x4t/dxMt9yYBCWznVLDrhIL5kzsv 38AFXMpC/ER+Gsd8O0T3dCn4JcH2DIy2WyFd/lE2rrsijYAWEW3VzUqO8ukuyltNYoru Tg34LQLiFfmCVv095kVM5kwKHEAHeVbmahd2/IYrErL6rWq9mTtMUajfe8uCGP0Cq2Mg QopQ== 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=zez1wkLNX9pnYMscrjNyptBi67kEQ2/+NwFCsWVPgLc=; b=T3OyOFR1BFuOQrOf0i38kz0e/TRc1mkas3hLA9KfS+FkbVKWe3VXsBbN+AjMiswK5F eIy2z3lXM1p75t1Ozos3OOSZIaI3KapdXm/m2smLcilAGO5G5JabSy1mtA1BNgRZARJh NNtlQTcTrfOja8h4kWs8WljuG/IXM4mXmwTvuALNbSGYxcCRUuehrMl4ztsdWgIYqlnK TgNbXFsHjhaM5qnb3oNKS7qsFePjaRzNiAJW9RAhH0Ghkh357VM7btfyTRclGJ+E3aB7 xX137/ktS7NVMe54OQaYKky3Ab9XydNYQcQUyFEI6WQoVd32B61HlDoY7SwjWSW6Byed H8Ag== X-Gm-Message-State: AOAM531dQUFj/JVnxX9xBBXKOAHLPHBnFyez/v5aQ/23C5TV/Q0Wjwlb TDQ29K6wX1CYlkB0RgCPlkaMh4cgr2k= X-Received: by 2002:a05:620a:1522:: with SMTP id n2mr6458194qkk.298.1618841486102; Mon, 19 Apr 2021 07:11:26 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:25 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:17 -0300 Message-Id: <20210419141024.8174-21-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 20/87] avcodec: Remove deprecated ASS with inline timing 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: cpfKYE5/WJvl From: Andreas Rheinhardt Deprecated in 22ebbda637257a432c99330ca4c6024665418f0e. Signed-off-by: Andreas Rheinhardt --- libavcodec/assenc.c | 39 ------------------ libavcodec/avcodec.h | 3 -- libavcodec/decode.c | 84 -------------------------------------- libavcodec/movtextenc.c | 13 ------ libavcodec/options_table.h | 7 ---- libavcodec/srtenc.c | 15 ------- libavcodec/ttmlenc.c | 26 ------------ libavcodec/version.h | 3 -- libavcodec/webvttenc.c | 14 ------- 9 files changed, 204 deletions(-) diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c index a6e1d5d8b9..3decf670d7 100644 --- a/libavcodec/assenc.c +++ b/libavcodec/assenc.c @@ -27,10 +27,6 @@ #include "libavutil/internal.h" #include "libavutil/mem.h" -typedef struct { - int id; ///< current event id, ReadOrder field -} ASSEncodeContext; - static av_cold int ass_encode_init(AVCodecContext *avctx) { avctx->extradata = av_malloc(avctx->subtitle_header_size + 1); @@ -46,49 +42,16 @@ static int ass_encode_frame(AVCodecContext *avctx, unsigned char *buf, int bufsize, const AVSubtitle *sub) { - ASSEncodeContext *s = avctx->priv_data; int i, len, total_len = 0; for (i=0; inum_rects; i++) { - char ass_line[2048]; const char *ass = sub->rects[i]->ass; - long int layer; - char *p; if (sub->rects[i]->type != SUBTITLE_ASS) { av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n"); return AVERROR(EINVAL); } -#if FF_API_ASS_TIMING - if (!strncmp(ass, "Dialogue: ", 10)) { - if (i > 0) { - av_log(avctx, AV_LOG_ERROR, "ASS encoder supports only one " - "ASS rectangle field.\n"); - return AVERROR_INVALIDDATA; - } - - ass += 10; // skip "Dialogue: " - /* parse Layer field. If it's a Marked field, the content - * will be "Marked=N" instead of the layer num, so we will - * have layer=0, which is fine. */ - layer = strtol(ass, &p, 10); - -#define SKIP_ENTRY(ptr) do { \ - char *sep = strchr(ptr, ','); \ - if (sep) \ - ptr = sep + 1; \ -} while (0) - - SKIP_ENTRY(p); // skip layer or marked - SKIP_ENTRY(p); // skip start timestamp - SKIP_ENTRY(p); // skip end timestamp - snprintf(ass_line, sizeof(ass_line), "%d,%ld,%s", ++s->id, layer, p); - ass_line[strcspn(ass_line, "\r\n")] = 0; - ass = ass_line; - } -#endif - len = av_strlcpy(buf+total_len, ass, bufsize-total_len); if (len > bufsize-total_len-1) { @@ -110,7 +73,6 @@ AVCodec ff_ssa_encoder = { .id = AV_CODEC_ID_ASS, .init = ass_encode_init, .encode_sub = ass_encode_frame, - .priv_data_size = sizeof(ASSEncodeContext), }; #endif @@ -122,6 +84,5 @@ AVCodec ff_ass_encoder = { .id = AV_CODEC_ID_ASS, .init = ass_encode_init, .encode_sub = ass_encode_frame, - .priv_data_size = sizeof(ASSEncodeContext), }; #endif diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 064af12f31..a3c8c425cb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2047,9 +2047,6 @@ typedef struct AVCodecContext { */ int sub_text_format; #define FF_SUB_TEXT_FMT_ASS 0 -#if FF_API_ASS_TIMING -#define FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS 1 -#endif /** * Audio only. The amount of padding (in samples) appended by the encoder to diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 0956a6ac6f..0078f00607 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -949,79 +949,6 @@ static int utf8_check(const uint8_t *str) return 1; } -#if FF_API_ASS_TIMING -static void insert_ts(AVBPrint *buf, int ts) -{ - if (ts == -1) { - av_bprintf(buf, "9:59:59.99,"); - } else { - int h, m, s; - - h = ts/360000; ts -= 360000*h; - m = ts/ 6000; ts -= 6000*m; - s = ts/ 100; ts -= 100*s; - av_bprintf(buf, "%d:%02d:%02d.%02d,", h, m, s, ts); - } -} - -static int convert_sub_to_old_ass_form(AVSubtitle *sub, const AVPacket *pkt, AVRational tb) -{ - int i; - AVBPrint buf; - - av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); - - for (i = 0; i < sub->num_rects; i++) { - char *final_dialog; - const char *dialog; - AVSubtitleRect *rect = sub->rects[i]; - int ts_start, ts_duration = -1; - long int layer; - - if (rect->type != SUBTITLE_ASS || !strncmp(rect->ass, "Dialogue: ", 10)) - continue; - - av_bprint_clear(&buf); - - /* skip ReadOrder */ - dialog = strchr(rect->ass, ','); - if (!dialog) - continue; - dialog++; - - /* extract Layer or Marked */ - layer = strtol(dialog, (char**)&dialog, 10); - if (*dialog != ',') - continue; - dialog++; - - /* rescale timing to ASS time base (ms) */ - ts_start = av_rescale_q(pkt->pts, tb, av_make_q(1, 100)); - if (pkt->duration != -1) - ts_duration = av_rescale_q(pkt->duration, tb, av_make_q(1, 100)); - sub->end_display_time = FFMAX(sub->end_display_time, 10 * ts_duration); - - /* construct ASS (standalone file form with timestamps) string */ - av_bprintf(&buf, "Dialogue: %ld,", layer); - insert_ts(&buf, ts_start); - insert_ts(&buf, ts_duration == -1 ? -1 : ts_start + ts_duration); - av_bprintf(&buf, "%s\r\n", dialog); - - final_dialog = av_strdup(buf.str); - if (!av_bprint_is_complete(&buf) || !final_dialog) { - av_freep(&final_dialog); - av_bprint_finalize(&buf, NULL); - return AVERROR(ENOMEM); - } - av_freep(&rect->ass); - rect->ass = final_dialog; - } - - av_bprint_finalize(&buf, NULL); - return 0; -} -#endif - int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, AVPacket *avpkt) @@ -1057,17 +984,6 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, av_assert1((ret >= 0) >= !!*got_sub_ptr && !!*got_sub_ptr >= !!sub->num_rects); -#if FF_API_ASS_TIMING - if (avctx->sub_text_format == FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS - && *got_sub_ptr && sub->num_rects) { - const AVRational tb = avctx->pkt_timebase.num ? avctx->pkt_timebase - : avctx->time_base; - int err = convert_sub_to_old_ass_form(sub, avpkt, tb); - if (err < 0) - ret = err; - } -#endif - if (sub->num_rects && !sub->end_display_time && avpkt->duration && avctx->pkt_timebase.num) { AVRational ms = { 1, 1000 }; diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index cf30adbd0a..1b37d135e1 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -655,25 +655,12 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, return AVERROR(EINVAL); } -#if FF_API_ASS_TIMING - if (!strncmp(ass, "Dialogue: ", 10)) { - int num; - dialog = ff_ass_split_dialog(s->ass_ctx, ass, 0, &num); - for (; dialog && num--; dialog++) { - mov_text_dialog(s, dialog); - ff_ass_split_override_codes(&mov_text_callbacks, s, dialog->text); - } - } else { -#endif dialog = ff_ass_split_dialog2(s->ass_ctx, ass); if (!dialog) return AVERROR(ENOMEM); mov_text_dialog(s, dialog); ff_ass_split_override_codes(&mov_text_callbacks, s, dialog->text); ff_ass_free_dialog(&dialog); -#if FF_API_ASS_TIMING - } -#endif for (j = 0; j < box_count; j++) { box_types[j].encode(s); diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 313150eb73..6ad54c2d67 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -366,15 +366,8 @@ static const AVOption avcodec_options[] = { {"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_AUTOMATIC}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, {"pre_decoder", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_PRE_DECODER}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, {"ignore", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_IGNORE}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, -#if FF_API_ASS_TIMING -{"sub_text_format", "set decoded text subtitle format", OFFSET(sub_text_format), AV_OPT_TYPE_INT, {.i64 = FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS}, 0, 1, S|D, "sub_text_format"}, -#else {"sub_text_format", "set decoded text subtitle format", OFFSET(sub_text_format), AV_OPT_TYPE_INT, {.i64 = FF_SUB_TEXT_FMT_ASS}, 0, 1, S|D, "sub_text_format"}, -#endif {"ass", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_TEXT_FMT_ASS}, INT_MIN, INT_MAX, S|D, "sub_text_format"}, -#if FF_API_ASS_TIMING -{"ass_with_timings", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS}, INT_MIN, INT_MAX, S|D, "sub_text_format"}, -#endif #if FF_API_OLD_ENCDEC {"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, A|V|D }, #endif diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c index 655b65679e..160f3bbf3a 100644 --- a/libavcodec/srtenc.c +++ b/libavcodec/srtenc.c @@ -244,18 +244,6 @@ static int encode_frame(AVCodecContext *avctx, return AVERROR(EINVAL); } -#if FF_API_ASS_TIMING - if (!strncmp(ass, "Dialogue: ", 10)) { - int num; - dialog = ff_ass_split_dialog(s->ass_ctx, ass, 0, &num); - for (; dialog && num--; dialog++) { - s->alignment_applied = 0; - if (avctx->codec_id == AV_CODEC_ID_SUBRIP) - srt_style_apply(s, dialog->style); - ff_ass_split_override_codes(cb, s, dialog->text); - } - } else { -#endif dialog = ff_ass_split_dialog2(s->ass_ctx, ass); if (!dialog) return AVERROR(ENOMEM); @@ -264,9 +252,6 @@ static int encode_frame(AVCodecContext *avctx, srt_style_apply(s, dialog->style); ff_ass_split_override_codes(cb, s, dialog->text); ff_ass_free_dialog(&dialog); -#if FF_API_ASS_TIMING - } -#endif } if (!av_bprint_is_complete(&s->buffer)) diff --git a/libavcodec/ttmlenc.c b/libavcodec/ttmlenc.c index 3972b4368c..c4964572f9 100644 --- a/libavcodec/ttmlenc.c +++ b/libavcodec/ttmlenc.c @@ -94,29 +94,6 @@ static int ttml_encode_frame(AVCodecContext *avctx, uint8_t *buf, return AVERROR(EINVAL); } -#if FF_API_ASS_TIMING - if (!strncmp(ass, "Dialogue: ", 10)) { - int num; - dialog = ff_ass_split_dialog(s->ass_ctx, ass, 0, &num); - - for (; dialog && num--; dialog++) { - int ret = ff_ass_split_override_codes(&ttml_callbacks, s, - dialog->text); - int log_level = (ret != AVERROR_INVALIDDATA || - avctx->err_recognition & AV_EF_EXPLODE) ? - AV_LOG_ERROR : AV_LOG_WARNING; - - if (ret < 0) { - av_log(avctx, log_level, - "Splitting received ASS dialog failed: %s\n", - av_err2str(ret)); - - if (log_level == AV_LOG_ERROR) - return ret; - } - } - } else { -#endif dialog = ff_ass_split_dialog2(s->ass_ctx, ass); if (!dialog) return AVERROR(ENOMEM); @@ -142,9 +119,6 @@ static int ttml_encode_frame(AVCodecContext *avctx, uint8_t *buf, ff_ass_free_dialog(&dialog); } -#if FF_API_ASS_TIMING - } -#endif } if (!av_bprint_is_complete(&s->buffer)) diff --git a/libavcodec/version.h b/libavcodec/version.h index 0e20d5c2e2..af737afce1 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -63,9 +63,6 @@ #ifndef FF_API_VBV_DELAY #define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_ASS_TIMING -#define FF_API_ASS_TIMING (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_COPY_CONTEXT #define FF_API_COPY_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) #endif diff --git a/libavcodec/webvttenc.c b/libavcodec/webvttenc.c index febf6ee370..2419dd3d07 100644 --- a/libavcodec/webvttenc.c +++ b/libavcodec/webvttenc.c @@ -171,26 +171,12 @@ static int webvtt_encode_frame(AVCodecContext *avctx, return AVERROR(EINVAL); } -#if FF_API_ASS_TIMING - if (!strncmp(ass, "Dialogue: ", 10)) { - int num; - dialog = ff_ass_split_dialog(s->ass_ctx, ass, 0, &num); - // TODO reindent - for (; dialog && num--; dialog++) { - webvtt_style_apply(s, dialog->style); - ff_ass_split_override_codes(&webvtt_callbacks, s, dialog->text); - } - } else { -#endif dialog = ff_ass_split_dialog2(s->ass_ctx, ass); if (!dialog) return AVERROR(ENOMEM); webvtt_style_apply(s, dialog->style); ff_ass_split_override_codes(&webvtt_callbacks, s, dialog->text); ff_ass_free_dialog(&dialog); -#if FF_API_ASS_TIMING - } -#endif } if (!av_bprint_is_complete(&s->buffer)) From patchwork Mon Apr 19 14:09:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27016 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp556630iob; Mon, 19 Apr 2021 07:12:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5whULmxkY9RhxsFK3c0OtkJBU5b1qc9QborMU+C71SK6tqOUapldjFwqSAcFSvB+Xf4q1 X-Received: by 2002:a05:6402:176c:: with SMTP id da12mr25603072edb.325.1618841570920; Mon, 19 Apr 2021 07:12:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841570; cv=none; d=google.com; s=arc-20160816; b=KE0RO9tGnMdoG9tib/hzlL1xiwVF//dg2QUWdRVi1BTTscP7oAVr5RLC5irrXfAz8D mmYG26+zmXF3s8Nvp0UOuVnZIexFIhdDVsWsyWVCBoz5vskjlggPQ3sGhHv7JbTYQ9Gu mQgjD8mQd2aiVSxDag5K+Xx00y5KTa2+QmuvCuyL7FNxiqJEY5yYMjSLh2zgl+7xEs9D HemqGuF0VnrrO0pSGpdj4pO8RLcKG9yhuhnNvwpAtK3/wSTF5vi3RYVUCjRUPtY5MMA1 xwgo1bmGmPGL0XxgGiu7uckSfBN7RhjslGwLrUbv79ZKH9Tn5RD9fCHMH3xBdEEvJRtn uCEQ== 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=KbZEfdU8lEs6CiJ1npVplvVQFmUPsJYzhQfA+3db5UE=; b=JOopbcLV4Y+h86gGpjRIhvhu/BUvICgWYDdNKsgJ13dNpVDVW8gr2ezDrznIDrQeuN kmOHnykPl0NDq77fP7wAZbW6RWP/wm4eXp0wijyUCvd1SFcc7cN2E/vlnGKopBPWjUd2 MqiZ63+l1317ziNZQKsEXS7F+gdyKrOG/B7i2rsCR0UQXV7RBaGgQZUteoUfYxae0ALU fWiaLidqf97SiESUqNb3jrMvl6mObbdHxVlWGgijSco97mkP0bm3W1P94F8pKJsSo4dD awDwN9cCUMT2TPwJ1YclnQy88GQwtLwpBJkT5ObiLN4rK5UINLBcvUjd6D9ivcWwfJ2z OOOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=crfEFR5+; 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 u16si3147441edi.298.2021.04.19.07.12.50; Mon, 19 Apr 2021 07:12:50 -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=crfEFR5+; 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 DC0E3680BD4; Mon, 19 Apr 2021 17:11:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9AAD680A7F for ; Mon, 19 Apr 2021 17:11:28 +0300 (EEST) Received: by mail-qk1-f172.google.com with SMTP id h13so17165448qka.2 for ; Mon, 19 Apr 2021 07:11:28 -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=GmIy1KBXeOOWbl7v/EuRg30joEyjtagL5GoafAG/OsM=; b=crfEFR5+OOX4fNgwqdrcMP6KjUVOdqS5iqrssjWpgWmKJY2vC5lPXFCuXZ+Mbjg5D6 faUK+Syog3XQTo7sRvNJIN0bzAQU2O3pql7TaG/rMrltLRRfE+04NdCwIXgrryZrM2Gz h2nDazjndEx/Ae1yCaMxBTJYCaiOZ6nGKNjunfkEYk3XPg0gAA66UbFuaUscGGybbSBe 7+6+c/MaIYzrcsF0TFI7af8ZItMWeOnxZE0pVhiRaSrhsrF3X4ieNVhLtl5bAcB+9UgT TxP7EszaNtcTy5wwwqAwoI7X3eqcmZcQ/ejOMxkIsMwvBpovgi5EVjJo+F2jaJe7C8Hz zbxg== 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=GmIy1KBXeOOWbl7v/EuRg30joEyjtagL5GoafAG/OsM=; b=Q32ai5P4/foqrQP+B6yBk3dVAziC+hQ+jv6AmyVXH1q7qV7bobUJJwghT0p7ZNrUuV gk7NokoM6rBFagRfISu6AFfyj+ul6Z4WBob6Y92DZTbCT/nWwGwkUXsQ7S3MZ7wpCc9s egjvFQNqX+zpmfphgNRW4h54+KfVSTyo6nLy4j0WUU1XafWNqVx0C/UeYLeAfZWw7dsL 4rUfpJ+KUHyNnouos4LZIeWKQwBaf8tLwtukpmy5qRkpI4Rrs1oDfDskOBmcV59rO0ZF uG5Qs0g2WzCZkFvonWWpse4R9T0N4EcrpNLjwwUwtA1v/BSwkxRC6TE9RYBPvdu2DCYG VwfQ== X-Gm-Message-State: AOAM530IoHZFk3COq1zqd7oRw1SQR225Y2aTQFabTfjt/29YZJglbSDV 9i5NRfTVTBOWuoGg7+q1mgN5vsxTIOc= X-Received: by 2002:a37:a794:: with SMTP id q142mr11980549qke.216.1618841487257; Mon, 19 Apr 2021 07:11:27 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:26 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:18 -0300 Message-Id: <20210419141024.8174-22-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 21/87] avcodec/(movtext|srt|ttml|webvtt)enc: Reindent after previous commit 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: L1gHuVsV43ad From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextenc.c | 12 +++++------ libavcodec/srtenc.c | 16 +++++++-------- libavcodec/ttmlenc.c | 44 ++++++++++++++++++++--------------------- libavcodec/webvttenc.c | 12 +++++------ 4 files changed, 41 insertions(+), 43 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 1b37d135e1..3c166639ba 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -655,12 +655,12 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, return AVERROR(EINVAL); } - dialog = ff_ass_split_dialog2(s->ass_ctx, ass); - if (!dialog) - return AVERROR(ENOMEM); - mov_text_dialog(s, dialog); - ff_ass_split_override_codes(&mov_text_callbacks, s, dialog->text); - ff_ass_free_dialog(&dialog); + dialog = ff_ass_split_dialog2(s->ass_ctx, ass); + if (!dialog) + return AVERROR(ENOMEM); + mov_text_dialog(s, dialog); + ff_ass_split_override_codes(&mov_text_callbacks, s, dialog->text); + ff_ass_free_dialog(&dialog); for (j = 0; j < box_count; j++) { box_types[j].encode(s); diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c index 160f3bbf3a..08c52c2d56 100644 --- a/libavcodec/srtenc.c +++ b/libavcodec/srtenc.c @@ -244,14 +244,14 @@ static int encode_frame(AVCodecContext *avctx, return AVERROR(EINVAL); } - dialog = ff_ass_split_dialog2(s->ass_ctx, ass); - if (!dialog) - return AVERROR(ENOMEM); - s->alignment_applied = 0; - if (avctx->codec_id == AV_CODEC_ID_SUBRIP) - srt_style_apply(s, dialog->style); - ff_ass_split_override_codes(cb, s, dialog->text); - ff_ass_free_dialog(&dialog); + dialog = ff_ass_split_dialog2(s->ass_ctx, ass); + if (!dialog) + return AVERROR(ENOMEM); + s->alignment_applied = 0; + if (avctx->codec_id == AV_CODEC_ID_SUBRIP) + srt_style_apply(s, dialog->style); + ff_ass_split_override_codes(cb, s, dialog->text); + ff_ass_free_dialog(&dialog); } if (!av_bprint_is_complete(&s->buffer)) diff --git a/libavcodec/ttmlenc.c b/libavcodec/ttmlenc.c index c4964572f9..26ab76e9e7 100644 --- a/libavcodec/ttmlenc.c +++ b/libavcodec/ttmlenc.c @@ -88,37 +88,35 @@ static int ttml_encode_frame(AVCodecContext *avctx, uint8_t *buf, for (i=0; inum_rects; i++) { const char *ass = sub->rects[i]->ass; + int ret; if (sub->rects[i]->type != SUBTITLE_ASS) { av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n"); return AVERROR(EINVAL); } - dialog = ff_ass_split_dialog2(s->ass_ctx, ass); - if (!dialog) - return AVERROR(ENOMEM); - - { - int ret = ff_ass_split_override_codes(&ttml_callbacks, s, - dialog->text); - int log_level = (ret != AVERROR_INVALIDDATA || - avctx->err_recognition & AV_EF_EXPLODE) ? - AV_LOG_ERROR : AV_LOG_WARNING; - - if (ret < 0) { - av_log(avctx, log_level, - "Splitting received ASS dialog text %s failed: %s\n", - dialog->text, - av_err2str(ret)); - - if (log_level == AV_LOG_ERROR) { - ff_ass_free_dialog(&dialog); - return ret; - } - } - + dialog = ff_ass_split_dialog2(s->ass_ctx, ass); + if (!dialog) + return AVERROR(ENOMEM); + + ret = ff_ass_split_override_codes(&ttml_callbacks, s, + dialog->text); + if (ret < 0) { + int log_level = (ret != AVERROR_INVALIDDATA || + avctx->err_recognition & AV_EF_EXPLODE) ? + AV_LOG_ERROR : AV_LOG_WARNING; + av_log(avctx, log_level, + "Splitting received ASS dialog text %s failed: %s\n", + dialog->text, + av_err2str(ret)); + + if (log_level == AV_LOG_ERROR) { ff_ass_free_dialog(&dialog); + return ret; } + } + + ff_ass_free_dialog(&dialog); } if (!av_bprint_is_complete(&s->buffer)) diff --git a/libavcodec/webvttenc.c b/libavcodec/webvttenc.c index 2419dd3d07..fcbd9698f4 100644 --- a/libavcodec/webvttenc.c +++ b/libavcodec/webvttenc.c @@ -171,12 +171,12 @@ static int webvtt_encode_frame(AVCodecContext *avctx, return AVERROR(EINVAL); } - dialog = ff_ass_split_dialog2(s->ass_ctx, ass); - if (!dialog) - return AVERROR(ENOMEM); - webvtt_style_apply(s, dialog->style); - ff_ass_split_override_codes(&webvtt_callbacks, s, dialog->text); - ff_ass_free_dialog(&dialog); + dialog = ff_ass_split_dialog2(s->ass_ctx, ass); + if (!dialog) + return AVERROR(ENOMEM); + webvtt_style_apply(s, dialog->style); + ff_ass_split_override_codes(&webvtt_callbacks, s, dialog->text); + ff_ass_free_dialog(&dialog); } if (!av_bprint_is_complete(&s->buffer)) From patchwork Mon Apr 19 14:09:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27024 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp556784iob; Mon, 19 Apr 2021 07:13:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyL67gDEKziavZBa5U+M6dWVm1J2IAuL42nSn1Gf3DKBz1MkzvHC8EdwHQu5Khgs9fYcGPE X-Received: by 2002:a05:6402:1109:: with SMTP id u9mr26290738edv.174.1618841582189; Mon, 19 Apr 2021 07:13:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841582; cv=none; d=google.com; s=arc-20160816; b=bABH7pnT5Bmf4cVZBZiorGsEqSEV8e3l5q/0WAL6LfrKouVxOWPIEuMF5fDtVi/qVT 9wkZtK71l/fpmaPJC21vOt7+b6ycQiQXgRHlIs3/YsyWQ+WT3DRVJPsOs6x64optrOmm 3KbhlVluurTtIjqB0HryWIGOFULbN4DQu6DsXZAJ57M094b9Ef9/UO2v0TCTEXJ4m8Zv L7SQgPMZbBGLTZnHSrAA9PlXi0dKA52ahGB7P04UAwAi9kp49pC8p+xWIqLccXDYGKSM v4V0Y8uedkZcDH6MBNusbyHOM66tsu9ph5uM5ft2hoUzmqV02V+N4rrBHXjkw5De9kAh lOGg== 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=p/kboUYbcqHmR22aIHEfGP6ydX/R5B5oPtj/vEZKXEA=; b=Qx+jtD9bMzgx6VNuwtiFz18UT2wuMRp2ztjC991ZA+lOh4Yk4Xnz//+IQvDYv1EftQ TreXsA+U7iayExjk4wmHi8PTdcCuxufVmWLR+HkcqgRutQ4VXuEHJRqFn58H5bwmx0rs 1gPDGuK2UEIp8Yt/sA5wzWwZ6Pmp18pil1vAhqINfIRRZGdMDX/RNLzv8fszn+v8TFM0 CU30lglEfPdFNkWy0wUvvuHHb1hL4naUn5+HjhkizpLv4QJfBtmutrk/NyOFTETVMx2C Xo3hTSFiC/RBXct364z6lI6txfUYcPUnlO5BhZPUEOq65t8Dr+a6FExB3vGVNB4BfuqK mDWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=scwFy54g; 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 t16si13299181edi.299.2021.04.19.07.13.01; Mon, 19 Apr 2021 07:13:02 -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=scwFy54g; 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 DD430680C0F; Mon, 19 Apr 2021 17:11:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 065CC680B72 for ; Mon, 19 Apr 2021 17:11:29 +0300 (EEST) Received: by mail-qt1-f169.google.com with SMTP id 18so12715449qtz.6 for ; Mon, 19 Apr 2021 07:11:29 -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=unKxoBvpAK6IPgLwXYkW/pWj1LpQAgEKY3aucDiWnIU=; b=scwFy54g47yCsutjDrI69QTlhI1uxeXXwwMkxu99DGfMecYufviCDZhaJtttsIMC4U IDMzlIn5cc0D4FYIWJ0gtHsFIzmygR7nby6C2R+TLhx5UHYI1HqW3/f/6UoxTq5JxxJN 7MQYf7frCRFoxU4ee2s/l0M/pG/W3i5nQlUcaWdEeTp1QtvY6x/JaNX6VWIQCT0j5dSQ CKZRpt/aP5yAw53b3s36L1qqsG+hViero4DO1jXugFmm57oKxi14sbEPrKsg9ajeKq01 K9IXEaEleJFxzjNUTpiQWXoMzIQf8j7+HpwkQ+oxruUWVtOvEa/QfzTV+kpWU/r5hWVa 4yHA== 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=unKxoBvpAK6IPgLwXYkW/pWj1LpQAgEKY3aucDiWnIU=; b=tffxpwCax4sZBQXxAr0vllQADqTpWUnvWA7nlgk8sV1ArU01z2LlHZaHhXSiltyfjs eWW5CENmKNpHoDVAcMmEgQm4Yp1ljqHmxFyD5MmGRZWdU2dYOVIiaz2OZEAQl03h9UHP fTy9YO6ALZynkKr3H15I8UAWyYnMF3xpPHP0jVQOGmB5kYpyFq8vsJzajVtCBtdoO1iW DtKtXv9oadeugDCzXkTixuGLfqmzLeLvZ7D5+O2XwI00hhLuKgEvceRJEBFH9U/2Ycvc Vvk+s3omVWAKbhm9CZ227KWetMWgHS5KQo6RJi3pj+BRWeVJdrYEGzpW5aUit2ItoW9s b1pg== X-Gm-Message-State: AOAM530Vqtq0RDAWI1tZSMHrRosqCOBKPcJ8PqOaKpc5KYJgFhogRFoV C6AoRMMBWOoMeBWFKxD6XUFPTK9e/VI= X-Received: by 2002:a05:622a:1487:: with SMTP id t7mr11465128qtx.345.1618841488361; Mon, 19 Apr 2021 07:11:28 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:19 -0300 Message-Id: <20210419141024.8174-23-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 22/87] avcodec: Remove deprecated avcodec_get_context_defaults3 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: 9p1ZnZBhE0hH From: Andreas Rheinhardt Deprecated in 04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 9 --------- libavcodec/options.c | 7 ------- libavcodec/version.h | 3 --- 3 files changed, 19 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index a3c8c425cb..cbc1556e0e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2545,15 +2545,6 @@ AVCodecContext *avcodec_alloc_context3(const AVCodec *codec); */ void avcodec_free_context(AVCodecContext **avctx); -#if FF_API_GET_CONTEXT_DEFAULTS -/** - * @deprecated This function should not be used, as closing and opening a codec - * context multiple time is not supported. A new codec context should be - * allocated for each new use. - */ -int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec); -#endif - /** * Get the AVClass for AVCodecContext. It can be used in combination with * AV_OPT_SEARCH_FAKE_OBJ for examining options. diff --git a/libavcodec/options.c b/libavcodec/options.c index b8d4a9faf6..833072b192 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -160,13 +160,6 @@ static int init_context_defaults(AVCodecContext *s, const AVCodec *codec) return 0; } -#if FF_API_GET_CONTEXT_DEFAULTS -int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) -{ - return init_context_defaults(s, codec); -} -#endif - AVCodecContext *avcodec_alloc_context3(const AVCodec *codec) { AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext)); diff --git a/libavcodec/version.h b/libavcodec/version.h index af737afce1..0ce49e6892 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -66,9 +66,6 @@ #ifndef FF_API_COPY_CONTEXT #define FF_API_COPY_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_GET_CONTEXT_DEFAULTS -#define FF_API_GET_CONTEXT_DEFAULTS (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_NVENC_OLD_NAME #define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27025 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp556952iob; Mon, 19 Apr 2021 07:13:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVLXRSmNpaXDdBJVl4/k54ttg+QBsMEXmGsaFpXxa8iU6aSMFIqncIBnTytk5WuIaV2btq X-Received: by 2002:a05:6402:290:: with SMTP id l16mr15296209edv.337.1618841593849; Mon, 19 Apr 2021 07:13:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841593; cv=none; d=google.com; s=arc-20160816; b=ENgd7p1P+rSdpPQRppYO6dvI/wSi/BPQlVMcPcAf54k4+R8Ml23YBIg+a69Su9mpHE eYZgntlhRKY5Lvv5klTbRFExDArn83i0US86Rss4wu+73I4V2YREiR2uMKaWhsfYdj6q fZrlqCan0JvGroYtpqR7v3VE1b9PjWkQJCnErtL3AX9OJinTCVshp7+uvmN7iSqYhZyH L9855ZHY7j+g2eVFw2gr1IE5gOLdQ6xAyI/X9/kpTKpBdh/wa5RUuBjIcXcAW7g1xnZk Un9Ok/3tZDDctaFtAMq5qyojaXdppHJCSFeB4KOlBlWDDoDspGrv9X233UlAukj4gaE4 qPTA== 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=cL75Fu3jyPr5/IBggoyBpEjJ0TN9QXRzHdvbrXdH6zA=; b=SKSB7Skkrx8I4PEzswczPesORsmGCG3nSAElI/Q3g9xcNM8hPAGPl0uOETnGxlMcxa qarUzWb17DpY25cXsMGtEVT5LfOIKjvlRqNZumeX+zZRemf3e4/48+tQiWYvMk26hfub /E2Uis1a5U66fNO9XFCk0GJZqR2Z75Ub2O/xREd2MDxYQFu3YEn+YrO4k1s0qqvey183 9loArP20jUo8S9AcDb4CjXGsHTn8K9m7W4QQGIRsf7eicPR4Imr4/rHe8hzG0i6J2NtP gxd7lgCovQ7Pe6zHN0S2NY8vNov9rbAPgEddo10ymdFjiv44OI9zlnpSkRpthal2o7UV yfIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KavlkHeN; 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 b13si8181305ede.310.2021.04.19.07.13.13; Mon, 19 Apr 2021 07:13:13 -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=KavlkHeN; 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 A3CC0680C51; Mon, 19 Apr 2021 17:11:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30A23680BD5 for ; Mon, 19 Apr 2021 17:11:30 +0300 (EEST) Received: by mail-qk1-f175.google.com with SMTP id o5so35879670qkb.0 for ; Mon, 19 Apr 2021 07:11:30 -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=qhk+kmbnxLjs3iVPj4UwIPxXhGxRl0xIuVKE2NaFIes=; b=KavlkHeNgD4p8OyZJIC5bdtsIeARu6QTFrkk+Y11suGRi0vtWp1R6hW+BUWv9rwmfQ eTeFKOXByX6+3n+WdkJNMvzJlcaUcDfaCehx6WLwjAfMox46drGFsSBxt2ims0tZnX2f Q1wXT0dxJ8V9s+jlzNuhg02Mf4P3IRDZIw3IwjE/X43gdlXSMhR6l72PraEpjyPHsVeF Olr9vD0CGb+4ZiXdfNRTjBSiRde+Jm5V2TLaYLZ7cdEdfzcvjSLLuBX4tG7Z5rs19qwm SM1KP2wibZrLnmNWwmUdknGfoz675xIXjMkuUbjJ1R0b6D8nwAQ65iMZr6WjKH1GGOuj EOBw== 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=qhk+kmbnxLjs3iVPj4UwIPxXhGxRl0xIuVKE2NaFIes=; b=JeFcdgxZXY1PVDdZO8a/SiXyX3S4cyXma/QtSVovilnbaW4z+kA0bID82J6T/Yf2MS V8vsssl+Q2lO80GKlqJLytA5+L0WbhbyYs/9roXJn5UfFeBVWGgJiW9LI9sSQCzk9kBi Bwj8uWJecJ0CPqAMKOk4S2YMeJoIRK0flK6Or5YhD3ZIU0rC07yiF4jo66L/yz44PPKN S8s5u76oknXFQLYD1Sk40BgtuVF8nr9s7tGBF/DjiU6j2vxd+LmlOqya2H6IhaQA8bOX QQvfvLgFPiPSNzcD3+baK2uGNsbukgV12A75niYgPVM8M2SWSJIUJXj/TB7SjUsIGQLX HGAQ== X-Gm-Message-State: AOAM533S5Bh4DvM5lAUH2GeSc3K0kP06MLjKjsb5BfiF65rz4+GZM05I lOUuUlfPjYG/zqWdI1A1GYNJd+dPkgI= X-Received: by 2002:a37:e412:: with SMTP id y18mr6051480qkf.40.1618841489462; Mon, 19 Apr 2021 07:11:29 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:29 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:20 -0300 Message-Id: <20210419141024.8174-24-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 23/87] avcodec/options: Remove deprecated avcodec_copy_context 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: mweZ2yTrkMUv From: Andreas Rheinhardt Deprecated in 5f30ac27795f9f98043e8582ccaad8813104adc4. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 22 --------- libavcodec/options.c | 105 ------------------------------------------- libavcodec/version.h | 3 -- 3 files changed, 130 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index cbc1556e0e..ea60e1fe46 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2569,28 +2569,6 @@ const AVClass *avcodec_get_frame_class(void); */ const AVClass *avcodec_get_subtitle_rect_class(void); -#if FF_API_COPY_CONTEXT -/** - * Copy the settings of the source AVCodecContext into the destination - * AVCodecContext. The resulting destination codec context will be - * unopened, i.e. you are required to call avcodec_open2() before you - * can use this AVCodecContext to decode/encode video/audio data. - * - * @param dest target codec context, should be initialized with - * avcodec_alloc_context3(NULL), but otherwise uninitialized - * @param src source codec context - * @return AVERROR() on error (e.g. memory allocation error), 0 on success - * - * @deprecated The semantics of this function are ill-defined and it should not - * be used. If you need to transfer the stream parameters from one codec context - * to another, use an intermediate AVCodecParameters instance and the - * avcodec_parameters_from_context() / avcodec_parameters_to_context() - * functions. - */ -attribute_deprecated -int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src); -#endif - /** * Fill the parameters struct based on the values from the supplied codec * context. Any allocated fields in par are freed and replaced with duplicates diff --git a/libavcodec/options.c b/libavcodec/options.c index 833072b192..369110b8d0 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -193,111 +193,6 @@ void avcodec_free_context(AVCodecContext **pavctx) av_freep(pavctx); } -#if FF_API_COPY_CONTEXT -static void copy_context_reset(AVCodecContext *avctx) -{ - int i; - - av_opt_free(avctx); -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - av_frame_free(&avctx->coded_frame); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - av_freep(&avctx->rc_override); - av_freep(&avctx->intra_matrix); - av_freep(&avctx->inter_matrix); - av_freep(&avctx->extradata); - av_freep(&avctx->subtitle_header); - av_buffer_unref(&avctx->hw_frames_ctx); - av_buffer_unref(&avctx->hw_device_ctx); - 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->subtitle_header_size = 0; - avctx->nb_coded_side_data = 0; - avctx->extradata_size = 0; -} - -int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src) -{ - const AVCodec *orig_codec = dest->codec; - uint8_t *orig_priv_data = dest->priv_data; - - if (avcodec_is_open(dest)) { // check that the dest context is uninitialized - av_log(dest, AV_LOG_ERROR, - "Tried to copy AVCodecContext %p into already-initialized %p\n", - src, dest); - return AVERROR(EINVAL); - } - - copy_context_reset(dest); - - memcpy(dest, src, sizeof(*dest)); - av_opt_copy(dest, src); - - dest->priv_data = orig_priv_data; - dest->codec = orig_codec; - - if (orig_priv_data && src->codec && src->codec->priv_class && - dest->codec && dest->codec->priv_class) - av_opt_copy(orig_priv_data, src->priv_data); - - - /* set values specific to opened codecs back to their default state */ - dest->slice_offset = NULL; - dest->hwaccel = NULL; - dest->internal = NULL; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - dest->coded_frame = NULL; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - - /* reallocate values that should be allocated separately */ - dest->extradata = NULL; - dest->coded_side_data = NULL; - dest->intra_matrix = NULL; - dest->inter_matrix = NULL; - dest->rc_override = NULL; - dest->subtitle_header = NULL; - dest->hw_frames_ctx = NULL; - dest->hw_device_ctx = NULL; - dest->nb_coded_side_data = 0; - -#define alloc_and_copy_or_fail(obj, size, pad) \ - if (src->obj && size > 0) { \ - dest->obj = av_malloc(size + pad); \ - if (!dest->obj) \ - goto fail; \ - memcpy(dest->obj, src->obj, size); \ - if (pad) \ - memset(((uint8_t *) dest->obj) + size, 0, pad); \ - } - alloc_and_copy_or_fail(extradata, src->extradata_size, - AV_INPUT_BUFFER_PADDING_SIZE); - dest->extradata_size = src->extradata_size; - alloc_and_copy_or_fail(intra_matrix, 64 * sizeof(int16_t), 0); - alloc_and_copy_or_fail(inter_matrix, 64 * sizeof(int16_t), 0); - alloc_and_copy_or_fail(rc_override, src->rc_override_count * sizeof(*src->rc_override), 0); - alloc_and_copy_or_fail(subtitle_header, src->subtitle_header_size, 1); - av_assert0(dest->subtitle_header_size == src->subtitle_header_size); -#undef alloc_and_copy_or_fail - - if (src->hw_frames_ctx) { - dest->hw_frames_ctx = av_buffer_ref(src->hw_frames_ctx); - if (!dest->hw_frames_ctx) - goto fail; - } - - return 0; - -fail: - copy_context_reset(dest); - return AVERROR(ENOMEM); -} -#endif - const AVClass *avcodec_get_class(void) { return &av_codec_context_class; diff --git a/libavcodec/version.h b/libavcodec/version.h index 0ce49e6892..4c1c4b257e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -63,9 +63,6 @@ #ifndef FF_API_VBV_DELAY #define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_COPY_CONTEXT -#define FF_API_COPY_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_NVENC_OLD_NAME #define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27014 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp557120iob; Mon, 19 Apr 2021 07:13:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuuEBbXxM0nC5z3WWr+Muu+xUOjO+4CoepTPOGz88bQzpZohxQib2bDcL14W/fpr35rICv X-Received: by 2002:a17:907:98ae:: with SMTP id ju14mr22806771ejc.287.1618841604499; Mon, 19 Apr 2021 07:13:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841604; cv=none; d=google.com; s=arc-20160816; b=Rj+SvVL6WhJuMjowpVOb6jfP9BiXXYHmPf4ZYGmcleEeCyxhtLTshFF0TsKvOdaetn fsuIE+nLAl1WwvLV9TDvjsT4SF03x5KIWbluWApIiggayFErKGd8K20otN1PaYxBuY54 OpzGt0HqSecxgzTp3Zbw9tnM/VzmBAZl3GWXXEgLLLb+lSVfJV8acpmKnfk/M9Fz84Eo PmZH2fnkVWHdv6Gcy25exFOILFwL2+NrKqhy+aYyZT+yrw0zDZNt5AAtqSPCppZz4r0F qmQWVRJX3qgjRFiEeZ2mlArvp4ax76UKQ6Um+xDPYFNcfzGCZrtzAP6wXtZi18gZvURP Klqg== 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=QfzxAkove/AStZuvQW/cYqKN2XuAL1EuyyuPANfS/Ok=; b=fkvdVZ6QyZxvLOZ2CjWXJylyKRdcKjv/NNRBtYWvOV8hM4CELFmAEPdzZsTsmvVBKf g7SoEr7CDsXki/v7+SoZX3KDHVLDF/baUAOyEirNI+yqY+EAntChqdT3g+KOpJGoTg9n TMLUZr/TbtRsIc8SZm4hxsEm2wHrFW/CP4LHxCNgd1ZVUKhmOZI3cLSgXe6g0CKIisxu +rn8OwsEnUqc6mABWCYdcGc9KiQ8KEs7itP/haPBCI5Hoo/CmgfatNXaIubBTimhdIso dWSH8e2p6xHbCrG+rWVbccEzrWhihfw3J/+vvM17V0Ot5XP4gLPDeT/TifRoRqtNnC/E qzKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OaNwv0g9; 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 m11si10697219edq.183.2021.04.19.07.13.24; Mon, 19 Apr 2021 07:13:24 -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=OaNwv0g9; 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 A5139680C78; Mon, 19 Apr 2021 17:11:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CF60680C47 for ; Mon, 19 Apr 2021 17:11:32 +0300 (EEST) Received: by mail-qv1-f54.google.com with SMTP id ef17so11259008qvb.0 for ; Mon, 19 Apr 2021 07:11:32 -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=ZiDpdVp+OeaSpkm+OjcP+ZRLXTgaDvAn0OtraXPpUIo=; b=OaNwv0g9qbRaJO/7TF4SiXJR21m4yBsCt8IendiohDP+lN2qcHumLfoaqEKNxXGgXG QLyGRxSJZUX+hoChdUaR8oFhXX+yokhkhTT/WGnllin3lofwhXYeWEUsAZl0WB5mdq01 2pFgp2erSnb1nrvwMdgmvzXgeEyIigt2KLqFpI5zOctrBYvzrX8EEey61kowzT0geLPW jvkJX6b6Nei4+CWCFBNX9ohSqR09Ec2trBCarn1z97iTsFFf8N293pvGSnKIr54cocb0 hlWWESvP22WtVf4pHd3MCLorqkxRbChFRa0Qf4hiaXrib3snpx7kmy5D676P1Eiz+bDZ SGRg== 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=ZiDpdVp+OeaSpkm+OjcP+ZRLXTgaDvAn0OtraXPpUIo=; b=jqadSiB1ihUoCE+TRQMxVGZ3AliykDe79FBrFyx+vE3hrvqnWLFEcbGJ5YYC5k6qxq CPV80BZrWScSEAXFdg2xrjzjj7gBMCRJ2ahDwnfCl5I8aQHLUXdCs4/YD+2Sh9Hv4xt/ lYjFBbG9WHlXJheyXF8qdL+NXriE0N1lqKiUy9FKI9/KdE9gmS4TfIS9hlSFGCR9rHxe VZ3l37ui9FW2RN3tHdMxugd9rfKJMvdrCQfz4dJ2S7t71df6iLOqYo48wuu2mrfgic25 TBaHfou/4EA1Eb0Q4U46Z8l0sf3JXUDQRJmBhOB8Z7pcwvEM6Ir1/+TPM8sC+8t9MP5+ e7jw== X-Gm-Message-State: AOAM532HE0EvnJBLAdQwj3iUvpQORJeygj+5p3dEIdxcJD4Nedbhx0eo 34QlOOkah3qviFK2d0WXuLKkOBxGAwg= X-Received: by 2002:a0c:c488:: with SMTP id u8mr21275869qvi.47.1618841490976; Mon, 19 Apr 2021 07:11:30 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:30 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:21 -0300 Message-Id: <20210419141024.8174-25-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 24/87] avcodec/vdpau: Remove deprecated av_vdpau_get_profile 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: 1IIT33PONYmA From: Andreas Rheinhardt Deprecated in b10b6ac7a902f28e09e37a29c392e2f0c19e9526. Signed-off-by: Andreas Rheinhardt --- libavcodec/vdpau.c | 49 -------------------------------------------- libavcodec/vdpau.h | 19 ----------------- libavcodec/version.h | 3 --- 3 files changed, 71 deletions(-) diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index fa10905c75..f20dbd78e2 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -397,55 +397,6 @@ int ff_vdpau_add_buffer(struct vdpau_picture_context *pic_ctx, return 0; } -#if FF_API_VDPAU_PROFILE -int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile) -{ -#define PROFILE(prof) \ -do { \ - *profile = VDP_DECODER_PROFILE_##prof; \ - return 0; \ -} while (0) - - switch (avctx->codec_id) { - case AV_CODEC_ID_MPEG1VIDEO: PROFILE(MPEG1); - case AV_CODEC_ID_MPEG2VIDEO: - switch (avctx->profile) { - case FF_PROFILE_MPEG2_MAIN: PROFILE(MPEG2_MAIN); - case FF_PROFILE_MPEG2_SIMPLE: PROFILE(MPEG2_SIMPLE); - default: return AVERROR(EINVAL); - } - case AV_CODEC_ID_H263: PROFILE(MPEG4_PART2_ASP); - case AV_CODEC_ID_MPEG4: - switch (avctx->profile) { - case FF_PROFILE_MPEG4_SIMPLE: PROFILE(MPEG4_PART2_SP); - case FF_PROFILE_MPEG4_ADVANCED_SIMPLE: PROFILE(MPEG4_PART2_ASP); - default: return AVERROR(EINVAL); - } - case AV_CODEC_ID_H264: - switch (avctx->profile & ~FF_PROFILE_H264_INTRA) { - case FF_PROFILE_H264_BASELINE: PROFILE(H264_BASELINE); - case FF_PROFILE_H264_CONSTRAINED_BASELINE: - case FF_PROFILE_H264_MAIN: PROFILE(H264_MAIN); - case FF_PROFILE_H264_HIGH: PROFILE(H264_HIGH); -#ifdef VDP_DECODER_PROFILE_H264_EXTENDED - case FF_PROFILE_H264_EXTENDED: PROFILE(H264_EXTENDED); -#endif - default: return AVERROR(EINVAL); - } - case AV_CODEC_ID_WMV3: - case AV_CODEC_ID_VC1: - switch (avctx->profile) { - case FF_PROFILE_VC1_SIMPLE: PROFILE(VC1_SIMPLE); - case FF_PROFILE_VC1_MAIN: PROFILE(VC1_MAIN); - case FF_PROFILE_VC1_ADVANCED: PROFILE(VC1_ADVANCED); - default: return AVERROR(EINVAL); - } - } - return AVERROR(EINVAL); -#undef PROFILE -} -#endif /* FF_API_VDPAU_PROFILE */ - AVVDPAUContext *av_vdpau_alloc_context(void) { return av_mallocz(sizeof(VDPAUHWContext)); diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 4d99943369..3010094d93 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -55,7 +55,6 @@ #include "libavutil/attributes.h" #include "avcodec.h" -#include "version.h" struct AVCodecContext; struct AVFrame; @@ -153,24 +152,6 @@ int av_vdpau_get_surface_parameters(AVCodecContext *avctx, VdpChromaType *type, */ AVVDPAUContext *av_vdpau_alloc_context(void); -#if FF_API_VDPAU_PROFILE -/** - * Get a decoder profile that should be used for initializing a VDPAU decoder. - * Should be called from the AVCodecContext.get_format() callback. - * - * @deprecated Use av_vdpau_bind_context() instead. - * - * @param avctx the codec context being used for decoding the stream - * @param profile a pointer into which the result will be written on success. - * The contents of profile are undefined if this function returns - * an error. - * - * @return 0 on success (non-negative), a negative AVERROR on failure. - */ -attribute_deprecated -int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile); -#endif - /* @}*/ #endif /* AVCODEC_VDPAU_H */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 4c1c4b257e..a785e18c9e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_CODED_FRAME #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_VDPAU_PROFILE -#define FF_API_VDPAU_PROFILE (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_AVPICTURE #define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27087 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp575566iob; Mon, 19 Apr 2021 07:35:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqAhfjfRH+LhsKUzHrkwUO8JgR5k4xdA9jNnXQGvdsbbFrmZMY980ZnqBRDPnPSDjif+Yr X-Received: by 2002:aa7:d787:: with SMTP id s7mr7682609edq.240.1618842910664; Mon, 19 Apr 2021 07:35:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842910; cv=none; d=google.com; s=arc-20160816; b=Ho11+zgtm3cpdYkGsWS4x1oCR6NiTbhGKFZchjXETDm8fZG0CCckyf+Ea5+TrSOxva T19ilCcgKV/oBHtuIzfNJdDBTGhoiHiWgZhpVf7DGFKWdQsabdlw713Dak32om3j3FSv 55uCxeiWNk/9Cxu7WMab8CJ6g6jlp9BdYikJogyB6kiDkHRa6StpV0kI9KPI/2K8hlWA Ro6G5IPH1QyYOhknjWImdEa85U/jCtgfxtTrwvHEQcb4Aps8m3M1eGF7N1OAvnzLFK46 2jEGr4F8OsLBedIN418B4LvP0/+jDwtekb1+wBdVt9Yh8ozg1KK1T8GOzF54fGz9eKNe UuQw== 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=+jony3Jrp1EedJC2vH5iJk5uPXxwvM6mZ63DHinsOlc=; b=oEySsOxjZK8Fdsoe5d6Ql7fzd4Y2Dx2VOVtrNy71tK5AUakYS+fEf164ntXctKUym+ 9hfZJT+Xxm0wjXxp+0hSZjDMYQHiXBzyL1bGMyBJKO6xkkuHKlVmyJ7KV0kxs+zW7O+B CztRur31X8lmjClnuDyHaNquDyUHdKDwP50MleXfYAndrEyp1MRXvnqG4qlFRhjeN89u MPPQDMb5TeNGkT24viXXkVLbzA3zFdenS3PtSrk3eFMQ5F6BPp4ayjyuDRh+ItsU6SEv wWe1tciKhXGSkMq7kAwvVaBKVfZUhYtq7mrGfQCFMQqOl8rPAP/pnm2blKAloZGLnzCi HPRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="jpg/Y5fA"; 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 x9si6307665eje.242.2021.04.19.07.35.09; Mon, 19 Apr 2021 07:35:10 -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="jpg/Y5fA"; 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 C847068A26A; Mon, 19 Apr 2021 17:35:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C7A5689D6C for ; Mon, 19 Apr 2021 17:35:00 +0300 (EEST) Received: by mail-pg1-f174.google.com with SMTP id z16so24378853pga.1 for ; Mon, 19 Apr 2021 07:35:00 -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=FSsqgO/7D/x8+LJC+Nn5dZUM01HRhwIE1yDVktF7fBA=; b=jpg/Y5fAg9pKYsV3aqk2/iyFjLVE0aizrwvoEnZoRJ1tEeD4GfPQUcVXnYjWdyokUQ ZPS1YnTP3eNSZho8WF18n23vHNW7UWWTeh1jrVgzS4jZRG2xHsVpyjP24qnCljyPABz9 zMEkQ8i38rUYqyDs2eAdJAg0ptZevTiV8gM95QFQgM2I6qrgyRCuxrCoYwYbZDutXDtC vgYZNOieIH1lal7Tfi5cT48RTEhyykKkZk8prtR29hHGsbEHsUhWoySqxuGA/tBYDk7N uN/Odz7ADi80TZZz5ag7ZtWcEYwj2wCm4xABrVEEipBRFatyT5o+3Kkwqg2PZLBmAdxR MtBg== 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=FSsqgO/7D/x8+LJC+Nn5dZUM01HRhwIE1yDVktF7fBA=; b=gfnPvXvWGocXpd+xF29XD0yskPaZ3Dx1kHeMoBKP6UhBPQXegdNUscipZLkMXju6Fg OJQm6lkx5KWxGbZVU8wyMqkXubu4Gmy8r1L7e+Uv6sv/RdefjIJwGj0ElpfL8sAnpP6U J2X0Hh0RTrljcGheutYQ682dnB+arwP3zZFxe0m8olDw+e3HXLTXcab0+wtlFM1PzyFm SvsN0rxtENw+2YI1b22OZv2X/80HvdM+DBhZFy2Dq49CEV0V0+qEeqL1UhzUcpWvgT4H LixxPGCf2Dkafhpad6dbHj+d+K0SVh6YjK2Tl399dz40va6p7nuG4Ke2Ke9vt8tGVIYm Q52g== X-Gm-Message-State: AOAM530Ovgb/Y5PsFwN7jMQ6AmjUisvQKpUhRk608/fwDMFBOgqITIjW nWdUs6c4FBwGdi4TNDMFIpqDrXPlzMo= X-Received: by 2002:ad4:538a:: with SMTP id i10mr21716255qvv.9.1618841492219; Mon, 19 Apr 2021 07:11:32 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:31 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:22 -0300 Message-Id: <20210419141024.8174-26-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 25/87] avcodec: Remove deprecated AVPicture 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: bzctGdQiAaN3 From: Andreas Rheinhardt Deprecated in a17a7661906ba295d67afd80ac0770422e1b02b3. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 2 - libavcodec/avcodec.h | 99 -------------------- libavcodec/avpicture.c | 82 ---------------- libavcodec/dvbsubdec.c | 12 --- libavcodec/dvdsubdec.c | 18 ---- libavcodec/dvdsubenc.c | 14 --- libavcodec/imgconvert.c | 156 +------------------------------ libavcodec/libzvbi-teletextdec.c | 9 -- libavcodec/pgssubdec.c | 14 --- libavcodec/tests/.gitignore | 1 - libavcodec/tests/imgconvert.c | 46 --------- libavcodec/version.h | 3 - libavcodec/xsubdec.c | 14 --- libavcodec/xsubenc.c | 13 --- 14 files changed, 1 insertion(+), 482 deletions(-) delete mode 100644 libavcodec/avpicture.c delete mode 100644 libavcodec/tests/imgconvert.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c11645616d..31b220025b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -32,7 +32,6 @@ OBJS = ac3_parser.o \ avcodec.o \ avdct.o \ avpacket.o \ - avpicture.o \ bitstream.o \ bitstream_filters.o \ bsf.o \ @@ -1213,7 +1212,6 @@ TESTPROGS = avpacket \ celp_math \ codec_desc \ htmlsubtitles \ - imgconvert \ jpeg2000dwt \ mathops \ utils \ diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ea60e1fe46..315246e68e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2418,33 +2418,6 @@ typedef struct AVHWAccel { * @} */ -#if FF_API_AVPICTURE -/** - * @defgroup lavc_picture AVPicture - * - * Functions for working with AVPicture - * @{ - */ - -/** - * Picture data structure. - * - * Up to four components can be stored into it, the last component is - * alpha. - * @deprecated use AVFrame or imgutils functions instead - */ -typedef struct AVPicture { - attribute_deprecated - uint8_t *data[AV_NUM_DATA_POINTERS]; ///< pointers to the image data planes - attribute_deprecated - int linesize[AV_NUM_DATA_POINTERS]; ///< number of bytes per line -} AVPicture; - -/** - * @} - */ -#endif - enum AVSubtitleType { SUBTITLE_NONE, @@ -2472,13 +2445,6 @@ typedef struct AVSubtitleRect { int h; ///< height of pict, undefined when pict is not set int nb_colors; ///< number of colors in pict, undefined when pict is not set -#if FF_API_AVPICTURE - /** - * @deprecated unused - */ - attribute_deprecated - AVPicture pict; -#endif /** * data+linesize for the bitmap of this subtitle. * Can be set for text/ass as well once they are rendered. @@ -3445,71 +3411,6 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, * @} */ -#if FF_API_AVPICTURE -/** - * @addtogroup lavc_picture - * @{ - */ - -/** - * @deprecated unused - */ -attribute_deprecated -int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height); - -/** - * @deprecated unused - */ -attribute_deprecated -void avpicture_free(AVPicture *picture); - -/** - * @deprecated use av_image_fill_arrays() instead. - */ -attribute_deprecated -int avpicture_fill(AVPicture *picture, const uint8_t *ptr, - enum AVPixelFormat pix_fmt, int width, int height); - -/** - * @deprecated use av_image_copy_to_buffer() instead. - */ -attribute_deprecated -int avpicture_layout(const AVPicture *src, enum AVPixelFormat pix_fmt, - int width, int height, - unsigned char *dest, int dest_size); - -/** - * @deprecated use av_image_get_buffer_size() instead. - */ -attribute_deprecated -int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height); - -/** - * @deprecated av_image_copy() instead. - */ -attribute_deprecated -void av_picture_copy(AVPicture *dst, const AVPicture *src, - enum AVPixelFormat pix_fmt, int width, int height); - -/** - * @deprecated unused - */ -attribute_deprecated -int av_picture_crop(AVPicture *dst, const AVPicture *src, - enum AVPixelFormat pix_fmt, int top_band, int left_band); - -/** - * @deprecated unused - */ -attribute_deprecated -int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, enum AVPixelFormat pix_fmt, - int padtop, int padbottom, int padleft, int padright, int *color); - -/** - * @} - */ -#endif - /** * @defgroup lavc_misc Utility functions * @ingroup libavc diff --git a/libavcodec/avpicture.c b/libavcodec/avpicture.c deleted file mode 100644 index 56435f4fc9..0000000000 --- a/libavcodec/avpicture.c +++ /dev/null @@ -1,82 +0,0 @@ -/* - * AVPicture management routines - * Copyright (c) 2001, 2002, 2003 Fabrice Bellard - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * AVPicture management routines - */ - -#include "avcodec.h" -#include "internal.h" -#include "libavutil/common.h" -#include "libavutil/pixdesc.h" -#include "libavutil/imgutils.h" -#include "libavutil/internal.h" -#include "libavutil/colorspace.h" - -#if FF_API_AVPICTURE -FF_DISABLE_DEPRECATION_WARNINGS -int avpicture_fill(AVPicture *picture, const uint8_t *ptr, - enum AVPixelFormat pix_fmt, int width, int height) -{ - return av_image_fill_arrays(picture->data, picture->linesize, - ptr, pix_fmt, width, height, 1); -} - -int avpicture_layout(const AVPicture* src, enum AVPixelFormat pix_fmt, int width, int height, - unsigned char *dest, int dest_size) -{ - return av_image_copy_to_buffer(dest, dest_size, - (const uint8_t * const*)src->data, src->linesize, - pix_fmt, width, height, 1); -} - -int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height) -{ - return av_image_get_buffer_size(pix_fmt, width, height, 1); -} - -int avpicture_alloc(AVPicture *picture, - enum AVPixelFormat pix_fmt, int width, int height) -{ - int ret = av_image_alloc(picture->data, picture->linesize, - width, height, pix_fmt, 1); - if (ret < 0) { - memset(picture, 0, sizeof(AVPicture)); - return ret; - } - - return 0; -} - -void avpicture_free(AVPicture *picture) -{ - av_freep(&picture->data[0]); -} - -void av_picture_copy(AVPicture *dst, const AVPicture *src, - enum AVPixelFormat pix_fmt, int width, int height) -{ - av_image_copy(dst->data, dst->linesize, (const uint8_t **)src->data, - src->linesize, pix_fmt, width, height); -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_AVPICTURE */ diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index ec2304bfb9..7db1fef216 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -832,18 +832,6 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou memcpy(rect->data[1], region->computed_clut, sizeof(region->computed_clut)); } -#if FF_API_AVPICTURE -FF_DISABLE_DEPRECATION_WARNINGS -{ - int j; - for (j = 0; j < 4; j++) { - rect->pict.data[j] = rect->data[j]; - rect->pict.linesize[j] = rect->linesize[j]; - } -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - i++; } } diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index bf49788e1b..91906b9df4 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -409,15 +409,6 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header, sub_header->rects[0]->type = SUBTITLE_BITMAP; sub_header->rects[0]->linesize[0] = w; sub_header->rects[0]->flags = is_menu ? AV_SUBTITLE_FLAG_FORCED : 0; - -#if FF_API_AVPICTURE -FF_DISABLE_DEPRECATION_WARNINGS - for (i = 0; i < 4; i++) { - sub_header->rects[0]->pict.data[i] = sub_header->rects[0]->data[i]; - sub_header->rects[0]->pict.linesize[i] = sub_header->rects[0]->linesize[i]; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif } } if (next_cmd_pos < cmd_pos) { @@ -504,15 +495,6 @@ static int find_smallest_bounding_rectangle(DVDSubContext *ctx, AVSubtitle *s) s->rects[0]->x += x1; s->rects[0]->y += y1; -#if FF_API_AVPICTURE -FF_DISABLE_DEPRECATION_WARNINGS - for (i = 0; i < 4; i++) { - s->rects[0]->pict.data[i] = s->rects[0]->data[i]; - s->rects[0]->pict.linesize[i] = s->rects[0]->linesize[i]; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return 1; } diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c index 9fa9d5b6d7..e55e2eab4f 100644 --- a/libavcodec/dvdsubenc.c +++ b/libavcodec/dvdsubenc.c @@ -279,20 +279,6 @@ static int encode_dvd_subtitles(AVCodecContext *avctx, break; } -#if FF_API_AVPICTURE -FF_DISABLE_DEPRECATION_WARNINGS - for (i = 0; i < rects; i++) - if (!h->rects[i]->data[0]) { - AVSubtitleRect *rect = h->rects[i]; - int j; - for (j = 0; j < 4; j++) { - rect->data[j] = rect->pict.data[j]; - rect->linesize[j] = rect->pict.linesize[j]; - } - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - vrect = *h->rects[0]; if (rects > 1) { diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index a3443d1c72..40300f836d 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -25,13 +25,8 @@ */ #include "avcodec.h" -#include "internal.h" -#include "mathops.h" -#include "libavutil/colorspace.h" -#include "libavutil/common.h" #include "libavutil/pixdesc.h" -#include "libavutil/internal.h" -#include "libavutil/imgutils.h" +#include "libavutil/pixfmt.h" #if FF_API_AVCODEC_PIX_FMT int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, @@ -72,152 +67,3 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p return best; } -#if FF_API_AVPICTURE -FF_DISABLE_DEPRECATION_WARNINGS -/* return true if yuv planar */ -static inline int is_yuv_planar(const AVPixFmtDescriptor *desc) -{ - int i; - int planes[4] = { 0 }; - - if ( desc->flags & AV_PIX_FMT_FLAG_RGB - || !(desc->flags & AV_PIX_FMT_FLAG_PLANAR)) - return 0; - - /* set the used planes */ - for (i = 0; i < desc->nb_components; i++) - planes[desc->comp[i].plane] = 1; - - /* if there is an unused plane, the format is not planar */ - for (i = 0; i < desc->nb_components; i++) - if (!planes[i]) - return 0; - return 1; -} - -int av_picture_crop(AVPicture *dst, const AVPicture *src, - enum AVPixelFormat pix_fmt, int top_band, int left_band) -{ - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); - int y_shift; - int x_shift; - int max_step[4]; - - if (pix_fmt < 0 || pix_fmt >= AV_PIX_FMT_NB) - return -1; - - y_shift = desc->log2_chroma_h; - x_shift = desc->log2_chroma_w; - av_image_fill_max_pixsteps(max_step, NULL, desc); - - if (is_yuv_planar(desc)) { - dst->data[0] = src->data[0] + (top_band * src->linesize[0]) + left_band; - dst->data[1] = src->data[1] + ((top_band >> y_shift) * src->linesize[1]) + (left_band >> x_shift); - dst->data[2] = src->data[2] + ((top_band >> y_shift) * src->linesize[2]) + (left_band >> x_shift); - } else{ - if(top_band % (1<data[0] = src->data[0] + (top_band * src->linesize[0]) + (left_band * max_step[0]); - } - - dst->linesize[0] = src->linesize[0]; - dst->linesize[1] = src->linesize[1]; - dst->linesize[2] = src->linesize[2]; - return 0; -} - -int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, - enum AVPixelFormat pix_fmt, int padtop, int padbottom, int padleft, int padright, - int *color) -{ - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); - uint8_t *optr; - int y_shift; - int x_shift; - int yheight; - int i, y; - int max_step[4]; - - if (pix_fmt < 0 || pix_fmt >= AV_PIX_FMT_NB) - return -1; - - if (!is_yuv_planar(desc)) { - if (src) - return -1; //TODO: Not yet implemented - - av_image_fill_max_pixsteps(max_step, NULL, desc); - - if (padtop || padleft) { - memset(dst->data[0], color[0], - dst->linesize[0] * padtop + (padleft * max_step[0])); - } - - if (padleft || padright) { - optr = dst->data[0] + dst->linesize[0] * padtop + - (dst->linesize[0] - (padright * max_step[0])); - yheight = height - 1 - (padtop + padbottom); - for (y = 0; y < yheight; y++) { - memset(optr, color[0], (padleft + padright) * max_step[0]); - optr += dst->linesize[0]; - } - } - - if (padbottom || padright) { - optr = dst->data[0] + dst->linesize[0] * (height - padbottom) - - (padright * max_step[0]); - memset(optr, color[0], dst->linesize[0] * padbottom + - (padright * max_step[0])); - } - - return 0; - } - - for (i = 0; i < 3; i++) { - x_shift = i ? desc->log2_chroma_w : 0; - y_shift = i ? desc->log2_chroma_h : 0; - - if (padtop || padleft) { - memset(dst->data[i], color[i], - dst->linesize[i] * (padtop >> y_shift) + (padleft >> x_shift)); - } - - if (padleft || padright) { - optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) + - (dst->linesize[i] - (padright >> x_shift)); - yheight = (height - 1 - (padtop + padbottom)) >> y_shift; - for (y = 0; y < yheight; y++) { - memset(optr, color[i], (padleft + padright) >> x_shift); - optr += dst->linesize[i]; - } - } - - if (src) { /* first line */ - uint8_t *iptr = src->data[i]; - optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) + - (padleft >> x_shift); - memcpy(optr, iptr, (width - padleft - padright) >> x_shift); - iptr += src->linesize[i]; - optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) + - (dst->linesize[i] - (padright >> x_shift)); - yheight = (height - 1 - (padtop + padbottom)) >> y_shift; - for (y = 0; y < yheight; y++) { - memset(optr, color[i], (padleft + padright) >> x_shift); - memcpy(optr + ((padleft + padright) >> x_shift), iptr, - (width - padleft - padright) >> x_shift); - iptr += src->linesize[i]; - optr += dst->linesize[i]; - } - } - - if (padbottom || padright) { - optr = dst->data[i] + dst->linesize[i] * - ((height - padbottom) >> y_shift) - (padright >> x_shift); - memset(optr, color[i],dst->linesize[i] * - (padbottom >> y_shift) + (padright >> x_shift)); - } - } - - return 0; -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_AVPICTURE */ diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index 0cc389a28e..e056ea5ef0 100644 --- a/libavcodec/libzvbi-teletextdec.c +++ b/libavcodec/libzvbi-teletextdec.c @@ -641,7 +641,6 @@ static int teletext_decode_frame(AVCodecContext *avctx, void *data, int *got_sub TeletextContext *ctx = avctx->priv_data; AVSubtitle *sub = data; int ret = 0; - int j; if (!ctx->vbi) { if (!(ctx->vbi = vbi_decoder_new())) @@ -701,14 +700,6 @@ static int teletext_decode_frame(AVCodecContext *avctx, void *data, int *got_sub if (sub->rects) { sub->num_rects = 1; sub->rects[0] = ctx->pages->sub_rect; -#if FF_API_AVPICTURE -FF_DISABLE_DEPRECATION_WARNINGS - for (j = 0; j < 4; j++) { - sub->rects[0]->pict.data[j] = sub->rects[0]->data[j]; - sub->rects[0]->pict.linesize[j] = sub->rects[0]->linesize[j]; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif } else { ret = AVERROR(ENOMEM); } diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 9c59a2297f..eaf069017a 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -596,20 +596,6 @@ static int display_end_segment(AVCodecContext *avctx, void *data, if (!ctx->forced_subs_only || ctx->presentation.objects[i].composition_flag & 0x40) memcpy(sub->rects[i]->data[1], palette->clut, sub->rects[i]->nb_colors * sizeof(uint32_t)); - -#if FF_API_AVPICTURE -FF_DISABLE_DEPRECATION_WARNINGS -{ - AVSubtitleRect *rect; - int j; - rect = sub->rects[i]; - for (j = 0; j < 4; j++) { - rect->pict.data[j] = rect->data[j]; - rect->pict.linesize[j] = rect->linesize[j]; - } -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif } return 1; } diff --git a/libavcodec/tests/.gitignore b/libavcodec/tests/.gitignore index 92aab1b73c..69bf891f44 100644 --- a/libavcodec/tests/.gitignore +++ b/libavcodec/tests/.gitignore @@ -11,7 +11,6 @@ /h265_levels /htmlsubtitles /iirfilter -/imgconvert /jpeg2000dwt /mathops /mjpegenc_huffman diff --git a/libavcodec/tests/imgconvert.c b/libavcodec/tests/imgconvert.c deleted file mode 100644 index aefc324bf5..0000000000 --- a/libavcodec/tests/imgconvert.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Misc image conversion routines - * Copyright (c) 2001, 2002, 2003 Fabrice Bellard - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "libavcodec/imgconvert.c" - -#if FF_API_AVPICTURE -FF_DISABLE_DEPRECATION_WARNINGS -int main(void){ - int i; - int err=0; - int skip = 0; - - for (i=0; iname) { - skip ++; - continue; - } - if (skip) { - av_log(NULL, AV_LOG_INFO, "%3d unused pixel format values\n", skip); - skip = 0; - } - av_log(NULL, AV_LOG_INFO, "pix fmt %s yuv_plan:%d avg_bpp:%d\n", desc->name, is_yuv_planar(desc), av_get_padded_bits_per_pixel(desc)); - } - return err; -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_AVPICTURE */ diff --git a/libavcodec/version.h b/libavcodec/version.h index a785e18c9e..c502dd4fa9 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_CODED_FRAME #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_AVPICTURE -#define FF_API_AVPICTURE (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_VBV_DELAY #define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59) #endif diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index 87ac910577..caab330ed3 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -134,20 +134,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr, ((uint32_t *)sub->rects[0]->data[1])[i] |= (unsigned)*buf++ << 24; } -#if FF_API_AVPICTURE -FF_DISABLE_DEPRECATION_WARNINGS -{ - AVSubtitleRect *rect; - int j; - rect = sub->rects[0]; - for (j = 0; j < 4; j++) { - rect->pict.data[j] = rect->data[j]; - rect->pict.linesize[j] = rect->linesize[j]; - } -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - // process RLE-compressed data if ((ret = init_get_bits8(&gb, buf, buf_end - buf)) < 0) return ret; diff --git a/libavcodec/xsubenc.c b/libavcodec/xsubenc.c index 9139159c98..53fcb76656 100644 --- a/libavcodec/xsubenc.c +++ b/libavcodec/xsubenc.c @@ -132,19 +132,6 @@ static int xsub_encode(AVCodecContext *avctx, unsigned char *buf, if (h->num_rects != 1) av_log(avctx, AV_LOG_WARNING, "Only single rects supported (%d in subtitle.)\n", h->num_rects); -#if FF_API_AVPICTURE -FF_DISABLE_DEPRECATION_WARNINGS - if (!h->rects[0]->data[0]) { - AVSubtitleRect *rect = h->rects[0]; - int j; - for (j = 0; j < 4; j++) { - rect->data[j] = rect->pict.data[j]; - rect->linesize[j] = rect->pict.linesize[j]; - } - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - // TODO: render text-based subtitles into bitmaps if (!h->rects[0]->data[0] || !h->rects[0]->data[1]) { av_log(avctx, AV_LOG_WARNING, "No subtitle bitmap available.\n"); From patchwork Mon Apr 19 14:09:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27023 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp557260iob; Mon, 19 Apr 2021 07:13:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2N4Q4sYdKPUGz6WQ/uDOR0Db5y+wzvG9J9qHZyawLo56cY8rkYMCzsn32Al09teXtMDJ3 X-Received: by 2002:aa7:c789:: with SMTP id n9mr18978198eds.352.1618841615199; Mon, 19 Apr 2021 07:13:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841615; cv=none; d=google.com; s=arc-20160816; b=JcjDkZM6iq7fcmD7D/G4g4hRRWJFXnCdkw9EEG2mPhxhmaqrv4TS+0yGa5xQfDL2pN CIa2L3EigSlvLQrEBOg2gGtB4JdA1lQbUy6vgkhXWfolkygwvnOfTlyeEwmoiq4Ou1aa gXzobKM5OVQzixTn4paBuv/yqaVDA/qp5G4pszSNhVBANW3f6PkVZ0NhsY+3F2J8WhLd 6xQW9uZ3Z0O2PuJw1kzkOjvUc84fKa0esULhPyndi6KIcHiagf7jZ/lyVajUqimBxsUW ZEjqJMdOUtNc0X3310WqNYQ46XE8I2/d+JIT73ybor5tHMoVoT3tBfbBqSB3oKcIkkKv gF2Q== 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=XHg44m5soiPCt6yqNzBFBtHeZiTv+VmCV9VH3hAfxqQ=; b=ATZvWMKEBsP9rb1wtfX0QoL4qIb0sWoETur0CQN6CS9mjg5770NJR5zupPgLUSxSNG 4uZoxPiChnYxHySsAbaU2qkIb+XKubbfPNqpGTNQ75m5JlFBUhuWxGJxTO/aqiWg9YQ7 3GDFvBwccXGkAUioW4YIjkufBt3ZdPUn94wK2DTWyeJu1JwP+9xln7Ia2htGp1eG33x8 rgk9UqoSx6cXELyoyZ2TDNQCT6yv15Mj2mhSc9PYhdy90xrFjZa21cTqZ4NSkG0boVOD wJ49ugU+kq1Fgtwabgjwue4DnSNDyG+oygMSLZehthBvdlek374f4aptFd1fCw+v70Lo ynFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NgzXMY17; 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 r1si11405819edp.303.2021.04.19.07.13.34; Mon, 19 Apr 2021 07:13:35 -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=NgzXMY17; 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 A75E9680CCA; Mon, 19 Apr 2021 17:11:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0F1F680C80 for ; Mon, 19 Apr 2021 17:11:34 +0300 (EEST) Received: by mail-qk1-f171.google.com with SMTP id y136so3756709qkb.1 for ; Mon, 19 Apr 2021 07:11:34 -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=9R0owzWXVNDvseqd1W6J4+lPv7LUr2KLQQjx7rev6qM=; b=NgzXMY17EEDWBlR1T9FjS/8ykkteb7c2Zo5Mtn4KTTXrXNBneFDxWDVdgOKBFyT6LV eqrr/3+0eM42VdKvnV8DdVw2uvLIFyJ4XXQRY0rVrJJukHobvNO02qP0SN1UEECfFOPu aWokI9xHSVsvltEwUqlndmlhQd45ZgsSBuMiLpELYZijWL3Ec/dAAFz2LFcPs9k/fvDo Y/YqR2A8Qm9cZaUaLYEHy/iXT0mQQVMdhSHzPaAu6a0yywRtJaEQ8Yrnzjj4Z2utLRsd jE++Z5q2OAKMMlLXft/pxESASh3BRC4sxR3/57yGyL+ByFVeJQEjb03nsLFA3X+di8xM DyYg== 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=9R0owzWXVNDvseqd1W6J4+lPv7LUr2KLQQjx7rev6qM=; b=r67KdURYVIKmLEWAF8NcubvTHojrD0O3hjh+HP6Ev2zMVb1pCO3NyNEFYzJmZDtUWM b2Miy1I0AULYf7IVYRbSBmF4gs6UIK+RDlpwhi6Krztz97WeyAT04bcuODj+kBZWiz4J mfAjFUw1ll1TIhWN9pp1z4g9CT1xjHObQK18Wz9BRKgoUPVcL+SKc6yqnnSCA0kNPZjr XeziATUpcedkp03NFi6vIcdd/Xz28lyy/bNWZgJuYU9LuO8cogeJEck1HOLBTgzPqIBE rnKydVl8AZAMfC1qVd3PLOXT0njIj8dXIG7vqURxNAXjgBgAUbBznLhjgIzDUfHUsu6y CbFA== X-Gm-Message-State: AOAM530rp12HUvUixDxbITzt8bsweQaGLVsQVK3fO3OCfyz/DVOBdOdf 4L60Uqy4nOml6nOojHyrPjt1W7NVX3U= X-Received: by 2002:a37:a008:: with SMTP id j8mr12432956qke.201.1618841493320; Mon, 19 Apr 2021 07:11:33 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:23 -0300 Message-Id: <20210419141024.8174-27-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 26/87] avcodec/imgconvert: Remove deprecated parts of pixel format 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: RBpqV4ilDFx3 From: Andreas Rheinhardt Deprecated in 617e866e25b72fa5d9f9d6bbcbd7e4bd69e63a54 and 2a54ae9df8cbc1717b3929222ac75f384e2ff240. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 19 ------------------- libavcodec/imgconvert.c | 21 --------------------- libavcodec/version.h | 3 --- 3 files changed, 43 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 315246e68e..909fb9172b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3455,25 +3455,6 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); -#if FF_API_AVCODEC_PIX_FMT -/** - * @deprecated see av_get_pix_fmt_loss() - */ -attribute_deprecated -int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt, - int has_alpha); -/** - * @deprecated see av_find_best_pix_fmt_of_2() - */ -attribute_deprecated -enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, - enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); - -attribute_deprecated -enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, - enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); -#endif - enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum AVPixelFormat * fmt); /** diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 40300f836d..96511ac7d6 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -28,27 +28,6 @@ #include "libavutil/pixdesc.h" #include "libavutil/pixfmt.h" -#if FF_API_AVCODEC_PIX_FMT -int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, - enum AVPixelFormat src_pix_fmt, - int has_alpha) -{ - return av_get_pix_fmt_loss(dst_pix_fmt, src_pix_fmt, has_alpha); -} - -enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, - enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr) -{ - return av_find_best_pix_fmt_of_2(dst_pix_fmt1, dst_pix_fmt2, src_pix_fmt, has_alpha, loss_ptr); -} - -enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, - enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr) -{ - return av_find_best_pix_fmt_of_2(dst_pix_fmt1, dst_pix_fmt2, src_pix_fmt, has_alpha, loss_ptr); -} - -#endif enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *pix_fmt_list, enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr){ diff --git a/libavcodec/version.h b/libavcodec/version.h index c502dd4fa9..0595af73de 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -78,9 +78,6 @@ #ifndef FF_API_OLD_ENCDEC #define FF_API_OLD_ENCDEC (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_AVCODEC_PIX_FMT -#define FF_API_AVCODEC_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_MPV_RC_STRATEGY #define FF_API_MPV_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27019 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp557426iob; Mon, 19 Apr 2021 07:13:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0rk6YF81ylfENl192FIHip1L1vsHYbnXg1EQgrbV18sCx5yFkQ5y9wQyBv4Z6ldCqEzPd X-Received: by 2002:aa7:cfd0:: with SMTP id r16mr12739878edy.330.1618841625919; Mon, 19 Apr 2021 07:13:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841625; cv=none; d=google.com; s=arc-20160816; b=0/odwsK5T2kJKyQDOhcg6B5OVHlHDxO6KDXAw5QOycU6qw8LfiVciCGuuOx0hnnSb8 YqZfEjeYcfD0tiGXUi46fw0bSyB7Cyc6X1H3+B4wsMZf0/4A08zrotPSPb6qI5VJ6nPr EsVjZe5fT4nAh3jxP3pMpZoZly5fBktOq4m9YpTWqwzwBqQcTpUcYX8i7nvoofBAsW/9 hsVhypimWM5DDah9onqRR2I/STObzglz3hd6Ds61ev4GHv095Hzo19scD5Rxr+yXGUTe AyU9FJh+q13lNU6SDm9LRKuVCBjNU40SMFLz2ha3bPzuwOstuEFWZu7sdoFOaPDjEuED qY4A== 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=X+/SlBVW3e4m8i/BFmRRoxHg6W2qos51jHI/1Eq4Bes=; b=rix7eGNfnAdMOA8Rv6LSHfIAidYc9ZWghXnjokyZrVDYSAKzde6k9huuEQmx1KMUZZ KLjaC3+qdlAy5Jz8gmyVEQceJjxMPGt2YVoRSLhDceMQqTejojJbLnaVqqLbRP1HQw1I +BtOeLOg4dn0jpczdIxbpbhu+2laav8cpTQL3nVUOF26N+uat9FdfXr6WAY/zBT3L+Qy GnMHmJc74/zEJHpQqZ92AykGoURXZaa/VT9UFj5WZ3TkO5rL48gSZ/dl5Xiem6tlpeyE RQlVyuc/vUVMAFc1SVgJXa5LtDmYkRD7AEUtl3Loggavy/1GoljKaNY3EwEIUqqtu/rG BLug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RHzqFuAg; 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 s13si5536414edr.443.2021.04.19.07.13.45; Mon, 19 Apr 2021 07:13:45 -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=RHzqFuAg; 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 B1E4A680CDF; Mon, 19 Apr 2021 17:11:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5FDC680C80 for ; Mon, 19 Apr 2021 17:11:35 +0300 (EEST) Received: by mail-qk1-f171.google.com with SMTP id e13so26001705qkl.6 for ; Mon, 19 Apr 2021 07:11:35 -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=UTqupjVeMR+60iBRcZ0TKNt60mLTaNu4qNXmZcBs+WA=; b=RHzqFuAglWKLa/PYi9CKA1etfApbHj2G6V0+cFDTR36p9b9ONANTe4EJhTWqpIP13S ZdtK0GYQXvmrKTQb0k/V9kShk/0Ac35vYu6T4omrPlQzeilSIi2Et2Jvs2tDe0i/0eEd kLqNlU+qM0L7U+Jq61fY+9UdYfy3VnePOmlAq8urYN1UoHKzSGn94nHeWlhUoDwiOnCg ruAzATpsVexTs5V1RHkDWuw/ReDG5+gx92s6wiaMk0FrDkKHL9bjHYiOQRwonCv7i8v7 iOqpjZrmujzeBxB6umN0ye/vdJoUHjAGbhQYicsms2gToUYNOBC8BXiQ8mtDqb+XgArE 0cLw== 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=UTqupjVeMR+60iBRcZ0TKNt60mLTaNu4qNXmZcBs+WA=; b=hK4l34LKbXxrB7ZPUG20JGkCNEaIF97+vkEvjpE+c+xuXqBnbp/g+/WZ5orgrgQxro 7sgjg77KitOutcGWA2vDZGD+gv5GFZ+TRtdXkO6qNcQkp3xjfeG09JXyyPTazJjF/XRH fjTkWeLeQ+mW1SSAd6/rSsJDpQ+1QddJasa3hQh/9HDoSJlaEBloxB077GUaVCdZabaf pjOm3/u3M969qsEtRrriwIpKDRMEnijWW/j26cY1g+NbQ0ei8p9oa/Y+9zn3EBApoQBO k+KwWFZuhoS1n7r2Zgl2zPQeqlzn3m74sktT0Xl6Y4UnipkUkutGe0B8B6Hz+5cHfFqp bzVg== X-Gm-Message-State: AOAM531283fun26LOIkeuLBpj0j8bvz5aiQsuxj9x0dkDS44Or3v4Mmf cL6M5QN4qohRipdQs8I/H1eYtP4obZs= X-Received: by 2002:a37:dce:: with SMTP id 197mr12051971qkn.180.1618841494409; Mon, 19 Apr 2021 07:11:34 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:24 -0300 Message-Id: <20210419141024.8174-28-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 27/87] avcodec: Remove deprecated VBV delay field 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: q+k1rlkZ7/rA From: Andreas Rheinhardt Deprecated in 2507b5dd674834be7261772996f47ae3b95cca69. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 13 ------------- libavcodec/mpegvideo_enc.c | 6 ------ libavcodec/version.h | 3 --- 3 files changed, 22 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 909fb9172b..89e32f1c80 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1854,19 +1854,6 @@ typedef struct AVCodecContext { uint8_t *subtitle_header; int subtitle_header_size; -#if FF_API_VBV_DELAY - /** - * VBV delay coded in the last frame (in periods of a 27 MHz clock). - * Used for compliant TS muxing. - * - encoding: Set by libavcodec. - * - decoding: unused. - * @deprecated this value is now exported as a part of - * AV_PKT_DATA_CPB_PROPERTIES packet side data - */ - attribute_deprecated - uint64_t vbv_delay; -#endif - /** * Audio only. The number of "priming" samples (padding) inserted by the * encoder at the beginning of the audio. I.e. this number of leading diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 1613d06023..8785f25787 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1913,12 +1913,6 @@ vbv_retry: av_freep(&props); return ret; } - -#if FF_API_VBV_DELAY -FF_DISABLE_DEPRECATION_WARNINGS - avctx->vbv_delay = vbv_delay * 300; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } s->total_bits += s->frame_bits; diff --git a/libavcodec/version.h b/libavcodec/version.h index 0595af73de..147bcb08a4 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_CODED_FRAME #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_VBV_DELAY -#define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_NVENC_OLD_NAME #define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27021 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp557587iob; Mon, 19 Apr 2021 07:13:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjybuw37Jc761nJwjppq+Y99Xny/ezVdNFvQQG7TqW56kn3G14ex0xwdMCS9S6PZiztov9 X-Received: by 2002:aa7:cd52:: with SMTP id v18mr25702909edw.97.1618841635829; Mon, 19 Apr 2021 07:13:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841635; cv=none; d=google.com; s=arc-20160816; b=tfv9iTMa/VFAxAf3ilfGjvM3yOMlUYsDxPYNotoHxEpSTW9sn4tjDDTKOqPIIABgsP snYfP0qf8hrNXoVLwDwsa8HX7uIT8upiZWrIiytf/KVjYMH4y44KI1GTowJZw+6USHb5 JenyQ+FofqZDcjXQHBnr234JaNqTad0IibuM2zw/p/Ox7fiS5GlZkmhkd0vzoB07a42l jHtTlFWvHt+BfMo0ZpRThNhGiOXOPIm1WEXIwtFR8d8XPdbGNojuol0dCkf4yt8VZKuy 1rq5ZXkRU4aC9ChJ0jD6B0K1il3do1S5JMDz2AzDTz6ZnifuAHMPvQJn/rq12DxrWo7C um0A== 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=Y0BaRYn/ubF32p30dUcFuNGML4avSteEEZCGKwTSaAU=; b=EnjG0087Ghrs/y6C5PBe46tx/z++LknSpTtLxgGdjC2eoysRYK9Pk2O5jW7y7EnbHf lqnKpU7HcYWEbyDomH9U8A/GzrVcWa0YWpVh2vM+AJ1FiVj1ak/RM5p01bN0o276HdTv fX8OS0Vo2xpOUCup5q4w5GcV9FCh8+LUjE2qy0GUvtGKCZvUFzscoPjA7L3FWmENKY/I ZXQ6UCxAcoDLIFMJHTiiPgJJLcr4kxYW+K21PVYB/4cGR81bali5wu93En8tchBWw3Di MUNMutLm0GSTq6xzM3vib3z8tMjOx4IJX69Wnv8mrdhxGC1xvzpJDkCERl8DDJWy7CiN YP4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LmXjv1K4; 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 v5si2226200edq.440.2021.04.19.07.13.55; Mon, 19 Apr 2021 07:13:55 -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=LmXjv1K4; 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 9B564680CF1; Mon, 19 Apr 2021 17:11:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02E6E680CE8 for ; Mon, 19 Apr 2021 17:11:36 +0300 (EEST) Received: by mail-qk1-f178.google.com with SMTP id s5so27071503qkj.5 for ; Mon, 19 Apr 2021 07:11:36 -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=IrEQkA6VJMpnxCYKH4OlCE9RQvcSJaq3682is8XYqWw=; b=LmXjv1K4z5UTrCdSbq+oVQSDKhVc7/EL4DKXeYRHdGiwRoa6wP8Y3iiP4+eHB6gkDT h46VVrd2yFReUcw/CuuRfGXikDwpT07E7aOnOkx4w/5oP817e3f16D5sGQqWL+zyoV1L GuMY5G+UxIxbLljsMQLuiXI0VvTuANoEcNe6lHu7J1nrCPQVxqSd5SV9PL8/gN2u74GA kMuFKK9nMhRrYMX/489kLnwC8W/i28vLLcaBXVZy0YDjwScffyLo1aKCd+BN1panDLYM MG8MPLwn7WuclUUm2pQxrxcvIFPHVH//cBQL/Oc/YChE66DABFeM5FEx9jOf7FCtFEPE w1aw== 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=IrEQkA6VJMpnxCYKH4OlCE9RQvcSJaq3682is8XYqWw=; b=hCrNPRj8azJIcneOLfZJ54q9KP+8Ci7Wyqv0vS4x8CTxseSBfZTePlXuOTtdIQQI/c ZKAscxIKmLPQ10KlgSBBCBdzTDIuGIyp43vv6HQ8r0kHXP1G0PHIIuUyMJSTasyRsVWS xp4TkRsHuD1myBgdUw/mBvolnx/ngJHaabC0I+SzUwjadp1Lrg/Zg253Hi1SN9zOzqnL bbnmct/erjQF7JItwkm066ucLMFEIRSBG55/xZNPch5u9lyxh8rZTgrCXyuCHom4RBM5 gyenu5mX6nO1xS4C+j8R5a/9cLN21W6HrNYJRHtsGZRY0CxA8MPUMUeYBydBbmevJia3 WYMw== X-Gm-Message-State: AOAM533x2fvKzNPCUhs3L5jXWjmclDiIK/UH1KqmRmJxGNpCHLeDO1vw UfgIFwCpUVlrxtLmvM6iGu/PT6zljNM= X-Received: by 2002:a37:492:: with SMTP id 140mr4233532qke.161.1618841495589; Mon, 19 Apr 2021 07:11:35 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:25 -0300 Message-Id: <20210419141024.8174-29-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 28/87] avcodec: Remove deprecated old aliases for NVENC encoders 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: 8njpDPvTnC3J From: Andreas Rheinhardt Deprecated in 888a5c794778a2f2aad22e9b4a3952dff92b11fa. Signed-off-by: Andreas Rheinhardt --- libavcodec/allcodecs.c | 6 ---- libavcodec/nvenc_h264.c | 69 ----------------------------------------- libavcodec/nvenc_hevc.c | 37 ---------------------- libavcodec/version.h | 3 -- 4 files changed, 115 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 3194232500..cf6fe2055b 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -27,7 +27,6 @@ #include "config.h" #include "libavutil/thread.h" #include "avcodec.h" -#include "version.h" extern AVCodec ff_a64multi_encoder; extern AVCodec ff_a64multi5_encoder; @@ -796,11 +795,6 @@ extern AVCodec ff_h264_qsv_encoder; extern AVCodec ff_h264_v4l2m2m_encoder; extern AVCodec ff_h264_vaapi_encoder; extern AVCodec ff_h264_videotoolbox_encoder; -#if FF_API_NVENC_OLD_NAME -extern AVCodec ff_nvenc_encoder; -extern AVCodec ff_nvenc_h264_encoder; -extern AVCodec ff_nvenc_hevc_encoder; -#endif extern AVCodec ff_hevc_amf_encoder; extern AVCodec ff_hevc_cuvid_decoder; extern AVCodec ff_hevc_mediacodec_decoder; diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 4c2585876e..ea7390cbf1 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -198,75 +198,6 @@ static const AVCodecDefault defaults[] = { { NULL }, }; -#if FF_API_NVENC_OLD_NAME - -static av_cold int nvenc_old_init(AVCodecContext *avctx) -{ - av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated, use 'h264_nvenc' instead\n"); - return ff_nvenc_encode_init(avctx); -} - -#if CONFIG_NVENC_ENCODER -static const AVClass nvenc_class = { - .class_name = "nvenc", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - -AVCodec ff_nvenc_encoder = { - .name = "nvenc", - .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC H.264 encoder"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_H264, - .init = nvenc_old_init, - .receive_packet = ff_nvenc_receive_packet, - .close = ff_nvenc_encode_close, - .flush = ff_nvenc_encode_flush, - .priv_data_size = sizeof(NvencContext), - .priv_class = &nvenc_class, - .defaults = defaults, - .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | - AV_CODEC_CAP_ENCODER_FLUSH, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .pix_fmts = ff_nvenc_pix_fmts, - .wrapper_name = "nvenc", - .hw_configs = ff_nvenc_hw_configs, -}; -#endif - -/* Add an alias for nvenc_h264 */ -#if CONFIG_NVENC_H264_ENCODER -static const AVClass nvenc_h264_class = { - .class_name = "nvenc_h264", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - -AVCodec ff_nvenc_h264_encoder = { - .name = "nvenc_h264", - .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC H.264 encoder"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_H264, - .init = nvenc_old_init, - .receive_packet = ff_nvenc_receive_packet, - .close = ff_nvenc_encode_close, - .flush = ff_nvenc_encode_flush, - .priv_data_size = sizeof(NvencContext), - .priv_class = &nvenc_h264_class, - .defaults = defaults, - .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | - AV_CODEC_CAP_ENCODER_FLUSH, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .pix_fmts = ff_nvenc_pix_fmts, - .wrapper_name = "nvenc", - .hw_configs = ff_nvenc_hw_configs, -}; -#endif - -#endif - static const AVClass h264_nvenc_class = { .class_name = "h264_nvenc", .item_name = av_default_item_name, diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 441e7871d2..1aacec5f9c 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -179,43 +179,6 @@ static const AVCodecDefault defaults[] = { { NULL }, }; -#if FF_API_NVENC_OLD_NAME - -static av_cold int nvenc_old_init(AVCodecContext *avctx) -{ - av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated, use 'hevc_nvenc' instead\n"); - return ff_nvenc_encode_init(avctx); -} - -static const AVClass nvenc_hevc_class = { - .class_name = "nvenc_hevc", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - -AVCodec ff_nvenc_hevc_encoder = { - .name = "nvenc_hevc", - .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC hevc encoder"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_HEVC, - .init = nvenc_old_init, - .receive_packet = ff_nvenc_receive_packet, - .close = ff_nvenc_encode_close, - .flush = ff_nvenc_encode_flush, - .priv_data_size = sizeof(NvencContext), - .priv_class = &nvenc_hevc_class, - .defaults = defaults, - .pix_fmts = ff_nvenc_pix_fmts, - .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | - AV_CODEC_CAP_ENCODER_FLUSH, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .wrapper_name = "nvenc", - .hw_configs = ff_nvenc_hw_configs, -}; - -#endif - static const AVClass hevc_nvenc_class = { .class_name = "hevc_nvenc", .item_name = av_default_item_name, diff --git a/libavcodec/version.h b/libavcodec/version.h index 147bcb08a4..6e4a665b07 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_CODED_FRAME #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_NVENC_OLD_NAME -#define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_STRUCT_VAAPI_CONTEXT #define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27113 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp1093864yba; Mon, 19 Apr 2021 07:14:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxavlXyrFF5s+gEA98ZnSEZBmCEiq9vcNBN+kCMBEX2Y4IedYcDY6qkFm2J6dIyZCt1VFNj X-Received: by 2002:a17:906:b28c:: with SMTP id q12mr22630829ejz.284.1618841648222; Mon, 19 Apr 2021 07:14:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841648; cv=none; d=google.com; s=arc-20160816; b=xnHOafIQPxiJmEFndmTnEZRNRtPtND71/eIk/xufMcXAA/AK+LrwxyUO2hH6wBrRlU j2ioLcV7s9teL0N/FsMWCO0fFCNTiSunQg6pAKUYQKvpVMJlfzbD3zj+YTZjYTUnJWpd boeCmvDtY1ANL1AgiNKajlwxER9/KqUqBrTdseeJem/2E72YUw9BgmdJm+JtNMwZANHG VA7CWsQP7m3/S2G4hJ+YL5p3jMVSggNr3kD40p3BO+N/Ws5P52ZP+tA48Dl+eCRobl7S T/9hitqP2dN7zd7ty/WrEw4EKsBNZn7yJ8IfZcN7VRDye2iYTU/HyFz6oO0LU0eo1BbP pCNw== 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=157CSiA2xExYE9n2IXvzyimufz3rSxjm5Dju4NjJgcA=; b=Nl1RzjGsk60AFYe7Emd/xdxe7T4JJru46LY7T18azm0kwgqoYLWYP/soIAvX3WNZGm dWzBu07b61h/ZLupkNnM29zjIB4OKIb2iRCwgAcU24C0uxjPhLSdU+pDCyILDGt4Q9Xm iNvToEQ8ltucSKoPqxF1OxBW/pm04u3Y/EUTQd8CwndvEdda72FMzWodjQsWSfrdhkdm 02gDeNt9EfmPiC+9jaECR+Oq0N02C7hM8R5eclRJSSEL8lz5ghIvx7AFZ5YPlX/pxWJm KNVhHheRqNj/CdD4v7k3/NUgFKegm2G+U+B3QyJeUeGcr3OeA8Q9XLMUKn8x8xy7MQf6 fJNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nalUfiJa; 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 c17si12479201edj.86.2021.04.19.07.14.07; Mon, 19 Apr 2021 07:14:08 -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=nalUfiJa; 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 17CDE68185F; Mon, 19 Apr 2021 17:11:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94CDA680CF4 for ; Mon, 19 Apr 2021 17:11:38 +0300 (EEST) Received: by mail-qt1-f175.google.com with SMTP id o2so12709992qtr.4 for ; Mon, 19 Apr 2021 07:11:38 -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=gHnZb9FQxfPFMTsuMCGpIiDfOSheDvmBKGaGC+ULbUQ=; b=nalUfiJanUvFQgjfrhxFC+ODd5BKCSCd75uBgNqk3IA+AlrdvqvR6Q5DHtVR2aisTv qwSufRn7M6eDUoGR0YY2qO8ZdzqdCoOB8dlPLqZPURTF8IrO5T1PPUF0OuUVuKpWua0M iirtqIhc9WBaQ4wU9BWSSIBmB8pd6lWZG90JYGWNHHZsqyY+sE8i1qjJS4A1VUM866+u g2lHkXE/3yeXkmRGu04BkK0D30e0C/Fym+2DsdMwogWaQOEHGki8shJ31KeMmd5KrM9i kF+w8h6FmnSV3cYk+7HfphlrtxffFO1Y+glcndywIU03zXPRwEydlbaYoYUOG1CGy5fy Zr0g== 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=gHnZb9FQxfPFMTsuMCGpIiDfOSheDvmBKGaGC+ULbUQ=; b=J8iJ4Y1cYD6Euw027xnUn8A0/FZedqFR2E9CqjU5KqjvrAzaFOeE63drhPsoBqCGhn tWar7nJW8Da9bZ/jjkoOJ12tuJUm8tBEgMBzNqcXDqAw/PM9GRBdO4UJhd9uzMLvSGPR BQGjO0mUdhDOF4mIP6gSWXUnzsyKeCb+bO+Uf81SdMn/J+i+ptV3vUjYGXgsx4MAiQW6 6xRU0BFYMNggBGWE7qED0j5lgXgvcLw2Jv0vyL5eROyRHJP8BlsX4dWKstDtPvJigcGt HoVWSp0Tz24j/iWnsG7wbzn1Caaavd+E5x4kHseOnhMmY4ABMnXNRgSgPptITN0XTSKD VHMg== X-Gm-Message-State: AOAM5330Vk7cfALZItrJ8CGeyR7a8qlkHEreD7raXl7ybE79TRfdrfaf dy+NRrtM0/vFInMRmjuOtM0f1sYRz1I= X-Received: by 2002:ac8:58c2:: with SMTP id u2mr11833706qta.209.1618841496808; Mon, 19 Apr 2021 07:11:36 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:36 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:26 -0300 Message-Id: <20210419141024.8174-30-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 29/87] avcodec/vaapi: Remove old and deprecated VAAPI context and header 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: 11g+MRx7HpLh Content-Length: 8856 From: Andreas Rheinhardt Deprecated in 851960f6f8cf1f946fe42fa36cf6598fac68072c. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 1 - libavcodec/avcodec.h | 3 +- libavcodec/vaapi.h | 86 --------------------------------------- libavcodec/vaapi_decode.c | 53 ------------------------ libavcodec/vaapi_decode.h | 13 ------ libavcodec/version.h | 3 -- 6 files changed, 1 insertion(+), 158 deletions(-) delete mode 100644 libavcodec/vaapi.h diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 31b220025b..a640c548e5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -19,7 +19,6 @@ HEADERS = ac3_parser.h \ mediacodec.h \ packet.h \ qsv.h \ - vaapi.h \ vdpau.h \ version.h \ videotoolbox.h \ diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 89e32f1c80..e817befa1c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1522,8 +1522,7 @@ typedef struct AVCodecContext { * For some hardware accelerators, a global context needs to be * provided by the user. In that case, this holds display-dependent * data FFmpeg cannot instantiate itself. Please refer to the - * FFmpeg HW accelerator documentation to know how to fill this - * is. e.g. for VA API, this is a struct vaapi_context. + * FFmpeg HW accelerator documentation to know how to fill this. * - encoding: unused * - decoding: Set by user */ diff --git a/libavcodec/vaapi.h b/libavcodec/vaapi.h deleted file mode 100644 index 2cf7da5889..0000000000 --- a/libavcodec/vaapi.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Video Acceleration API (shared data between FFmpeg and the video player) - * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1 - * - * Copyright (C) 2008-2009 Splitted-Desktop Systems - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_VAAPI_H -#define AVCODEC_VAAPI_H - -/** - * @file - * @ingroup lavc_codec_hwaccel_vaapi - * Public libavcodec VA API header. - */ - -#include -#include "libavutil/attributes.h" -#include "version.h" - -#if FF_API_STRUCT_VAAPI_CONTEXT - -/** - * @defgroup lavc_codec_hwaccel_vaapi VA API Decoding - * @ingroup lavc_codec_hwaccel - * @{ - */ - -/** - * This structure is used to share data between the FFmpeg library and - * the client video application. - * This shall be zero-allocated and available as - * AVCodecContext.hwaccel_context. All user members can be set once - * during initialization or through each AVCodecContext.get_buffer() - * function call. In any case, they must be valid prior to calling - * decoding functions. - * - * Deprecated: use AVCodecContext.hw_frames_ctx instead. - */ -struct attribute_deprecated vaapi_context { - /** - * Window system dependent data - * - * - encoding: unused - * - decoding: Set by user - */ - void *display; - - /** - * Configuration ID - * - * - encoding: unused - * - decoding: Set by user - */ - uint32_t config_id; - - /** - * Context ID (video decode pipeline) - * - * - encoding: unused - * - decoding: Set by user - */ - uint32_t context_id; -}; - -/* @} */ - -#endif /* FF_API_STRUCT_VAAPI_CONTEXT */ - -#endif /* AVCODEC_VAAPI_H */ diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 57a0eb4e6e..958ddf49da 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -640,46 +640,6 @@ int ff_vaapi_decode_init(AVCodecContext *avctx) ctx->va_config = VA_INVALID_ID; ctx->va_context = VA_INVALID_ID; -#if FF_API_STRUCT_VAAPI_CONTEXT - if (avctx->hwaccel_context) { - av_log(avctx, AV_LOG_WARNING, "Using deprecated struct " - "vaapi_context in decode.\n"); - - ctx->have_old_context = 1; - ctx->old_context = avctx->hwaccel_context; - - // Really we only want the VAAPI device context, but this - // allocates a whole generic device context because we don't - // have any other way to determine how big it should be. - ctx->device_ref = - av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI); - if (!ctx->device_ref) { - err = AVERROR(ENOMEM); - goto fail; - } - ctx->device = (AVHWDeviceContext*)ctx->device_ref->data; - ctx->hwctx = ctx->device->hwctx; - - ctx->hwctx->display = ctx->old_context->display; - - // The old VAAPI decode setup assumed this quirk was always - // present, so set it here to avoid the behaviour changing. - ctx->hwctx->driver_quirks = - AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS; - - } -#endif - -#if FF_API_STRUCT_VAAPI_CONTEXT - if (ctx->have_old_context) { - ctx->va_config = ctx->old_context->config_id; - ctx->va_context = ctx->old_context->context_id; - - av_log(avctx, AV_LOG_DEBUG, "Using user-supplied decoder " - "context: %#x/%#x.\n", ctx->va_config, ctx->va_context); - } else { -#endif - err = ff_decode_get_hw_frames_ctx(avctx, AV_HWDEVICE_TYPE_VAAPI); if (err < 0) goto fail; @@ -709,9 +669,6 @@ int ff_vaapi_decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_DEBUG, "Decode context initialised: " "%#x/%#x.\n", ctx->va_config, ctx->va_context); -#if FF_API_STRUCT_VAAPI_CONTEXT - } -#endif return 0; @@ -725,12 +682,6 @@ int ff_vaapi_decode_uninit(AVCodecContext *avctx) VAAPIDecodeContext *ctx = avctx->internal->hwaccel_priv_data; VAStatus vas; -#if FF_API_STRUCT_VAAPI_CONTEXT - if (ctx->have_old_context) { - av_buffer_unref(&ctx->device_ref); - } else { -#endif - if (ctx->va_context != VA_INVALID_ID) { vas = vaDestroyContext(ctx->hwctx->display, ctx->va_context); if (vas != VA_STATUS_SUCCESS) { @@ -748,9 +699,5 @@ int ff_vaapi_decode_uninit(AVCodecContext *avctx) } } -#if FF_API_STRUCT_VAAPI_CONTEXT - } -#endif - return 0; } diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h index 6b415dd1d3..6beda14e52 100644 --- a/libavcodec/vaapi_decode.h +++ b/libavcodec/vaapi_decode.h @@ -27,11 +27,6 @@ #include "avcodec.h" -#include "version.h" -#if FF_API_STRUCT_VAAPI_CONTEXT -#include "vaapi.h" -#endif - static inline VASurfaceID ff_vaapi_get_surface_id(AVFrame *pic) { return (uintptr_t)pic->data[3]; @@ -56,14 +51,6 @@ typedef struct VAAPIDecodeContext { VAConfigID va_config; VAContextID va_context; -#if FF_API_STRUCT_VAAPI_CONTEXT -FF_DISABLE_DEPRECATION_WARNINGS - int have_old_context; - struct vaapi_context *old_context; - AVBufferRef *device_ref; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - AVHWDeviceContext *device; AVVAAPIDeviceContext *hwctx; diff --git a/libavcodec/version.h b/libavcodec/version.h index 6e4a665b07..da36f1790d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_CODED_FRAME #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_STRUCT_VAAPI_CONTEXT -#define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_UNSANITIZED_BITRATES #define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27116 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp1093938yba; Mon, 19 Apr 2021 07:14:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLoRyty+O4qwVAOgqbglem7Qpahgu/JA7KSJMKsk2TWA8Sfq+2YIObnIFXVKGmooa9Pski X-Received: by 2002:a50:e607:: with SMTP id y7mr26339651edm.18.1618841653384; Mon, 19 Apr 2021 07:14:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841653; cv=none; d=google.com; s=arc-20160816; b=erKgDLeVtWnJADzzCRItH9jaf6o0AyS45SHDHyHJ2/QPwE8XTj8kDwzZ28BSY8mjgI v1+0rMey3KzLxeeiLxwYzwxLaoHY1oY9SJ5efHteDUoF+VumPsPEjhgqTFiAB1qUo2AA u9OsQbqY4Mo40jgf2GK91GKJC0FTXEj48tmJt9SyeU+rjRTfy5Xveo1potqZFdUlJFx4 7mfAYa25j5cO5HuJuuBlHTceqSddxeSReW4nieFAmpmUFMBmATMWspwuFyxvsSU4lF2E xRfLf9qGwk9gA+t5WSo2mSqqQZBSgr2aKQgulO3ezfOo6p0hNj7DoyRDE3F0e9PQGegk c+8A== 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=UNgCNXCKLk/0Oh5CzQJpiiDyZlvrUx+S2yZNpaT3pKU=; b=q1V0PWcZDy4v7BkP3aaMrPeSxhcsX1fQyIKm8T0Xz4s7f+fFB6sOYu0CO/1/F5RPA3 AMludzf24MK2vrmu4ZZEF3Ubn8FZ9Z3RSNqGeTHRxhCni4ZCQYf3LzzmFRC9TJem/D/6 xbfHB2uLfDBgoiAJhxyh2mFPM8DIKJhOrp/xsE0z7DX0SqFyN/g3Umcg0qT7nKOejy7i X35iUgnuxnhUIw+0mmjq4zBOBq0B33OVQuTSp8H8oLZ2p4y+n7g2L7z0xPBi2lfvQix8 L4GXjYshxvMcQM2LgIs2dBuirHOrHy/Lcdh3OK4dyfJXDFjk2G7rbjqmOnCDabRLViHo cnRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="hV/6P3pe"; 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 v17si12320344ejj.22.2021.04.19.07.14.13; Mon, 19 Apr 2021 07:14:13 -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="hV/6P3pe"; 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 A3E31687F13; Mon, 19 Apr 2021 17:11:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 392AE680CF7 for ; Mon, 19 Apr 2021 17:11:39 +0300 (EEST) Received: by mail-qt1-f172.google.com with SMTP id o2so12710040qtr.4 for ; Mon, 19 Apr 2021 07:11:39 -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=YDa5pxhvZhIl1nJYb4AGqFHuci3S9NxoH4gjSICL4yQ=; b=hV/6P3peWvDvVecmQXYg8ZP/7fyqq7Zt7Ez2efiqlYbW8cEYPL4YwjSfhOmhAsuKsC CalvzMpqZG6vEhrY72Jjg+5yAN35NCVuG8LCgm4PXGEEZPmyWdy1SDSV4f2ngBpTpZif TpS6N5og7qAQ9Pw5m0s+oWr0KWlNXo0HIZVRdld1/8pCZRT5Y760ONK7Yk+QHMJ1DiFd 9gumEWznnBWuOnKMZbqAqHwy1D2AdriMdGW6DCNdC7ZG/jUmTI2BRbMZccuP074wLF0m tpQ5frFugQEKDXsLUj89BxiVyCjYgdS6ikQwE1BrZ337KlHorHAEAl0dpOM1z6ClwuAg GkfA== 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=YDa5pxhvZhIl1nJYb4AGqFHuci3S9NxoH4gjSICL4yQ=; b=R/nST60zFyQqqH+bcXZ4ynDNjTgurac1+rHhrtygQzm17cDWTYB4UOZlqkEWf/BBf4 vC3iSMaKJmeWQ8us7LKeu/n1q2sL/TYRbzU7VNE4R9CXNdGfMj1e+7z/5Nmzw2OMKbqX M7cRgZnG4TI5R4Yudnm9grAldCrWPM9jnQj0/Cvlo7eB/ZEJwA2ldqC6WS/1nciWqlif BLS5mWy6fIDwmDBkYXEfVXvmJW/GCn6kBpBmTfmsIGEcnJI3jrdEYhnAtBjoOQMgaFjz qwH+bB4aAMRuuxwgH43R1FYNNCnQXn4O/YXwdQl6r5U4SS9oAGMUoPnrFFx10UDPkxdI 4zzQ== X-Gm-Message-State: AOAM530PlEhN7MBZGlSD6YieMyEEOGywWmaofZ1kcFnCLdRk+l9fSLLh 4qO2BX7K2a8G1NWhfAKhvqO5doV06q0= X-Received: by 2002:a05:622a:1044:: with SMTP id f4mr12285237qte.224.1618841497904; Mon, 19 Apr 2021 07:11:37 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:37 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:27 -0300 Message-Id: <20210419141024.8174-31-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 30/87] avcodec/mpegvideo: Remove deprecated rc_strategy option 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: Zi33gElgtq+O Content-Length: 3116 From: Andreas Rheinhardt Deprecated in d05c3b9ceeb9d00d4500c376448230e45f6ab108. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.h | 12 ------------ libavcodec/version.h | 3 --- 2 files changed, 15 deletions(-) diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 30dcf99188..75e343838a 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -369,9 +369,6 @@ typedef struct MpegEncContext { uint8_t *mb_info_ptr; int mb_info_size; int ehc_mode; -#if FF_API_MPV_RC_STRATEGY - int rc_strategy; ///< deprecated -#endif /* H.263+ specific */ int umvplus; ///< == H.263+ && unrestricted_mv @@ -617,14 +614,6 @@ typedef struct MpegEncContext { #ifndef FF_MPV_OFFSET #define FF_MPV_OFFSET(x) offsetof(MpegEncContext, x) #endif -#if FF_API_MPV_RC_STRATEGY -#define FF_MPV_RC_STRATEGY_OPTS \ -{"rc_strategy", "ratecontrol method", FF_MPV_OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED, "rc_strategy" }, \ - { "ffmpeg", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED, "rc_strategy" }, \ - { "xvid", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED, "rc_strategy" }, -#else -#define FF_MPV_RC_STRATEGY_OPTS -#endif #define FF_MPV_OPT_FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) #define FF_MPV_COMMON_OPTS \ FF_MPV_OPT_CMP_FUNC, \ @@ -672,7 +661,6 @@ FF_MPV_OPT_CMP_FUNC, \ {"mepc", "Motion estimation bitrate penalty compensation (1.0 = 256)", FF_MPV_OFFSET(me_penalty_compensation), AV_OPT_TYPE_INT, {.i64 = 256 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"mepre", "pre motion estimation", FF_MPV_OFFSET(me_pre), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"intra_penalty", "Penalty for intra blocks in block decision", FF_MPV_OFFSET(intra_penalty), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX/2, FF_MPV_OPT_FLAGS }, \ -FF_MPV_RC_STRATEGY_OPTS #define FF_MPV_COMMON_BFRAME_OPTS \ {"b_strategy", "Strategy to choose between I/P/B-frames", FF_MPV_OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 2, FF_MPV_OPT_FLAGS }, \ diff --git a/libavcodec/version.h b/libavcodec/version.h index da36f1790d..552e5a7c5d 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_MPV_RC_STRATEGY -#define FF_API_MPV_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_PARSER_CHANGE #define FF_API_PARSER_CHANGE (LIBAVCODEC_VERSION_MAJOR < 59) #endif 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 From patchwork Mon Apr 19 14:09:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27110 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp1094311yba; Mon, 19 Apr 2021 07:14:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUmsoSzjY/26LTogyp66rGlAdCeIaLguVdaw9tr1fqrEyWBQdctx28/BPBL79km2aN+Pbd X-Received: by 2002:a17:906:4ed0:: with SMTP id i16mr21752141ejv.96.1618841680020; Mon, 19 Apr 2021 07:14:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841680; cv=none; d=google.com; s=arc-20160816; b=lle4WdEoMY+iMrhav8t0lac7GZ+qAWVfFVLYfaKYVm5Wm4s8y0AwgkC42Un/Dki2h5 6q2ibOwGvo8fAtoijEjD2UvZglYcetIJJdmJS7IxwDb35eN07WPykTlCcs2tNHFhAn0K P1KZzDQlA6CVNnKSOSRgB9EnHzJlo3BcLUACP0OValgl+khj+WU5+v9rbZZZ6rBWqv1/ /uENtni9sfxTURx8DUvkf2RUBREtw4q/Nw3tuUmOkkCJLizkPjxgEyTIGRsGJ4CaEA96 zQkJrjzsnwdn5ddab9al4+8DFk0WXE9m38Yv6OcWkcGhPMEBTz5JFbiE5giaFPM82T2P f6Qw== 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=tBthwFCCcDp4QX4roSvOP2hxQibs2fzk4RwSwk3iTt4=; b=fZ5al69F9Ge9GfrYMn2srXqeSY8XtRJYJylWTVOxwmzxjrvckHoZjrsBQtThmGVWLD ZcPKmPsH1J1IGmxJYZ5Knw0UqIxSACIxVDdEmXsHFA10mvKJ3gxV1YWB+URKelCPKI61 dyWRZh5B82Pp/vn2tNPz06Jq1C6YUPzev6EhuIicL/87RZF12QcGFz3TJ1dMa9af9IPP 7T75tOcIaWIAg1TNaiibft87gQgQagJ9HA5dsYsSYJDiJZxKxLykQcHjYTGkWysjysEx KxEpsPle/DHaxpmGnlLZjBKMY0xcDqIEIq1f7unBkVPlcF/5ynL8hNLFrZmEaRep8ugm QYAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OxDFB66w; 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 q1si11910097ejy.298.2021.04.19.07.14.39; Mon, 19 Apr 2021 07:14:40 -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=OxDFB66w; 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 A0770687FB2; Mon, 19 Apr 2021 17:11:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C02CE68799C for ; Mon, 19 Apr 2021 17:11:41 +0300 (EEST) Received: by mail-qk1-f177.google.com with SMTP id i12so4318823qke.3 for ; Mon, 19 Apr 2021 07:11:41 -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=jklNGqeBnpQPwrWsJYgnz9DoJ1SU3LOBZEVqGRKzCJ0=; b=OxDFB66wAaibePjNSAbeo7JjGWO+BOfoCu0dKboi9yhWjVnPf4TgcecaYi5Ruoot3m p5zhvg2W/O2QJtDE/lnnQefmal01q2c1Wratg4wFwrE9c2otR9aYRj4zi+2aISlTBNHe DrQg9oGS/gxXcjgmOsGMrXh/GN6TbdaEeTXS5lG/SQPuwpNFnqdoE9qblVnXgBBpZ5I8 rG4jWY68pTGvMgRZJxGJG/VXveCjLUeGGfTvjvGZfCQCPLuRqJhjHesLHHHnwqJhmJLy 3hCd2552iFEQ3J2xVrtK/4D3fr4ibX5Nq/592zAf+gR5Jtc2hVoMEH+w/Wdyo0oDl6YK KH1g== 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=jklNGqeBnpQPwrWsJYgnz9DoJ1SU3LOBZEVqGRKzCJ0=; b=gWvwAi2xc56KuFPuaVFXBoCTSxm49Wk1ELeAbqG5cjnKI27MmpXSRR+8h5WLAx2p9m 5RqIG6K/xscP8Z8ZayYQYrd8pwTK54KGxoww+zP4k4Hm5Nbjf+ijxkkI4AfJVubBxiCV ebktY9D0fCEol+EjkD3X0JSkNy0jDjavL6TARg8UVy5F8YjtaSxKfXzB5yxwo4TjZL+z IYUkCQkwvRAsSoH6wcckchQ0Lw7OgPshDKtdcVW66fmYufo+4adNdlYxNfbk86zuxZQH kP9/CPZmF/RqgwOJFIIzclnUZ+TShp5HvaTtvWVapxK8UR4FInt/ef91kZhP3P+cOOrx MOWg== X-Gm-Message-State: AOAM531/pfGs2uloURQR2yDmP9sKPB2ByeW/36XDoAH7bRA6Yyrf/15z bzMEUT27XinVjI+7IUUN2EPc6tgKmHM= X-Received: by 2002:a37:b103:: with SMTP id a3mr12612477qkf.261.1618841500078; Mon, 19 Apr 2021 07:11:40 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:29 -0300 Message-Id: <20210419141024.8174-33-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 32/87] avcodec: Switch AVCPBProperties to 64bits 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: qA+wHOgUpgL0 Content-Length: 4394 From: Andreas Rheinhardt Announced in 2e8b0446c6798947dac77fee4a06f9c4e8131ab5. Two FATE-tests needed to be updated because the checksums of side data containing an AVCPBProperties struct changed. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 12 ------------ libavcodec/version.h | 3 --- libavformat/dump.c | 4 ---- tests/ref/fate/mxf-d10-user-comments | 2 +- tests/ref/fate/ts-demux | 2 +- 5 files changed, 2 insertions(+), 21 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 43b83ac348..c99b455814 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -455,29 +455,17 @@ typedef struct AVCPBProperties { * Maximum bitrate of the stream, in bits per second. * Zero if unknown or unspecified. */ -#if FF_API_UNSANITIZED_BITRATES - int max_bitrate; -#else int64_t max_bitrate; -#endif /** * Minimum bitrate of the stream, in bits per second. * Zero if unknown or unspecified. */ -#if FF_API_UNSANITIZED_BITRATES - int min_bitrate; -#else int64_t min_bitrate; -#endif /** * Average bitrate of the stream, in bits per second. * Zero if unknown or unspecified. */ -#if FF_API_UNSANITIZED_BITRATES - int avg_bitrate; -#else int64_t avg_bitrate; -#endif /** * The size of the buffer to which the ratecontrol is applied, in bits. diff --git a/libavcodec/version.h b/libavcodec/version.h index 17cd17c327..0830acf8b2 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_CODED_FRAME #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_UNSANITIZED_BITRATES -#define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OPENH264_SLICE_MODE #define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 59) #endif diff --git a/libavformat/dump.c b/libavformat/dump.c index 62ef5e9852..2b6ed1ed1f 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -322,11 +322,7 @@ static void dump_cpb(void *ctx, const AVPacketSideData *sd) } av_log(ctx, AV_LOG_INFO, -#if FF_API_UNSANITIZED_BITRATES - "bitrate max/min/avg: %d/%d/%d buffer size: %d ", -#else "bitrate max/min/avg: %"PRId64"/%"PRId64"/%"PRId64" buffer size: %d ", -#endif cpb->max_bitrate, cpb->min_bitrate, cpb->avg_bitrate, cpb->buffer_size); if (cpb->vbv_delay == UINT64_MAX) diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments index 13761fb0ce..609271ac05 100644 --- a/tests/ref/fate/mxf-d10-user-comments +++ b/tests/ref/fate/mxf-d10-user-comments @@ -6,7 +6,7 @@ #codec_id 0: mpeg2video #dimensions 0: 1280x720 #sar 0: 3/4 -0, -1, 0, 1, 150000, 0x0547870d, S=1, 24, 0x5aa90ad0 +0, -1, 0, 1, 150000, 0x0547870d, S=1, 40, 0x7ea50ad0 0, 0, 1, 1, 150000, 0xe80a1612, F=0x0 0, 1, 2, 1, 150000, 0xc5c50e2f, F=0x0 0, 2, 3, 1, 150000, 0x51e28a04, F=0x0 diff --git a/tests/ref/fate/ts-demux b/tests/ref/fate/ts-demux index cdf34d6af0..c20364483b 100644 --- a/tests/ref/fate/ts-demux +++ b/tests/ref/fate/ts-demux @@ -15,7 +15,7 @@ 1, 5760, 5760, 2880, 1536, 0xbab5129c 1, 8640, 8640, 2880, 1536, 0x602f034b, S=1, 1, 0x00bd00bd 1, 11520, 11520, 2880, 906, 0x69cdcbcd -0, 32037, 36541, 1501, 114336, 0x37a215a8, S=2, 1, 0x00e000e0, 24, 0x663d0b52 +0, 32037, 36541, 1501, 114336, 0x37a215a8, S=2, 1, 0x00e000e0, 40, 0x91e10b52 0, 33538, 33538, 1501, 12560, 0xb559a3d4, F=0x0, S=1, 1, 0x00e000e0 0, 35040, 35040, 1501, 12704, 0x2614adf4, F=0x0, S=1, 1, 0x00e000e0 0, 36541, 41046, 1501, 51976, 0x9ff1dbfe, F=0x0, S=1, 1, 0x00e000e0 From patchwork Mon Apr 19 14:09:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27117 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp1094412yba; Mon, 19 Apr 2021 07:14:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzi3d2BX3ssAVKQOTS7miQnZSwzjcjUKHM/V66R7MCb8UXngmOeib1d5hiGmX7rlLUW8Pkk X-Received: by 2002:a05:6402:2794:: with SMTP id b20mr8233705ede.48.1618841686369; Mon, 19 Apr 2021 07:14:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841686; cv=none; d=google.com; s=arc-20160816; b=zPliRYDhqqXP7RJJ5DjsHcyWfE/dI2vAGrZgwYfcH1RRXOWVmaQzDjslgq1uVvlJbp TBdVV/18jPqY0t3aWggSrSoiYhzbVTAsujolWg+EpiMcrPbmyzufwAPSmZOM6fW+SzcH D3zz7BnW7FP8VmRpNCemndSVczfDF9XLAJYrXlD3cwMwLWiXr1OkBhxAe75Jl0UcJqES x2yaZkX4yOwrzTV068P/f3ERR1rdc/dK3IKMtmkqOMAvuMukRBU2e6Iv4MZNclu6ZXQR 8VxFjNBiSOvuwMOFcuwKIPlE5e+0dwnowtAQu07SyOaRRZ7URSFgq7n3tQiafwufGhve Q6fA== 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=kpfIdynpXEkHmg3HSrjgB35PJLVA1Hs7Diqfzv8hBrU=; b=sAq2xm4SruO+AYgLiIHMZyRAoX70BKTsyOWr3VT/z6YttSdBN+i4LO25zHf+26Xc+M b2Fj+LD1j0ktbd/yBaexlS1oM37Ou14LII7l/KRLFIG9IWsf5Tj3h+sosGqQLDGRkbcM 8kX7eikfUQHF1o1qUHIWFcZkYLqwCqZG5+dt2o3t8GFj7YWPET6U9HgUgmg9VwdXYz2Z 7i3y/t2UtFVvS/OM5NIocehsz0qad6VwKwO6yN2QiHvDYRQFiIJ5fuHuOvJ7BKAjQ0ux xazjFeaTdA2NEG/mVxBYvJ7nj3rKkgXMx3VtURo6C0RdSFybMnmWwAjHQCLz78mq4npi qK3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bQg9J5Dy; 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 x10si12423270ejs.152.2021.04.19.07.14.46; Mon, 19 Apr 2021 07:14:46 -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=bQg9J5Dy; 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 83AAB680CEC; Mon, 19 Apr 2021 17:11:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 25064687F12 for ; Mon, 19 Apr 2021 17:11:43 +0300 (EEST) Received: by mail-qk1-f169.google.com with SMTP id t17so7380248qkg.4 for ; Mon, 19 Apr 2021 07:11:43 -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=ZeHFeqHQJJQ6YaV5N6irXfIaAwvhvCzBh3qhkxDbooQ=; b=bQg9J5DyCRfFmJ6ARLbipEA6YDgDLHTYetQ/lylHt/wXh2Njezhu9XQ9V+kBuGc209 0sir8p74L11JlgunwFVfXpcaU5D3k5cXLSSbO+tJ6t2Vxq9W+HQER6HgSS2qe0dzACSF 2jRbK7PnJDEWpXuuW5Tj8Ox6iyzEgPi9z7/Ynzvt5/LnOMz1RBXrYJErEf45g0ufxuV9 QzdJdcgzzSua1gno9DoUd8A/7vmzitG+jNg3QZbfcKpuZIYHmG9Ohrs1jfGfcv8YZnsK gqRGDPmNeNPpiAwo6B+Xrk6bg682tQ49GquE+Wr2yeHvMdzezKl5YHJ7LrHxYiNguPIH BbaQ== 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=ZeHFeqHQJJQ6YaV5N6irXfIaAwvhvCzBh3qhkxDbooQ=; b=Sp3cYJWhIqj/7zXu9dBdH37Qf5AGwXqKfk6UEFYYuA2DZC4Cmk96YOfZkUL5qmfdid Eu7hq9tMtvzBXQLaWBWSBCbjOystUbl4Lk05XcUH0cHi5CQyUEFfo9LRz0FxsZDwuFyD 0f/TuJSSPzwG+C105h8iFTYxWXm2X8jKMUFVcL2o5LAjXdWY3KlbnOpKfS7sxl8ajrCy wPLnDKsw6rfw7SbuvDcclrEqtDvhlX74jgsTbTfcCDDNa1LkXzdBldPALXCi7LDYrd8z gHsYnNwBwsZVA4mrUPjj1zpebuVj+3mdUuCcSkXVP6sWUpBa1MkU2ZmZOKkbrx8l82cN RWhA== X-Gm-Message-State: AOAM532LKxRN4niA2gQqb53LhjF0xXckZHeCmaRr0o5XRpS1PiQv1ar5 YSwzsJ5UhraDGRFO8pmbzKg3gHfwyqk= X-Received: by 2002:a05:620a:1522:: with SMTP id n2mr6459416qkk.298.1618841501310; Mon, 19 Apr 2021 07:11:41 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:40 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:30 -0300 Message-Id: <20210419141024.8174-34-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 33/87] avformat: Constify the API wrt AV(In|Out)putFormat 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: IIPZzkNADO7s Content-Length: 28416 From: Andreas Rheinhardt Also constify AVProbeData. Signed-off-by: Andreas Rheinhardt --- doc/APIchanges | 10 ++++++++ fftools/ffmpeg_opt.c | 12 +++++---- fftools/ffplay.c | 7 ++--- fftools/ffprobe.c | 2 +- libavdevice/internal.h | 2 +- libavdevice/utils.c | 2 +- libavfilter/lavfutils.c | 2 +- libavfilter/src_movie.c | 2 +- libavformat/avformat.h | 44 ++++++++++++++------------------ libavformat/avidec.c | 2 +- libavformat/dashdec.c | 2 +- libavformat/fifo.c | 4 +-- libavformat/format.c | 33 ++++++++++++------------ libavformat/hdsenc.c | 2 +- libavformat/hls.c | 2 +- libavformat/hlsenc.c | 4 +-- libavformat/mpeg.c | 2 +- libavformat/mux.c | 2 +- libavformat/rtpdec_asf.c | 2 +- libavformat/rtpenc_chain.c | 2 +- libavformat/rtpenc_mpegts.c | 4 +-- libavformat/sapdec.c | 2 +- libavformat/segment.c | 2 +- libavformat/smoothstreamingenc.c | 2 +- libavformat/utils.c | 2 +- libavformat/version.h | 3 --- libavformat/webm_chunk.c | 2 +- 27 files changed, 81 insertions(+), 76 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index cd3ea3c865..e9fa7ddf64 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -17,6 +17,16 @@ API changes, most recent first: 2021-04-17 - xxxxxxxxxx - lavu 56.73.100 - frame.h detection_bbox.h Add AV_FRAME_DATA_DETECTION_BBOXES +2021-04-14 - xxxxxxxxxx - lavf yyyyyyyyy - avformat.h + Constified the pointers to AVInputFormats and AVOutputFormats + in AVFormatContext, avformat_alloc_output_context2(), + av_find_input_format(), av_probe_input_format(), + av_probe_input_format2(), av_probe_input_format3(), + av_probe_input_buffer2(), av_probe_input_buffer(), + avformat_open_input(), av_guess_format() and av_guess_codec(). + Furthermore, constified the AVProbeData in av_probe_input_format(), + av_probe_input_format2() and av_probe_input_format3(). + 2021-04-06 - xxxxxxxxxx - lavf 58.78.100 - avformat.h Add avformat_index_get_entries_count(), avformat_index_get_entry(), and avformat_index_get_entry_from_timestamp(). diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 807e783422..9e26de5a94 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1068,7 +1068,7 @@ static int open_input_file(OptionsContext *o, const char *filename) { InputFile *f; AVFormatContext *ic; - AVInputFormat *file_iformat = NULL; + const AVInputFormat *file_iformat = NULL; int err, i, ret; int64_t timestamp; AVDictionary *unused_opts = NULL; @@ -1117,20 +1117,22 @@ static int open_input_file(OptionsContext *o, const char *filename) av_dict_set_int(&o->g->format_opts, "sample_rate", o->audio_sample_rate[o->nb_audio_sample_rate - 1].u.i, 0); } if (o->nb_audio_channels) { + const AVClass *priv_class; /* because we set audio_channels based on both the "ac" and * "channel_layout" options, we need to check that the specified * demuxer actually has the "channels" option before setting it */ - if (file_iformat && file_iformat->priv_class && - av_opt_find(&file_iformat->priv_class, "channels", NULL, 0, + if (file_iformat && (priv_class = file_iformat->priv_class) && + av_opt_find(&priv_class, "channels", NULL, 0, AV_OPT_SEARCH_FAKE_OBJ)) { av_dict_set_int(&o->g->format_opts, "channels", o->audio_channels[o->nb_audio_channels - 1].u.i, 0); } } if (o->nb_frame_rates) { + const AVClass *priv_class; /* set the format-level framerate option; * this is important for video grabbers, e.g. x11 */ - if (file_iformat && file_iformat->priv_class && - av_opt_find(&file_iformat->priv_class, "framerate", NULL, 0, + if (file_iformat && (priv_class = file_iformat->priv_class) && + av_opt_find(&priv_class, "framerate", NULL, 0, AV_OPT_SEARCH_FAKE_OBJ)) { av_dict_set(&o->g->format_opts, "framerate", o->frame_rates[o->nb_frame_rates - 1].u.str, 0); diff --git a/fftools/ffplay.c b/fftools/ffplay.c index e14c800b8f..0be1d90bf9 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -203,7 +203,7 @@ typedef struct Decoder { typedef struct VideoState { SDL_Thread *read_tid; - AVInputFormat *iformat; + const AVInputFormat *iformat; int abort_request; int force_refresh; int paused; @@ -308,7 +308,7 @@ typedef struct VideoState { } VideoState; /* options specified by the user */ -static AVInputFormat *file_iformat; +static const AVInputFormat *file_iformat; static const char *input_filename; static const char *window_title; static int default_width = 640; @@ -3075,7 +3075,8 @@ static int read_thread(void *arg) return 0; } -static VideoState *stream_open(const char *filename, AVInputFormat *iformat) +static VideoState *stream_open(const char *filename, + const AVInputFormat *iformat) { VideoState *is; diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index a2cb7dc986..13ed16431d 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -257,7 +257,7 @@ static const OptionDef *options; /* FFprobe context */ static const char *input_filename; static const char *print_input_filename; -static AVInputFormat *iformat = NULL; +static const AVInputFormat *iformat = NULL; static struct AVHashContext *hash; diff --git a/libavdevice/internal.h b/libavdevice/internal.h index e222cf204d..67c90e1f87 100644 --- a/libavdevice/internal.h +++ b/libavdevice/internal.h @@ -22,7 +22,7 @@ #include "libavformat/avformat.h" av_warn_unused_result -int ff_alloc_input_device_context(struct AVFormatContext **avctx, struct AVInputFormat *iformat, +int ff_alloc_input_device_context(struct AVFormatContext **avctx, const AVInputFormat *iformat, const char *format); #endif diff --git a/libavdevice/utils.c b/libavdevice/utils.c index ccd7318012..d9a52c53ab 100644 --- a/libavdevice/utils.c +++ b/libavdevice/utils.c @@ -20,7 +20,7 @@ #include "libavutil/opt.h" #include "libavformat/avformat.h" -int ff_alloc_input_device_context(AVFormatContext **avctx, AVInputFormat *iformat, const char *format) +int ff_alloc_input_device_context(AVFormatContext **avctx, const AVInputFormat *iformat, const char *format) { AVFormatContext *s; int ret = 0; diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c index 34051ee61d..2bc06257c6 100644 --- a/libavfilter/lavfutils.c +++ b/libavfilter/lavfutils.c @@ -26,7 +26,7 @@ int ff_load_image(uint8_t *data[4], int linesize[4], int *w, int *h, enum AVPixelFormat *pix_fmt, const char *filename, void *log_ctx) { - AVInputFormat *iformat = NULL; + const AVInputFormat *iformat = NULL; AVFormatContext *format_ctx = NULL; const AVCodec *codec; AVCodecContext *codec_ctx = NULL; diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 5892500410..e449e7e0c2 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -205,7 +205,7 @@ static int guess_channel_layout(MovieStream *st, int st_index, void *log_ctx) static av_cold int movie_common_init(AVFilterContext *ctx) { MovieContext *movie = ctx->priv; - AVInputFormat *iformat = NULL; + const AVInputFormat *iformat = NULL; int64_t timestamp; int nb_streams = 1, ret, i; char default_streams[16], *stream_specs, *spec, *cursor; diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 17b54c0997..166f1aa41c 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -525,15 +525,6 @@ typedef struct AVOutputFormat { * New public fields should be added right above. ***************************************************************** */ - /** - * The ff_const59 define is not part of the public API and will - * be removed without further warning. - */ -#if FF_API_AVIOFORMAT -#define ff_const59 -#else -#define ff_const59 const -#endif /** * size of private data so that it can be allocated in the wrapper */ @@ -1235,14 +1226,14 @@ typedef struct AVFormatContext { * * Demuxing only, set by avformat_open_input(). */ - ff_const59 struct AVInputFormat *iformat; + const struct AVInputFormat *iformat; /** * The output container format. * * Muxing only, must be set by the caller before avformat_write_header(). */ - ff_const59 struct AVOutputFormat *oformat; + const struct AVOutputFormat *oformat; /** * Format private data. This is an AVOptions-enabled struct @@ -2088,7 +2079,7 @@ AVProgram *av_new_program(AVFormatContext *s, int id); * @return >= 0 in case of success, a negative AVERROR code in case of * failure */ -int avformat_alloc_output_context2(AVFormatContext **ctx, ff_const59 AVOutputFormat *oformat, +int avformat_alloc_output_context2(AVFormatContext **ctx, const AVOutputFormat *oformat, const char *format_name, const char *filename); /** @@ -2099,7 +2090,7 @@ int avformat_alloc_output_context2(AVFormatContext **ctx, ff_const59 AVOutputFor /** * Find AVInputFormat based on the short name of the input format. */ -ff_const59 AVInputFormat *av_find_input_format(const char *short_name); +const AVInputFormat *av_find_input_format(const char *short_name); /** * Guess the file format. @@ -2108,7 +2099,7 @@ ff_const59 AVInputFormat *av_find_input_format(const char *short_name); * @param is_opened Whether the file is already opened; determines whether * demuxers with or without AVFMT_NOFILE are probed. */ -ff_const59 AVInputFormat *av_probe_input_format(ff_const59 AVProbeData *pd, int is_opened); +const AVInputFormat *av_probe_input_format(const AVProbeData *pd, int is_opened); /** * Guess the file format. @@ -2122,7 +2113,8 @@ ff_const59 AVInputFormat *av_probe_input_format(ff_const59 AVProbeData *pd, int * If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended * to retry with a larger probe buffer. */ -ff_const59 AVInputFormat *av_probe_input_format2(ff_const59 AVProbeData *pd, int is_opened, int *score_max); +const AVInputFormat *av_probe_input_format2(const AVProbeData *pd, + int is_opened, int *score_max); /** * Guess the file format. @@ -2131,7 +2123,8 @@ ff_const59 AVInputFormat *av_probe_input_format2(ff_const59 AVProbeData *pd, int * demuxers with or without AVFMT_NOFILE are probed. * @param score_ret The score of the best detection. */ -ff_const59 AVInputFormat *av_probe_input_format3(ff_const59 AVProbeData *pd, int is_opened, int *score_ret); +const AVInputFormat *av_probe_input_format3(const AVProbeData *pd, + int is_opened, int *score_ret); /** * Probe a bytestream to determine the input format. Each time a probe returns @@ -2149,14 +2142,14 @@ ff_const59 AVInputFormat *av_probe_input_format3(ff_const59 AVProbeData *pd, int * the maximal score is AVPROBE_SCORE_MAX * AVERROR code otherwise */ -int av_probe_input_buffer2(AVIOContext *pb, ff_const59 AVInputFormat **fmt, +int av_probe_input_buffer2(AVIOContext *pb, const AVInputFormat **fmt, const char *url, void *logctx, unsigned int offset, unsigned int max_probe_size); /** * Like av_probe_input_buffer2() but returns 0 on success */ -int av_probe_input_buffer(AVIOContext *pb, ff_const59 AVInputFormat **fmt, +int av_probe_input_buffer(AVIOContext *pb, const AVInputFormat **fmt, const char *url, void *logctx, unsigned int offset, unsigned int max_probe_size); @@ -2179,7 +2172,8 @@ int av_probe_input_buffer(AVIOContext *pb, ff_const59 AVInputFormat **fmt, * * @note If you want to use custom IO, preallocate the format context and set its pb field. */ -int avformat_open_input(AVFormatContext **ps, const char *url, ff_const59 AVInputFormat *fmt, AVDictionary **options); +int avformat_open_input(AVFormatContext **ps, const char *url, + const AVInputFormat *fmt, AVDictionary **options); #if FF_API_DEMUXER_OPEN /** @@ -2570,16 +2564,16 @@ int av_write_trailer(AVFormatContext *s); * @param mime_type if non-NULL checks if mime_type matches with the * MIME type of the registered formats */ -ff_const59 AVOutputFormat *av_guess_format(const char *short_name, - const char *filename, - const char *mime_type); +const AVOutputFormat *av_guess_format(const char *short_name, + const char *filename, + const char *mime_type); /** * Guess the codec ID based upon muxer and filename. */ -enum AVCodecID av_guess_codec(ff_const59 AVOutputFormat *fmt, const char *short_name, - const char *filename, const char *mime_type, - enum AVMediaType type); +enum AVCodecID av_guess_codec(const AVOutputFormat *fmt, const char *short_name, + const char *filename, const char *mime_type, + enum AVMediaType type); /** * Get timing information for the data currently output. diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 48370fe5ce..ac020109c6 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1092,7 +1092,7 @@ static int read_gab2_sub(AVFormatContext *s, AVStream *st, AVPacket *pkt) uint8_t desc[256]; int score = AVPROBE_SCORE_EXTENSION, ret; AVIStream *ast = st->priv_data; - ff_const59 AVInputFormat *sub_demuxer; + const AVInputFormat *sub_demuxer; AVRational time_base; int size; AVProbeData pd; diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 73effd85db..39e7810e42 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1879,7 +1879,7 @@ static void close_demux_for_component(struct representation *pls) static int reopen_demux_for_component(AVFormatContext *s, struct representation *pls) { DASHContext *c = s->priv_data; - ff_const59 AVInputFormat *in_fmt = NULL; + const AVInputFormat *in_fmt = NULL; AVDictionary *in_fmt_opts = NULL; uint8_t *avio_ctx_buffer = NULL; int ret = 0, i; diff --git a/libavformat/fifo.c b/libavformat/fifo.c index 17748e94ce..78afaff197 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -469,7 +469,7 @@ static void *fifo_consumer_thread(void *data) return NULL; } -static int fifo_mux_init(AVFormatContext *avf, ff_const59 AVOutputFormat *oformat, +static int fifo_mux_init(AVFormatContext *avf, const AVOutputFormat *oformat, const char *filename) { FifoContext *fifo = avf->priv_data; @@ -508,7 +508,7 @@ static int fifo_mux_init(AVFormatContext *avf, ff_const59 AVOutputFormat *oforma static int fifo_init(AVFormatContext *avf) { FifoContext *fifo = avf->priv_data; - ff_const59 AVOutputFormat *oformat; + const AVOutputFormat *oformat; int ret = 0; if (fifo->recovery_wait_streamtime && !fifo->drop_pkts_on_overflow) { diff --git a/libavformat/format.c b/libavformat/format.c index c47490c8eb..cc214741bd 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -48,8 +48,8 @@ int av_match_ext(const char *filename, const char *extensions) return 0; } -ff_const59 AVOutputFormat *av_guess_format(const char *short_name, const char *filename, - const char *mime_type) +const AVOutputFormat *av_guess_format(const char *short_name, const char *filename, + const char *mime_type) { const AVOutputFormat *fmt = NULL; AVOutputFormat *fmt_found = NULL; @@ -84,12 +84,12 @@ ff_const59 AVOutputFormat *av_guess_format(const char *short_name, const char *f return fmt_found; } -enum AVCodecID av_guess_codec(ff_const59 AVOutputFormat *fmt, const char *short_name, +enum AVCodecID av_guess_codec(const AVOutputFormat *fmt, const char *short_name, const char *filename, const char *mime_type, enum AVMediaType type) { if (av_match_name("segment", fmt->name) || av_match_name("ssegment", fmt->name)) { - ff_const59 AVOutputFormat *fmt2 = av_guess_format(NULL, filename, NULL); + const AVOutputFormat *fmt2 = av_guess_format(NULL, filename, NULL); if (fmt2) fmt = fmt2; } @@ -115,7 +115,7 @@ enum AVCodecID av_guess_codec(ff_const59 AVOutputFormat *fmt, const char *short_ return AV_CODEC_ID_NONE; } -ff_const59 AVInputFormat *av_find_input_format(const char *short_name) +const AVInputFormat *av_find_input_format(const char *short_name) { const AVInputFormat *fmt = NULL; void *i = 0; @@ -125,12 +125,12 @@ ff_const59 AVInputFormat *av_find_input_format(const char *short_name) return NULL; } -ff_const59 AVInputFormat *av_probe_input_format3(ff_const59 AVProbeData *pd, int is_opened, - int *score_ret) +const AVInputFormat *av_probe_input_format3(const AVProbeData *pd, + int is_opened, int *score_ret) { AVProbeData lpd = *pd; const AVInputFormat *fmt1 = NULL; - ff_const59 AVInputFormat *fmt = NULL; + const AVInputFormat *fmt = NULL; int score, score_max = 0; void *i = 0; const static uint8_t zerobuffer[AVPROBE_PADDING_SIZE]; @@ -191,7 +191,7 @@ ff_const59 AVInputFormat *av_probe_input_format3(ff_const59 AVProbeData *pd, int } if (score > score_max) { score_max = score; - fmt = (AVInputFormat*)fmt1; + fmt = fmt1; } else if (score == score_max) fmt = NULL; } @@ -202,10 +202,11 @@ ff_const59 AVInputFormat *av_probe_input_format3(ff_const59 AVProbeData *pd, int return fmt; } -ff_const59 AVInputFormat *av_probe_input_format2(ff_const59 AVProbeData *pd, int is_opened, int *score_max) +const AVInputFormat *av_probe_input_format2(const AVProbeData *pd, + int is_opened, int *score_max) { int score_ret; - ff_const59 AVInputFormat *fmt = av_probe_input_format3(pd, is_opened, &score_ret); + const AVInputFormat *fmt = av_probe_input_format3(pd, is_opened, &score_ret); if (score_ret > *score_max) { *score_max = score_ret; return fmt; @@ -213,15 +214,15 @@ ff_const59 AVInputFormat *av_probe_input_format2(ff_const59 AVProbeData *pd, int return NULL; } -ff_const59 AVInputFormat *av_probe_input_format(ff_const59 AVProbeData *pd, int is_opened) +const AVInputFormat *av_probe_input_format(const AVProbeData *pd, int is_opened) { int score = 0; return av_probe_input_format2(pd, is_opened, &score); } -int av_probe_input_buffer2(AVIOContext *pb, ff_const59 AVInputFormat **fmt, - const char *filename, void *logctx, - unsigned int offset, unsigned int max_probe_size) +int av_probe_input_buffer2(AVIOContext *pb, const AVInputFormat **fmt, + const char *filename, void *logctx, + unsigned int offset, unsigned int max_probe_size) { AVProbeData pd = { filename ? filename : "" }; uint8_t *buf = NULL; @@ -309,7 +310,7 @@ fail: return ret < 0 ? ret : score; } -int av_probe_input_buffer(AVIOContext *pb, ff_const59 AVInputFormat **fmt, +int av_probe_input_buffer(AVIOContext *pb, const AVInputFormat **fmt, const char *filename, void *logctx, unsigned int offset, unsigned int max_probe_size) { diff --git a/libavformat/hdsenc.c b/libavformat/hdsenc.c index 353a45f6df..98156afafa 100644 --- a/libavformat/hdsenc.c +++ b/libavformat/hdsenc.c @@ -313,8 +313,8 @@ static void close_file(AVFormatContext *s, OutputStream *os) static int hds_write_header(AVFormatContext *s) { HDSContext *c = s->priv_data; + const AVOutputFormat *oformat; int ret = 0, i; - ff_const59 AVOutputFormat *oformat; if (mkdir(s->url, 0777) == -1 && errno != EEXIST) { av_log(s, AV_LOG_ERROR , "Failed to create directory %s\n", s->url); diff --git a/libavformat/hls.c b/libavformat/hls.c index b589ad2870..83acbb0aa6 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1957,8 +1957,8 @@ static int hls_read_header(AVFormatContext *s) /* Open the demuxer for each playlist */ for (i = 0; i < c->n_playlists; i++) { struct playlist *pls = c->playlists[i]; + const AVInputFormat *in_fmt = NULL; char *url; - ff_const59 AVInputFormat *in_fmt = NULL; if (!(pls->ctx = avformat_alloc_context())) { ret = AVERROR(ENOMEM); diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 7d97ce1789..9a848b6470 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -119,8 +119,8 @@ typedef struct VariantStream { unsigned var_stream_idx; unsigned number; int64_t sequence; - ff_const59 AVOutputFormat *oformat; - ff_const59 AVOutputFormat *vtt_oformat; + const AVOutputFormat *oformat; + const AVOutputFormat *vtt_oformat; AVIOContext *out; AVIOContext *out_single_file; int packets_written; diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 79610ec600..0ddeaa9fb8 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -732,6 +732,7 @@ static int vobsub_read_header(AVFormatContext *s) { int i, ret = 0, header_parsed = 0, langidx = 0; VobSubDemuxContext *vobsub = s->priv_data; + const AVInputFormat *iformat; size_t fname_len; AVBPrint header; int64_t delay = 0; @@ -739,7 +740,6 @@ static int vobsub_read_header(AVFormatContext *s) int stream_id = -1; char id[64] = {0}; char alt[MAX_LINE_SIZE] = {0}; - ff_const59 AVInputFormat *iformat; if (!vobsub->sub_name) { char *ext; diff --git a/libavformat/mux.c b/libavformat/mux.c index d8746f3c13..a05b55b53c 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -133,7 +133,7 @@ enum AVChromaLocation ff_choose_chroma_location(AVFormatContext *s, AVStream *st } -int avformat_alloc_output_context2(AVFormatContext **avctx, ff_const59 AVOutputFormat *oformat, +int avformat_alloc_output_context2(AVFormatContext **avctx, const AVOutputFormat *oformat, const char *format, const char *filename) { AVFormatContext *s = avformat_alloc_context(); diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index e58f0260f3..2749ad1380 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -106,7 +106,7 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p) AVDictionary *opts = NULL; int len = strlen(p) * 6 / 8; char *buf = av_mallocz(len); - ff_const59 AVInputFormat *iformat; + const AVInputFormat *iformat; if (!buf) return AVERROR(ENOMEM); diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c index e6b603db70..cd751f48b6 100644 --- a/libavformat/rtpenc_chain.c +++ b/libavformat/rtpenc_chain.c @@ -31,7 +31,7 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s, { AVFormatContext *rtpctx = NULL; int ret; - ff_const59 AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL); + const AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL); uint8_t *rtpflags; AVDictionary *opts = NULL; diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c index da17b1d776..36c0979ca1 100644 --- a/libavformat/rtpenc_mpegts.c +++ b/libavformat/rtpenc_mpegts.c @@ -56,8 +56,8 @@ static int rtp_mpegts_write_header(AVFormatContext *s) { MuxChain *chain = s->priv_data; AVFormatContext *mpegts_ctx = NULL, *rtp_ctx = NULL; - ff_const59 AVOutputFormat *mpegts_format = av_guess_format("mpegts", NULL, NULL); - ff_const59 AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL); + const AVOutputFormat *mpegts_format = av_guess_format("mpegts", NULL, NULL); + const AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL); int i, ret = AVERROR(ENOMEM); AVStream *st; AVDictionary *mpegts_muxer_options = NULL; diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c index eec73aa2f4..3014bdaa97 100644 --- a/libavformat/sapdec.c +++ b/libavformat/sapdec.c @@ -65,9 +65,9 @@ static int sap_read_header(AVFormatContext *s) struct SAPState *sap = s->priv_data; char host[1024], path[1024], url[1024]; uint8_t recvbuf[RTP_MAX_PACKET_LENGTH]; + const AVInputFormat *infmt; int port; int ret, i; - ff_const59 AVInputFormat* infmt; if (!ff_network_init()) return AVERROR(EIO); diff --git a/libavformat/segment.c b/libavformat/segment.c index cd72e8b701..13954b8f99 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -72,7 +72,7 @@ typedef struct SegmentContext { int segment_idx_wrap; ///< number after which the index wraps int segment_idx_wrap_nb; ///< number of time the index has wraped int segment_count; ///< number of segment files already written - ff_const59 AVOutputFormat *oformat; + const AVOutputFormat *oformat; AVFormatContext *avf; char *format; ///< format to use for output segment files AVDictionary *format_options; diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index ba5cc27ca0..941f03f0b1 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -283,7 +283,7 @@ static int ism_write_header(AVFormatContext *s) { SmoothStreamingContext *c = s->priv_data; int ret = 0, i; - ff_const59 AVOutputFormat *oformat; + const AVOutputFormat *oformat; if (mkdir(s->url, 0777) == -1 && errno != EEXIST) { av_log(s, AV_LOG_ERROR, "mkdir failed\n"); diff --git a/libavformat/utils.c b/libavformat/utils.c index 322ccd3af2..ec48d1c08e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -545,7 +545,7 @@ FF_ENABLE_DEPRECATION_WARNINGS int avformat_open_input(AVFormatContext **ps, const char *filename, - ff_const59 AVInputFormat *fmt, AVDictionary **options) + const AVInputFormat *fmt, AVDictionary **options) { AVFormatContext *s = *ps; int i, ret = 0; diff --git a/libavformat/version.h b/libavformat/version.h index d82adba668..81326aa199 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -97,9 +97,6 @@ #ifndef FF_API_LAVF_MP4A_LATM #define FF_API_LAVF_MP4A_LATM (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_AVIOFORMAT -#define FF_API_AVIOFORMAT (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_DEMUXER_OPEN #define FF_API_DEMUXER_OPEN (LIBAVFORMAT_VERSION_MAJOR < 59) #endif diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index fb5b20a8cc..fefab982cb 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -50,7 +50,7 @@ typedef struct WebMChunkContext { static int webm_chunk_init(AVFormatContext *s) { WebMChunkContext *wc = s->priv_data; - ff_const59 AVOutputFormat *oformat; + const AVOutputFormat *oformat; AVFormatContext *oc; AVStream *st, *ost = s->streams[0]; AVDictionary *dict = NULL; From patchwork Mon Apr 19 14:09:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27047 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp558571iob; Mon, 19 Apr 2021 07:15:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8OyPg6dBcV1PJqcinDe5H0/ccfl+3teEpyCVqBjeNfCGLc3g34jFm/BDtSMOMdzXFBIBM X-Received: by 2002:a17:906:49c1:: with SMTP id w1mr22749787ejv.178.1618841701269; Mon, 19 Apr 2021 07:15:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841701; cv=none; d=google.com; s=arc-20160816; b=rXZ240AiDiWXj1lofo7Xqs1zDQ3IUOd7wG9EcKy2Fyj1xVmTSUQv2oICpXNp0966S2 N8QwOlLumKf6uh54uQeGEP2vl+n69F/0tKaLbq6uYBJYPiH9a/WYVpp/7jju2xWnOI3q MBCkkzd23VhemfwlOhhCU916eNxB7cslpK5VlGPMQLpbG+ff2jZyDO8cXpzjxU9sriVT XHzdmT7Yj0kjIEdz/8KqE7q7nIbNNyDv4bUnEb2l1feRjYgaD/zT1UBhlMVUjS2ttDy2 C7DsfjLF6sQwoseHyxp0IMup8ACQK0/BmyJ+RmIjdu2+GmhdRMgfysr80UbAikp3zp5R QpDA== 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=bi+PbtLUR6vPdOgEI2oBd1ja/VipKGo2UZeACj6nwMw=; b=BDav/na7oGhluq9dMFi2eLuB5eRzLpO8Bjju4ScI+vHjtgHRZRlV6sWyRoccqM8lH6 Kc8hSsrtqtYPe9x/oLsawxOYMXDXHmsh94wkWqoC91aQZfvv/EgdWCg/S5hXakhgmLPf rmWIQuS+3/eR2IdEE9kBHiBOOSX8U7pqJ7TXv2sCAlNi1FKvCBqY1PPWq2GkaFNrh7SK h/z/+Az+rbJHSJIFlpktaPqep1FifbBiaEmb/fdlFRGcWh+Z2Hug1xQaV9Yg4x5d9QEr l1u3P1ORFh/lEenXjyVM5g5H82UJJTa/15zkcQLPo/trrdhAnxsgwrXmdej54eOxglsG AIEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Kxz8BsNe; 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 bc2si4684401edb.287.2021.04.19.07.15.00; Mon, 19 Apr 2021 07:15:01 -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=Kxz8BsNe; 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 A16A368811D; Mon, 19 Apr 2021 17:11:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D18AA687F99 for ; Mon, 19 Apr 2021 17:11:43 +0300 (EEST) Received: by mail-qk1-f177.google.com with SMTP id x11so35788067qkp.11 for ; Mon, 19 Apr 2021 07:11:43 -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=ld+e+bHjaejy6Y9ij7RZK9Z02zll44/FS7n8chE8viI=; b=Kxz8BsNeYCr8XvvsekYYhgPhTaTFvRwdOpXp+Cz+E11p+HcOCgO4aQd4F7WcySafxn W1/yMh7V6/f2Pbl+mBxRvWMWc1xuPQhQHmgfp021UTLaSPcTVfOVu/2uuQUE8O+UDPw1 XRPnQgRvgczPLC4in7ZK7sBfXLMB2CmrVqlt2xgda5QRjS0radrbu0IIXEksOovmyVHM dRViTa2Fxe/YJnl1kxaQ/dO7tv+2ddQ9+mxev3BPz51ysFxwPYdI8VPE3KTqvvcEOvn6 lxOLNpNz83rTCzlFjo02yQCh38OJ+AZQe8ehNyza61TuBuTU7JDIFB4X4MaSiCAT76iS 84dg== 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=ld+e+bHjaejy6Y9ij7RZK9Z02zll44/FS7n8chE8viI=; b=RSjaNQt7jHLNddszSTsQCs9QSWeLGk9V8QMDnuxnKXnPnrAIL2HLdULHVsrDv/3q6X I20BuG8pT6YUgSaB30lZbJpKTo+Cj9c/eptOMJgpbz/35ekzYiKfNi/Sk/q2p2C5rvJs Pm2zWqoCBBUxkPkwsd0aLTKcISAJtmFFqpdI/9vmtZrEriv0ImZ7HpRTIhFLm71moGEq /45xDquwMvsHioXrsLuXShmKMwyPWFKkGrZPaPRwicSlBHMOMR29gya5g2QuoB0F0owZ rEXzAkIo9X9gcNAbWDC9EuH72Pkbdgq5k30fAz2GbRC2R8ed6KQXz+4pNDeZ0S3qa6mj dq5Q== X-Gm-Message-State: AOAM531UQVI7rGZoVEhxQHKSPnaO6jG/bfnxGDF4e+/LYxQPGgelIbjK SNg1Ttkbjdh3jL0OdPbJV1fS+chrAWU= X-Received: by 2002:ae9:ec03:: with SMTP id h3mr12667913qkg.87.1618841502513; Mon, 19 Apr 2021 07:11:42 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:31 -0300 Message-Id: <20210419141024.8174-35-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 34/87] avformat: Remove FFserver leftovers 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: T3Lww5DXhxOj From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 18 ------------------ libavformat/utils.c | 22 ---------------------- libavformat/version.h | 3 --- 3 files changed, 43 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 166f1aa41c..578ccbd87d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1000,18 +1000,6 @@ typedef struct AVStream { */ AVRational r_frame_rate; -#if FF_API_LAVF_FFSERVER - /** - * String containing pairs of key and values describing recommended encoder configuration. - * Pairs are separated by ','. - * Keys are separated from values by '='. - * - * @deprecated unused - */ - attribute_deprecated - char *recommended_encoder_configuration; -#endif - /** * Codec parameters associated with this stream. Allocated and freed by * libavformat in avformat_new_stream() and avformat_free_context() @@ -1107,12 +1095,6 @@ attribute_deprecated AVRational av_stream_get_r_frame_rate(const AVStream *s); attribute_deprecated void av_stream_set_r_frame_rate(AVStream *s, AVRational r); -#if FF_API_LAVF_FFSERVER -attribute_deprecated -char* av_stream_get_recommended_encoder_configuration(const AVStream *s); -attribute_deprecated -void av_stream_set_recommended_encoder_configuration(AVStream *s, char *configuration); -#endif #endif struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); diff --git a/libavformat/utils.c b/libavformat/utils.c index ec48d1c08e..7d944268d3 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -115,11 +115,6 @@ static int64_t wrap_timestamp(const AVStream *st, int64_t timestamp) #if FF_API_FORMAT_GET_SET MAKE_ACCESSORS(AVStream, stream, AVRational, r_frame_rate) -#if FF_API_LAVF_FFSERVER -FF_DISABLE_DEPRECATION_WARNINGS -MAKE_ACCESSORS(AVStream, stream, char *, recommended_encoder_configuration) -FF_ENABLE_DEPRECATION_WARNINGS -#endif MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, video_codec) MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, audio_codec) MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, subtitle_codec) @@ -4392,18 +4387,6 @@ int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src) } } -#if FF_API_LAVF_FFSERVER -FF_DISABLE_DEPRECATION_WARNINGS - av_freep(&dst->recommended_encoder_configuration); - if (src->recommended_encoder_configuration) { - const char *conf_str = src->recommended_encoder_configuration; - dst->recommended_encoder_configuration = av_strdup(conf_str); - if (!dst->recommended_encoder_configuration) - return AVERROR(ENOMEM); - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return 0; } @@ -4448,11 +4431,6 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif av_freep(&st->priv_data); -#if FF_API_LAVF_FFSERVER -FF_DISABLE_DEPRECATION_WARNINGS - av_freep(&st->recommended_encoder_configuration); -FF_ENABLE_DEPRECATION_WARNINGS -#endif av_freep(pst); } diff --git a/libavformat/version.h b/libavformat/version.h index 81326aa199..de18399298 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -82,9 +82,6 @@ #ifndef FF_API_OLD_AVIO_EOF_0 #define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_LAVF_FFSERVER -#define FF_API_LAVF_FFSERVER (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_FORMAT_FILENAME #define FF_API_FORMAT_FILENAME (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27028 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp558749iob; Mon, 19 Apr 2021 07:15:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCBhnbDK/5Z+mJFDvcs2ePt2MCvcxzEFlF0XL6FH5QI6UqauZIkg5nxIhg1D1hZ20C41HG X-Received: by 2002:a17:906:4881:: with SMTP id v1mr3127077ejq.383.1618841711274; Mon, 19 Apr 2021 07:15:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841711; cv=none; d=google.com; s=arc-20160816; b=0sUeaWZz36DfwTHZwlUDtPYRfnRqtDEi7UucQOw7BTjI+3MuIPlOElFrvDxZ9R0SWo Ckssf8KgYGN2k2G9QpqWBbjfFGG2Do5ME5Gx1Ns8SegWbbLYB95eSLvLXVCpnoODnCoN WB+G02E8IW/U9jnNoOAzrvCBWNd8XsoeBzSfYhrapPI2o5ub1ULdfoQYR6Ylv0wN7Naz 1TDDaOjMTpXCLgqJfjG1FYn2NTew0iX/qL54OHvIgs64mLAAW8B6fLqxe92EHB0fXvDr CXCj3qjH9QkOM3xO4S5tn+P/aD9JJ4lqCECBoQmvLfzYyGZicTIDVCdA4GpCt7pqKNxa MLyQ== 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=uBS3R7haCjScD2UBuro3MEup7S4Ge4ZZgb03uGCxiHE=; b=D34nn/U7a5FN+QpPxkSaCrXkI2dhh95ZZXiMu2FPCkjwEqM2AG1xi7446sJLXapstJ qxFEvkyoGoXsmQNJPfnLcue5aQQ2z2/yT+/SDHonxvuQrFkXAkgNbVm4Fk6tL+pnlWO/ o7uPESerybiepe/t/vZXuGRKB0mBmaJoxph0w4Vjl/4GJeCJG7vHBr9IFjC4LC8FinjV dglN6nL43YRWHwvIkFQ2Ec+cXDVZPkQuA0v+hijObx/gg4GVFzy/0NBsDnfQJnxLGxlI nH4tYjlrF3FTCrqxfW1gEdHR8G2mKzl14tXw5l41m2tpQbRYZgXqRUvBGp9R11fPsQMk vpPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mPG6pkC6; 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 b19si11558239edr.172.2021.04.19.07.15.11; Mon, 19 Apr 2021 07:15:11 -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=mPG6pkC6; 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 B5CE7688057; Mon, 19 Apr 2021 17:11:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1939D680CEC for ; Mon, 19 Apr 2021 17:11:44 +0300 (EEST) Received: by mail-qt1-f169.google.com with SMTP id j7so26122873qtx.5 for ; Mon, 19 Apr 2021 07:11:44 -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=lUgZeWdK2wI5UDLFRBz2zsZEsMNqi2hrgtQ2+6HkfCc=; b=mPG6pkC6dAcRIbrxQmSoaJzWAzYMFsY3seKSTJ9EUaZjpegD3JImIwgcxRG3H0Bme3 Et2I1flDDqHUqEqbF249fUF7s6MWuaAAMCMMsUjOUwYSL3wtkEUp0BSgiHJKuy6FMcOF 94k0I76XDZZMF38qObcXyQClwZIPLADji47Y7Nm+s2CwputHkQWAALcgJCfcmrhO74r8 oO3GbMnbFEJJhMnj0kX9jaBBueEcVSem9/Bdf3VSW69Q9k7OWx5cn68hQJ7+MJDBvqtm h1xQX9Al+7GjqgcpiED7oEjz6V2PvQumCjKAcSD5MlDMmeMV5JsdnpsNyOX/BdO1+rvd wRaw== 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=lUgZeWdK2wI5UDLFRBz2zsZEsMNqi2hrgtQ2+6HkfCc=; b=jzk59fCLawrYcC4hNHI5ew7FsoDvFXOwznUyty6aUjTuRGlElZIugz8fvCJNMWH22m GXpekSnse2VjMVwvC0QCCqDS67RGsqxWSevYINzylcIgdvCNEpq0JJcxviholyQ4RVM+ 0Y7YRw7RRmqY2z9U/BL4KCK0/BWn8YpeD6oBQR7VLJwoSUb+opA3SkgqgqfqVS7D/5PQ o023eW3J+YvVps+mfcG4sO8lx3pEYMYur+t7W8sGHuBNThizdWD3QJrTHVtC1hjsJK/S B/4kUZxpp/Du8AscC810nfEjbRrWLSPWWRNdUJoMLmIsC+r24iyketae5IKjoCPG5asO tfaw== X-Gm-Message-State: AOAM533q325MrU/ifU+KA/KeVg3GtabeUosqi5akWc+d445armVVbCUJ yUrBx+Tp6e9vYJZf0Yz0tK183yYg7uE= X-Received: by 2002:ac8:5e4a:: with SMTP id i10mr11848113qtx.341.1618841503614; Mon, 19 Apr 2021 07:11:43 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:32 -0300 Message-Id: <20210419141024.8174-36-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 35/87] avformat: Remove deprecated old open callbacks 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: GyPl5eoWl6ub From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 26 -------------------------- libavformat/options.c | 7 ------- libavformat/utils.c | 5 ----- libavformat/version.h | 3 --- 4 files changed, 41 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 578ccbd87d..14063ac5e5 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1743,28 +1743,6 @@ typedef struct AVFormatContext { */ enum AVCodecID data_codec_id; -#if FF_API_OLD_OPEN_CALLBACKS - /** - * Called to open further IO contexts when needed for demuxing. - * - * This can be set by the user application to perform security checks on - * the URLs before opening them. - * The function should behave like avio_open2(), AVFormatContext is provided - * as contextual information and to reach AVFormatContext.opaque. - * - * If NULL then some simple checks are used together with avio_open2(). - * - * Must not be accessed directly from outside avformat. - * @See av_format_set_open_cb() - * - * Demuxing: Set by user. - * - * @deprecated Use io_open and io_close. - */ - attribute_deprecated - int (*open_cb)(struct AVFormatContext *s, AVIOContext **p, const char *url, int flags, const AVIOInterruptCB *int_cb, AVDictionary **options); -#endif - /** * ',' separated list of allowed protocols. * - encoding: unused @@ -1864,10 +1842,6 @@ attribute_deprecated av_format_control_message av_format_get_control_message_cb(const AVFormatContext *s); attribute_deprecated void av_format_set_control_message_cb(AVFormatContext *s, av_format_control_message callback); -#if FF_API_OLD_OPEN_CALLBACKS -attribute_deprecated AVOpenCallback av_format_get_open_cb(const AVFormatContext *s); -attribute_deprecated void av_format_set_open_cb(AVFormatContext *s, AVOpenCallback callback); -#endif #endif /** diff --git a/libavformat/options.c b/libavformat/options.c index 07403b533e..632d450c90 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -181,13 +181,6 @@ static int io_open_default(AVFormatContext *s, AVIOContext **pb, av_log(s, loglevel, "Opening \'%s\' for %s\n", url, flags & AVIO_FLAG_WRITE ? "writing" : "reading"); -#if FF_API_OLD_OPEN_CALLBACKS -FF_DISABLE_DEPRECATION_WARNINGS - if (s->open_cb) - return s->open_cb(s, pb, url, flags, &s->interrupt_callback, options); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return ffio_open_whitelist(pb, url, flags, &s->interrupt_callback, options, s->protocol_whitelist, s->protocol_blacklist); } diff --git a/libavformat/utils.c b/libavformat/utils.c index 7d944268d3..bb0351d7f5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -122,11 +122,6 @@ MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, data_codec) MAKE_ACCESSORS(AVFormatContext, format, int, metadata_header_padding) MAKE_ACCESSORS(AVFormatContext, format, void *, opaque) MAKE_ACCESSORS(AVFormatContext, format, av_format_control_message, control_message_cb) -#if FF_API_OLD_OPEN_CALLBACKS -FF_DISABLE_DEPRECATION_WARNINGS -MAKE_ACCESSORS(AVFormatContext, format, AVOpenCallback, open_cb) -FF_ENABLE_DEPRECATION_WARNINGS -#endif #endif int64_t av_stream_get_end_pts(const AVStream *st) diff --git a/libavformat/version.h b/libavformat/version.h index de18399298..e264abd77b 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -55,9 +55,6 @@ * at once through the bump. This improves the git bisect-ability of the change. * */ -#ifndef FF_API_OLD_OPEN_CALLBACKS -#define FF_API_OLD_OPEN_CALLBACKS (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27046 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp558906iob; Mon, 19 Apr 2021 07:15:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPHT3/9LWuGt6zyPIZc12GYgdP99t1VW/FN/oGCZQwnfKSo/QlZ5/IDlM0iyTd4ODn9N6I X-Received: by 2002:a17:906:c82c:: with SMTP id dd12mr22131632ejb.132.1618841723101; Mon, 19 Apr 2021 07:15:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841723; cv=none; d=google.com; s=arc-20160816; b=ZSBBIQniiv+34A3LoYUoB2SyQUIYz5QIF41FsOgwc0b3ouUuGcjC5oCmWZUg1LVVRw 5AsVyiAS5/JTzurTImycx5Ezw88vWE/02kltpFS+AbcFGJF1nfMgmFyp62HB9PUeAqPe ssnax1NCX21z7pYTMw38a0cP8TaGlkGgJE9pC3QBqnMpNmfQLYtua+NZR2wIXPmWoRhp tOco9y0+J15UcgRVb6K0dVa5zS8SFvTjPleuJo41Oi3Fc+lQ4auhItmEdMTMqxh00vPo CuN53C/LGs5kuOJwUSkEQ1vG1q0tKMQyJZcMu7C507VDdBpuonPDbAAh71l7/1+EyLHz 9t/w== 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=6i7lWOXyG+CjKIsvDANMg3UbJxfYFlWYT+4IlhMMm3A=; b=MfdzToDHDMAdIlb3vzepAbuYShcw99B4LE5nrAxnpkfYxY86XLaJePzyjZTJxL6ilD wmoaEeqMAgtphnD8huHwyqTdJsI1/r/bmkOVckj5fjUVjuoRDH6rXazlh8IgAePox0H8 0oBNkRWRWGRsTdFqAIzct07lJ5CrBVEWGK6bvkE+t7wLcx1QGTGU3l+QRlWnhQ6DJ9h1 sCaYePnaQqmxk5qqdCxK2hS9cyotoYnt7Rw/Q/MapbUotge2Bvac35YhFlEfpucpm9NL LaMi/n2EwT+rm4QT48ub4/chxps2SwQ3KqArIOv44xwcq0F0d09I5OyBd2ASJXIp8QVP qpVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=JlpoFqSJ; 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 wr14si12143711ejb.11.2021.04.19.07.15.22; Mon, 19 Apr 2021 07:15:23 -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=JlpoFqSJ; 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 CC88D688178; Mon, 19 Apr 2021 17:11:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9249B688068 for ; Mon, 19 Apr 2021 17:11:46 +0300 (EEST) Received: by mail-qt1-f173.google.com with SMTP id d6so7851143qtx.13 for ; Mon, 19 Apr 2021 07:11:46 -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=O/U4sFlZKBCNdIqrB0s4/dBUcS38a//AJptspK05+qA=; b=JlpoFqSJTIFJjeThge6G0tYiXYdMBNcXAiLu5P0erKBR2lKLg0e8BUsB5fNGfggkn/ z3z0He9wwhycL0zrvvdscqh9f9BTTm0bw7motJOmfLqwL82sqwre82HmgtOVRCCr68Lo V+86D/ijltCUwl0M+jabHF7Ld3PeP1EJ4jwWe8ioO5BEHjoUsjkPSaBMefUr6amcRYt8 Z9UJa5g9URDuhE1ih7XF1EDaANfQdDHnSyXUt2iPD5Y527ZtHlhyz7CerHLR66i4c6SJ 4PeMnIJkXlfipct78nuv0XtXYsQSiDmXODSO3fMUHvSI1rpBbxpo0DG2YhrxOIHlwYCf x0Cw== 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=O/U4sFlZKBCNdIqrB0s4/dBUcS38a//AJptspK05+qA=; b=fg6YoFgps9a1TsdAf1I9t/3CFa3ODvf+9wpFj8JZlZNDuXChFZr2bK8oFJHC32N9Gv aQGMq8X419M4uCJCc4z7aNlHtM1JClKxwabTCSlmUpXcudaUEnubJlJMl/iF/KYsuOjx ZWvC/OadkqprhcKtX/BqCVZRQEpzCpK/FKLpcuAbmVm6DExSKGFuQEORFTKDuhG1Kwx6 fpmcgNzeNJwZ79FsWXAr4sSrVH2wJRf6P8TDyuMIxcObX/h/CvGLoOAuhF+h64iLqWic PizKn4TIC3yvFVec+Yw523WOTtGNnBmhUrgE9cMU4b5njKSoPxsHrRNEXFXOr/HganvI 7GNw== X-Gm-Message-State: AOAM530NdQitSNy1AjwpCmfa59IeSdOx1hvDUuCfoBucWTOqtr86SRo2 Q/UrysCtV30cI1dQNkKnlvrgzGD/ZCE= X-Received: by 2002:ac8:58c2:: with SMTP id u2mr11834275qta.209.1618841504704; Mon, 19 Apr 2021 07:11:44 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:44 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:33 -0300 Message-Id: <20210419141024.8174-37-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 36/87] avformat: Remove getters and setters 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: ahPllZiR1+HX From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 48 ------------------------------------------ libavformat/utils.c | 18 ---------------- libavformat/version.h | 3 --- 3 files changed, 69 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 14063ac5e5..d629eaae5d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1086,17 +1086,6 @@ typedef struct AVStream { AVStreamInternal *internal; } AVStream; -#if FF_API_FORMAT_GET_SET -/** - * Accessors for some AVStream fields. These used to be provided for ABI - * compatibility, and do not need to be used anymore. - */ -attribute_deprecated -AVRational av_stream_get_r_frame_rate(const AVStream *s); -attribute_deprecated -void av_stream_set_r_frame_rate(AVStream *s, AVRational r); -#endif - struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); /** @@ -1807,43 +1796,6 @@ typedef struct AVFormatContext { int max_probe_packets; } AVFormatContext; -#if FF_API_FORMAT_GET_SET -/** - * Accessors for some AVFormatContext fields. These used to be provided for ABI - * compatibility, and do not need to be used anymore. - */ -attribute_deprecated -int av_format_get_probe_score(const AVFormatContext *s); -attribute_deprecated -AVCodec * av_format_get_video_codec(const AVFormatContext *s); -attribute_deprecated -void av_format_set_video_codec(AVFormatContext *s, AVCodec *c); -attribute_deprecated -AVCodec * av_format_get_audio_codec(const AVFormatContext *s); -attribute_deprecated -void av_format_set_audio_codec(AVFormatContext *s, AVCodec *c); -attribute_deprecated -AVCodec * av_format_get_subtitle_codec(const AVFormatContext *s); -attribute_deprecated -void av_format_set_subtitle_codec(AVFormatContext *s, AVCodec *c); -attribute_deprecated -AVCodec * av_format_get_data_codec(const AVFormatContext *s); -attribute_deprecated -void av_format_set_data_codec(AVFormatContext *s, AVCodec *c); -attribute_deprecated -int av_format_get_metadata_header_padding(const AVFormatContext *s); -attribute_deprecated -void av_format_set_metadata_header_padding(AVFormatContext *s, int c); -attribute_deprecated -void * av_format_get_opaque(const AVFormatContext *s); -attribute_deprecated -void av_format_set_opaque(AVFormatContext *s, void *opaque); -attribute_deprecated -av_format_control_message av_format_get_control_message_cb(const AVFormatContext *s); -attribute_deprecated -void av_format_set_control_message_cb(AVFormatContext *s, av_format_control_message callback); -#endif - /** * This function will cause global side data to be injected in the next packet * of each stream as well as after any subsequent seek. diff --git a/libavformat/utils.c b/libavformat/utils.c index bb0351d7f5..3643a83632 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -113,17 +113,6 @@ static int64_t wrap_timestamp(const AVStream *st, int64_t timestamp) return timestamp; } -#if FF_API_FORMAT_GET_SET -MAKE_ACCESSORS(AVStream, stream, AVRational, r_frame_rate) -MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, video_codec) -MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, audio_codec) -MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, subtitle_codec) -MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, data_codec) -MAKE_ACCESSORS(AVFormatContext, format, int, metadata_header_padding) -MAKE_ACCESSORS(AVFormatContext, format, void *, opaque) -MAKE_ACCESSORS(AVFormatContext, format, av_format_control_message, control_message_cb) -#endif - int64_t av_stream_get_end_pts(const AVStream *st) { if (st->internal->priv_pts) { @@ -221,13 +210,6 @@ static const AVCodec *find_probe_decoder(AVFormatContext *s, const AVStream *st, return codec; } -#if FF_API_FORMAT_GET_SET -int av_format_get_probe_score(const AVFormatContext *s) -{ - return s->probe_score; -} -#endif - /* an arbitrarily chosen "sane" max packet size -- 50M */ #define SANE_CHUNK_SIZE (50000000) diff --git a/libavformat/version.h b/libavformat/version.h index e264abd77b..67dbff5c56 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -73,9 +73,6 @@ #ifndef FF_API_OLD_ROTATE_API #define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_FORMAT_GET_SET -#define FF_API_FORMAT_GET_SET (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OLD_AVIO_EOF_0 #define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27049 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp559058iob; Mon, 19 Apr 2021 07:15:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmagwnRRe7bTGXEfJ+nScglGvi5zcNjzi56KHXGaCOrbxv8zfGCAMKyoF+RSr7WkeVA5dV X-Received: by 2002:aa7:c391:: with SMTP id k17mr7930006edq.153.1618841733447; Mon, 19 Apr 2021 07:15:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841733; cv=none; d=google.com; s=arc-20160816; b=J0ski0SlGq/dcDMuh4+NQ5z95V95bibmKgrhYSR8OEX59RRww3CodXCWeB6XCirPGq BWfBtQ1O5V11u3HqE5XI/oks7531l23bDzQYI6u5UlB6zH7e3xARd1sd2FdqWHFjLC+M s31s5B7bqtiTCbZLOu2pnL6TXrKSJyM7n7JW9hXp7aGtrS/NryvP9jAK8egaSfXLxvTL 2KDS//lIY5lsP3yvlCGarnllrx5iHp8K6oEVT2TxF3Y6p3J4OgrrMiGm5vPmVJ+nPmzW z4YTUkuMah2O2xPXqJNMeRaUkz1gjMzaubpP7B1vP6oJzZ8jCd5hHtwxTVTdKatB829/ 5jqA== 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=sRadedS1Io75lvTv+uCZ3PkRq/AgQ0uot6k8DUWH2DI=; b=Jx8DTpq1oqykVkl4cqgnp1GKR8SYNDZ7sF2mUOwv6P96HPNEAqe+p9u/hEnJ5zuuy6 9gAQasiFU/v1AsC5255bqx1VMK44WPyk8KXCC2/jVMO/mvNeuGtGBQje+Z0x6frMcth6 5zO4iruJEl/olBX508Pos/vHn3jfPu+YoGZB0e0bJGcrqZH+XDH/dpb6gAXCfZfpp+Cw Ls6h2YUSjAQYHQ8lxxYxXmD0KHtlJk5vzDmIc8gY0h1UZtT6IPFn38YzaWRIr/6oCKZQ kXgSbHYFh3C8k2s7vnv+XvMMBQ8WiEiMz8pOIFqAM1LMmqkY/xTUrl8RkqT/ioS/6V+R mFgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=irQnee7G; 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 g1si12018381ejw.615.2021.04.19.07.15.33; Mon, 19 Apr 2021 07:15:33 -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=irQnee7G; 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 73EDD6881BB; Mon, 19 Apr 2021 17:11:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEBCB687F17 for ; Mon, 19 Apr 2021 17:11:47 +0300 (EEST) Received: by mail-qv1-f50.google.com with SMTP id i9so16741450qvo.3 for ; Mon, 19 Apr 2021 07:11:47 -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=iOGKooxSjnJEvy2E173i6JjXSyt17z0HUmWgs/OBkOA=; b=irQnee7Gc0sQqZJNp6h3pbKU4D+yZIY9WaDrUEntanpCzrfuUV5bwQEjc1mdBnmoFG ycDTsJeYgCC4QNL7vjw3wICmGPJQzk7IGJYuji9tIKC6d/Ay7xhcQx0z8QQBJmni1QaS V3PimB1fis3dW3xM/o2fSICThVoBYrONp26DsRCrCf2i7mbaOGSrra2A5UyGhdeQ1WOG 8TGzjy10R8UWoB5qMrW3DcSPCsesIjugS7qLO5kczx7nbfN2FZozlbUn1PlfjEj4spqO TO1lb0TDLpOQ1mBrtHs8uJXUQV+EwFrZNEqNcSpdLtEcgdy2xa8LL9/iI0Lr0hGnhptk vj/Q== 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=iOGKooxSjnJEvy2E173i6JjXSyt17z0HUmWgs/OBkOA=; b=OR4G6CU8BHcDMwZHnFwoV+ETUCblKunJrlME/KzKcdgL4eciGiOZPrpFDPSDrIsmVL b+6VAf62Wug1Hhzy/fUlUK6YSwu0k7T8S/SoDJnNbQ1pkGD0YUsZtBAHw9Z4fYROygEl ufVDtg6lxtiFx6O/l8RZwNrskwVNFGlJYfX71R32MpCdlvqx/qHlUly3mi+wmCv8woh/ o2JZ1FS+MH325SNtwUNCpGUsna1LxYt059/iZlcHQ1o6/+ZrN4Uh0dbigJTYQR2Brwn5 /o3s4yB7wo9W+IVd3pYvdS+MoE9eUZL6fRCe8P7N0GO1A1Xy7/jBAU/DsYP1t+Wc1ULn ItnQ== X-Gm-Message-State: AOAM531zlgHHUqHnR2mYVmtt/nZH+XuZaruxu02GEvnUFP8OwvD0YceV wrKg6iSukFclhXK3bY5IjQkzpshinkc= X-Received: by 2002:ad4:4ee8:: with SMTP id dv8mr2746697qvb.46.1618841505873; Mon, 19 Apr 2021 07:11:45 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:45 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:34 -0300 Message-Id: <20210419141024.8174-38-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 37/87] avformat: Remove deprecated filename field from AVFormatContext 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: CRf03Mu9p9my From: Andreas Rheinhardt Deprecated in fa8308d3d4f27d6fb38ac2069887a7b259f1c6ab. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 13 ------------- libavformat/mux.c | 11 ----------- libavformat/utils.c | 10 ---------- libavformat/version.h | 3 --- 4 files changed, 37 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index d629eaae5d..d0cc12f931 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1255,19 +1255,6 @@ typedef struct AVFormatContext { */ AVStream **streams; -#if FF_API_FORMAT_FILENAME - /** - * input or output filename - * - * - demuxing: set by avformat_open_input() - * - muxing: may be set by the caller before avformat_write_header() - * - * @deprecated Use url instead. - */ - attribute_deprecated - char filename[1024]; -#endif - /** * input or output URL. Unlike the old filename field, this field has no * length restriction. diff --git a/libavformat/mux.c b/libavformat/mux.c index a05b55b53c..1c08c74b90 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -175,11 +175,6 @@ int avformat_alloc_output_context2(AVFormatContext **avctx, const AVOutputFormat s->priv_data = NULL; if (filename) { -#if FF_API_FORMAT_FILENAME -FF_DISABLE_DEPRECATION_WARNINGS - av_strlcpy(s->filename, filename, sizeof(s->filename)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (!(s->url = av_strdup(filename))) goto nomem; @@ -247,13 +242,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) (ret = av_opt_set_dict2(s->priv_data, &tmp, AV_OPT_SEARCH_CHILDREN)) < 0) goto fail; -#if FF_API_FORMAT_FILENAME -FF_DISABLE_DEPRECATION_WARNINGS - if (!s->url && !(s->url = av_strdup(s->filename))) { -FF_ENABLE_DEPRECATION_WARNINGS -#else if (!s->url && !(s->url = av_strdup(""))) { -#endif ret = AVERROR(ENOMEM); goto fail; } diff --git a/libavformat/utils.c b/libavformat/utils.c index 3643a83632..d8b44ce896 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -547,11 +547,6 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, goto fail; } -#if FF_API_FORMAT_FILENAME -FF_DISABLE_DEPRECATION_WARNINGS - av_strlcpy(s->filename, filename ? filename : "", sizeof(s->filename)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif if ((ret = init_input(s, filename, &tmp)) < 0) goto fail; s->probe_score = ret; @@ -5800,9 +5795,4 @@ void ff_format_set_url(AVFormatContext *s, char *url) av_assert0(url); av_freep(&s->url); s->url = url; -#if FF_API_FORMAT_FILENAME -FF_DISABLE_DEPRECATION_WARNINGS - av_strlcpy(s->filename, url, sizeof(s->filename)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif } diff --git a/libavformat/version.h b/libavformat/version.h index 67dbff5c56..e0cf9e6f3e 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -76,9 +76,6 @@ #ifndef FF_API_OLD_AVIO_EOF_0 #define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_FORMAT_FILENAME -#define FF_API_FORMAT_FILENAME (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OLD_RTSP_OPTIONS #define FF_API_OLD_RTSP_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27037 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp559221iob; Mon, 19 Apr 2021 07:15:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLL5yZ6VpTuYCpn+ME3c1r+V3BmoFNiFb3CRkl7QdFU+1J+FVhGu6exp9Q8Ck2+VnC/LHL X-Received: by 2002:a17:906:b2cd:: with SMTP id cf13mr22883423ejb.419.1618841744584; Mon, 19 Apr 2021 07:15:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841744; cv=none; d=google.com; s=arc-20160816; b=Dv02mbZNK9bBSnBBy0VmEQU+Z1UojdijiFFMWEfmRmTs9QUK5gKnzranUuvs5K/9ks N92A5pwkenccvY3RwIPl/1PqWFGfg3FZr46mo+YMHLFqZ3rWAojNMJPnVu21IZ6wrOgk R8fAMILawzt6YUJ2M6x9G8U8F5s4Ux1XA48iFXtaiDz5wuwio7iJoLHU3TA+BUsp6UKM Qfr6nsLM0jEG0SbUUVtB0qu+fGFvMym3OG8ZQ6qcSA81fSAVQH5r7RELaulPIwaRfUkt 1euaOMT5bENtJtCOCtxrmlYLAnzfZzox8VSnYczG01oobyLnd3HK6b5aoIs2+eYCSI75 K0yw== 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=i7jX+E7bxOXAcO9FODhMWWljMMyrQpxVve8Syw+2kB8=; b=pm2YiMBGmjvOHP7ovpBVU/QTWLOtOSPBFNGPsf96nbRO3sOZE2l3M5b91SitKLf1Xc /LBINR0mWWwMFmMrE0uePRKhRASMQuDyF5HvwJeURklEJTsNGUeDTYwUbwxkIN7JFLEM QleuKkDAMoCujyTkauhrclaSmhdLynQajyDyQu8bOpQf94QCJi14xKCJ7sZSZ+9+Yx7m gXM4Wg9PEoTwce27tgaPcl/veBvj5ARilh6kw/Tsp/RwPfcNysalVjfbU7DlQMGVP0T2 hEeBxsvfCGoUaT6fi6kXpRXRqZdKbUHndMytRDpaJyNlR1hh6Un4Rdm7mDVUKFQwszbt /3pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QLSw9EcQ; 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 g23si12716196ejr.602.2021.04.19.07.15.43; Mon, 19 Apr 2021 07:15:44 -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=QLSw9EcQ; 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 72D1B6881A8; Mon, 19 Apr 2021 17:11:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E279368812C for ; Mon, 19 Apr 2021 17:11:48 +0300 (EEST) Received: by mail-qk1-f169.google.com with SMTP id d19so134692qkk.12 for ; Mon, 19 Apr 2021 07:11:48 -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=uTBi2k9QzlI0oO58KR0kHXM1NsayT7MkO1ks1kQZAiI=; b=QLSw9EcQDLkfTNl2v/KK4IrEMoT/A4ngIgNAxrGCeVWFXIyE9aBFFoBeq17+XabPJX MNUCA65aPUwFr2WGEWJq5rLVcznU92VPvmT3DCKMpkG569oNAxOdUcJiokxDb52yI3ps D1ahs2Gu1NsMe2de2zhSL2iyRFDh8wTRnk9M+idUAqfNBY/fdL7zl2lt1e7prDIqdG6D IMFeUqdiP0mLJKiH2vrxYJxvnaVIt2IRHQQa6COZ1k0fVRYcEpwDPmtdZ1cWW+3fbtwL 6YRcN9+k4zzBpCwGpW85hms47KzylipyaVhOZaG1B6tk/h5WVTSBNne0q4agGvN61aOO G78A== 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=uTBi2k9QzlI0oO58KR0kHXM1NsayT7MkO1ks1kQZAiI=; b=pX5rRrGrESm3gkEPBhBmNq+76RnELxO25abwgIFq8IHDX6TRwBYkA/Tz1xXfakld0i 9huBQ8U+pur7YPCMmR8DjdCZXrjMEO1BM0XJIkflAbRZyPuEaZWCPJYWwK5E2Wp+Z5mv IZarpN9YE/dUnHK11QBi436NxLAFZRXJc0W3NVdqkIAOUchmai7ULUYqhsIaXF0zSpXE SCrYDuWnE6MMs8uFA9MaI+KnhehRwT5XqwsqRpnwpYy2k5AjL7BtqnKsuzY49m89hx8K ytScLlQp/9eihrUUkx3CZ8gNE6AXG7aKo0uPeRVWM1L6lNBzeNXfWq1i18VDIkfh2lVd DgKQ== X-Gm-Message-State: AOAM531dTefI/Gly0KBjsSUqFHtcsL1f2PeqRiGjNFKDYxpjup8zHd5K MSaoRK++4TXuhBvEHAuJfwBaGTB5bUE= X-Received: by 2002:a37:2ec4:: with SMTP id u187mr12418147qkh.472.1618841507534; Mon, 19 Apr 2021 07:11:47 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:47 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:35 -0300 Message-Id: <20210419141024.8174-39-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 38/87] avformat/avformat: Remove outdated private fields 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: CO7uphVsiKgH From: Andreas Rheinhardt Affected function pointers (always NULL) in AVInputFormat, AVOutputFormat as well as private fields of AVStream. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 47 ------------------------------------------ 1 file changed, 47 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index d0cc12f931..093084221a 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -578,18 +578,6 @@ typedef struct AVOutputFormat { * @see avdevice_list_devices() for more details. */ int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list); -#if LIBAVFORMAT_VERSION_MAJOR < 59 - /** - * Initialize device capabilities submodule. - * @see avdevice_capabilities_create() for more details. - */ - int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); - /** - * Free device capabilities submodule. - * @see avdevice_capabilities_free() for more details. - */ - int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); -#endif enum AVCodecID data_codec; /**< default data codec */ /** * Initialize format. May allocate data here, and set any AVFormatContext or @@ -755,19 +743,6 @@ typedef struct AVInputFormat { */ int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list); -#if LIBAVFORMAT_VERSION_MAJOR < 59 - /** - * Initialize device capabilities submodule. - * @see avdevice_capabilities_create() for more details. - */ - int (*create_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); - - /** - * Free device capabilities submodule. - * @see avdevice_capabilities_free() for more details. - */ - int (*free_device_capabilities)(struct AVFormatContext *s, struct AVDeviceCapabilitiesQuery *caps); -#endif } AVInputFormat; /** * @} @@ -1021,11 +996,6 @@ typedef struct AVStream { ***************************************************************** */ -#if LIBAVFORMAT_VERSION_MAJOR < 59 - // kept for ABI compatibility only, do not access in any way - void *unused; -#endif - int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */ // Timestamp generation support: @@ -1055,16 +1025,6 @@ typedef struct AVStream { enum AVStreamParseType need_parsing; struct AVCodecParserContext *parser; -#if LIBAVFORMAT_VERSION_MAJOR < 59 - // kept for ABI compatibility only, do not access in any way - void *unused7; - AVProbeData unused6; - int64_t unused5[16+1]; - void *unused2; - int unused3; - unsigned int unused4; -#endif - /** * Stream Identifier * This is the MPEG-TS stream identifier +1 @@ -1072,13 +1032,6 @@ typedef struct AVStream { */ int stream_identifier; -#if LIBAVFORMAT_VERSION_MAJOR < 59 - // kept for ABI compatibility only, do not access in any way - int unused8; - int unused9; - int unused10; -#endif - /** * An opaque field for libavformat internal usage. * Must not be accessed in any way by callers. From patchwork Mon Apr 19 14:09:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27029 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp559346iob; Mon, 19 Apr 2021 07:15:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz83gh0OZZdUK6UjGInt8s7FHfQ25OgPhMN0VOs+JrJtwv3Q2TYqpz6GSSXUuwKrubwf3Zq X-Received: by 2002:aa7:c5c2:: with SMTP id h2mr11969007eds.38.1618841754311; Mon, 19 Apr 2021 07:15:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841754; cv=none; d=google.com; s=arc-20160816; b=FuB0IKJZyGo1VBxTXGbRP3KOkd4XLin1pUVukkrB4Mk1WmrXdN3D+nUq28n4b2crnp kYwmeEWcCgisjiV1811p/hbgaNjKJlzu0zrsG+3Z2sraGVEVk1GRyF0rJRUL2bJcCz7/ zQyPDlWg/SskNEVp0UWYWPVJ38+nh7RDd4LZw8HoUL1rhczt6+BK5/8MARmJCb0pzRzS d/hqdoM/v0fMdev8esp/mJzFHdADuSye1Jbf5u0yxO6J0I+FgbY5T6vt+3vT8y//6Rjr Y5vaDBdzO3GH3t9QY6BqYWzJH1ZygcBgWF3AMDea4FGcPoWWS0gRlxa1HL1r0Kw1s32p w6KA== 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=ebRwRm0oOhJmAxe6xM17HY5tqs1Ig5lHNOSDkWYy05Q=; b=0/P6yxx3TGsMIwz8PKV89wP7v0ursQGLJkTx3nNr3zoxzg/ckmjKdW+bAlUSGBVn8e A4Iqbp8SEy5hYF6VcLBXR9OeHKQin8MfSnDOP8Xw8f27hPcDnuGAN6fCCRLs4Vkt9S9N /lzLu8ER4zCeZFqCK5ZkSahkWO3r0bj0IjaXLgAdMq0BA0WcgO84vapntfJsX2VVevFd hURA6KG2PtVY4LiF2wU3zzO8iIUkdcDxEzArp4tsxeOSIIId8hq5P0Y79KDRo+DTH9Z9 KDnN+/KbCiMX0e3YDBiyXelGqc/Uko/Mev9AlUIQe2/1Gr/UVtFYSNbKJPn8yoMZTiO5 GOFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="ehd/xE0J"; 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 gy25si12304306ejb.576.2021.04.19.07.15.54; Mon, 19 Apr 2021 07:15:54 -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="ehd/xE0J"; 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 76D9E688374; Mon, 19 Apr 2021 17:11:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F321C6880FE for ; Mon, 19 Apr 2021 17:11:49 +0300 (EEST) Received: by mail-qk1-f173.google.com with SMTP id i12so4319379qke.3 for ; Mon, 19 Apr 2021 07:11:49 -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=omJQw6puLRcvIMBTDI3Ux1a74js99iaOX2kzH/tZLck=; b=ehd/xE0JgQqd99nxvAJTs2wo+a38PNRq6ShpYMo/HC4DityrwJ4xf+uCWvHQHgeLTX Gkmjf/76RwNSY7Lfp2Sl315insJb8v81L47i8+D8jkd5TUYn4yoUOUOfs3aUrVddi7Id HvXorAyIFSv2CFcjvvMzC3PH2+F7gRuWs/lHvPvfrKxuvRGXAb/MYuJaNEw1DZWBAY7d 1WVyU9oDJoWNHB7OJykOv0LpqsFVkjrnKBf+Tjyh33pqMVcXIa67OKceXbYekrW/9LW3 5Wdr6nC5v24YBjnwtHU69uVzigKRK5Q5t5QbYTE1RX82itXb4wirUKEsmq9cOZrTIpaA c6IA== 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=omJQw6puLRcvIMBTDI3Ux1a74js99iaOX2kzH/tZLck=; b=oDm1lGf/3mg4JEaI22XFC+eXCkL36OzIbbUixAAW7pJYiDJEKUsQRF/skUQFpHOtI0 TnE3ojdLisyXypwbljVDTRKUmsMGBi4bWRmm6CMTeREFNwKwj/cYrif3XO1PuJsEc4oI 7iIBo0shpC+Wv+NC0DD2WHRcsvM6EsFX5vNsEfef8sxJ8bimVIQR7qWCAg3173gjUSw8 gRwqIv61LdVgO6EgwzjDJ+me8uXrId3RKnTCGLCovuQtCMvKzKcKS3Z4IyBLjz4vwF/z RN/TG9SByW2A/rrGJPE/VTGx0Zz8Tcyzx/ca8y7D3iPNOYUl9L56m//XJGy5JbYYslce MsCg== X-Gm-Message-State: AOAM533n9er7bqfeUjCMJ1rk+dzHtZqwioyd5hNfzIoQ9N6aF7vl/vUK 0J+eXNJo4NWPp6sGJOrW8zVpZeISoaM= X-Received: by 2002:a37:a6d2:: with SMTP id p201mr8254185qke.146.1618841508637; Mon, 19 Apr 2021 07:11:48 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:48 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:36 -0300 Message-Id: <20210419141024.8174-40-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 39/87] avformat/http: Remove deprecated "user-agent" option 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: qG6ZgoVfzJcQ From: Andreas Rheinhardt Deprecated in 27714b462d1bff9e9b40fbdabb39f58e79032b81. Signed-off-by: Andreas Rheinhardt --- doc/protocols.texi | 3 --- libavformat/http.c | 3 --- libavformat/version.h | 3 --- 3 files changed, 9 deletions(-) diff --git a/doc/protocols.texi b/doc/protocols.texi index a6e46b99ad..2cc2b561de 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -406,9 +406,6 @@ Set the Referer header. Include 'Referer: URL' header in HTTP request. Override the User-Agent header. If not specified the protocol will use a string describing the libavformat build. ("Lavf/") -@item user-agent -This is a deprecated option, you can use user_agent instead it. - @item reconnect_at_eof If set then eof is treated like an error and causes reconnection, this is useful for live / endless streams. diff --git a/libavformat/http.c b/libavformat/http.c index fb2d9306bd..1fc95c768c 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -141,9 +141,6 @@ static const AVOption options[] = { { "content_type", "set a specific content type for the POST messages", OFFSET(content_type), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E }, { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D }, { "referer", "override referer header", OFFSET(referer), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, -#if FF_API_HTTP_USER_AGENT - { "user-agent", "use the \"user_agent\" option instead", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D|AV_OPT_FLAG_DEPRECATED }, -#endif { "multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, D | E }, { "post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D | E }, { "mime_type", "export the MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, diff --git a/libavformat/version.h b/libavformat/version.h index e0cf9e6f3e..39aa408fd6 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_HTTP_USER_AGENT -#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_HLS_WRAP #define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp559671iob; Mon, 19 Apr 2021 07:16:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjr34lsZhYJudQFmjsw+dxNWMMRMiTn/fLrHPI5/xAqQxvkJT0yLPSrjuI/R8xBTZ1IZ+z X-Received: by 2002:a17:906:29cf:: with SMTP id y15mr21886329eje.500.1618841768721; Mon, 19 Apr 2021 07:16:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841766; cv=none; d=google.com; s=arc-20160816; b=LTFXUPzjxN+66uGXSuj88K6mA1/JlV3ZRhZxy/9UMHWLVhAVzWdh4cjqeagnVgOlYp kE48Q6MocfECqZeLy1QDfL7mpvXHLFY1KkLqrWgfA2hz96mvWGGzUk/nifR4tDr5+9NH 2lqbQH35y3n8vle17OC57x+rpy7VxPOI8UMWuj86aNp+XnKFvisPccdfKrf9jd6p3owD OrLcOuPxcn7YGJ5YmAQaetn52gVdS0e208MX7muy5OyjO4ZqogJuesxn6mdkWpibITo2 ICkf9EIYjRivt5aids92wq6+A61Xn1tKOLUKRIy1aPD630vRm+1irh1XDyzJAdUZb8PF eolw== 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=VPIkbRzzzLzmjLl3awBOzi98EdKegAI4aUczUh2tZyo=; b=RybnLea8o1CaKUMS9ZeAXSKvVgSVGp/SaOXAdjDFha1l29e9y06QX/wn0Dqau+7GN+ oW+TDQyd2p+W3mJ3eCz4Z1rjISYkQFcLoew/iWIUHlEVItmlASEhCkueTjYoumlQ0EpX fY0t0cseMUdLC+8ANVrDusDN6+LLMByFjeS+NYPy9UC+HzS23Fyr770mp1yd7e6tc6db I5+7EjQy2RCg7Osl5qnqDfoJqyhf26vdiEgvKes/VFzfj5AkoVudMHJN4A/8mG+jUafO jQ4RlGMlLPs0SClsVGss+1HHcEng1cda4+0t3XtxO5KhAJR9aClbBvS5Lq//2fdvuj9L Y4aA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Aj9zGEeX; 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 t20si3004774edq.484.2021.04.19.07.16.06; Mon, 19 Apr 2021 07:16: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=20161025 header.b=Aj9zGEeX; 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 9277D68924E; Mon, 19 Apr 2021 17:11:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B77F66881B5 for ; Mon, 19 Apr 2021 17:11:51 +0300 (EEST) Received: by mail-qt1-f172.google.com with SMTP id h7so26144284qtx.3 for ; Mon, 19 Apr 2021 07:11:51 -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=DDnIxYoMH63Ybw+87mr26idkXq8H9zx8Lwmdvde8c1A=; b=Aj9zGEeXmpc/sl321PLPOVQPwknZXb4GclZPaSEJmwpXczweTJh0raO+Q15dnDxr7w tSwkrP0cRbupnRs+lF2/IKcr4VPho+9wtel6VXjll/tpZ8aWB9Se4iPJ0DUCdl9Dprmm r/e701VNK0EdODVqPvFrmdVMqEzxVeWbwOuguZlpW86FkDD4X1kzwIZouLNIvY+/7oR7 IlxFjnUErJ7NvSk7GVlDBrMOMWiwEMw7yBMpuQNbjU8DDvLGPPTlLhXGGk646gS6n6jk 0kgTvsYvolcNgMgyXXPFt2stvpF1Gz6ivmiL8BoHYhYv3vBVFYo/rhJnDg37z5fjWI4O CTZQ== 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=DDnIxYoMH63Ybw+87mr26idkXq8H9zx8Lwmdvde8c1A=; b=QNxLtHsksbQbPWPcqqG6wRO55RkXUR5ftljZJcmsghxmoy+uJTqccDIFC3LbzyPXfv noKkG0GiZ6uQbfJRWrHBDH8jC2THqvvphyYTWcHKqmospSfo0WBTIIr50U6MhOVAYybh BMEj8Imyz1u0ELneOk1JbF/kHciBvNcT9IGBg74bFt3fYmP3oIMDdp9Tk279zmk7GbDs jzR/xY4PmWPOXvFpOHuxAu0Okuo73DbUorpu0gM8vL9VHjg0GU1hsYzj66WHd1FIIfwT K1bRc1l09kcUpDu4BuH20LQfCfjDQvQxed0ow4iP1ekUHiC82eBEfzOoBe44mcciX4ra BMTg== X-Gm-Message-State: AOAM531+/K8nGTHi0Ut1WIUzK48y9b274PMCEBNnmg6NUtGtJwClud87 RRVMrGLDxZ+aqwbZtvaEw1VuCi7wV58= X-Received: by 2002:aed:2042:: with SMTP id 60mr12062257qta.340.1618841510256; Mon, 19 Apr 2021 07:11:50 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:37 -0300 Message-Id: <20210419141024.8174-41-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 40/87] avformat/hlsenc: Remove deprecated wrap option 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: 5n1bfqrTQ59Y From: Andreas Rheinhardt Deprecated in d96ebc5ef88024869de06bcf92b2ad99b01d47e3. Signed-off-by: Andreas Rheinhardt --- doc/muxers.texi | 9 --------- libavformat/hlsenc.c | 26 -------------------------- libavformat/version.h | 3 --- 3 files changed, 38 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 93f79274b6..fb5fde05af 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -748,15 +748,6 @@ Set output format options using a :-separated list of key=value parameters. Values containing @code{:} special characters must be escaped. -@item hls_wrap @var{wrap} -This is a deprecated option, you can use @code{hls_list_size} -and @code{hls_flags delete_segments} instead it - -This option is useful to avoid to fill the disk with many segment -files, and limits the maximum number of segment files written to disk -to @var{wrap}. - - @item hls_start_number_source Start the playlist sequence number (@code{#EXT-X-MEDIA-SEQUENCE}) according to the specified source. Unless @code{hls_flags single_file} is set, it also specifies source of starting sequence numbers of diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 9a848b6470..3b9f61d2cb 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -200,9 +200,6 @@ typedef struct HLSContext { int64_t init_time; // Set by a private option. int max_nb_segments; // Set by a private option. int hls_delete_threshold; // Set by a private option. -#if FF_API_HLS_WRAP - int wrap; // Set by a private option. -#endif uint32_t flags; // enum HLSFlags uint32_t pl_type; // enum PlaylistType char *segment_filename; @@ -1063,11 +1060,7 @@ static int sls_flag_use_localtime_filename(AVFormatContext *oc, HLSContext *c, V if (c->flags & HLS_SECOND_LEVEL_SEGMENT_INDEX) { char *filename = NULL; if (replace_int_data_in_filename(&filename, -#if FF_API_HLS_WRAP - oc->url, 'd', c->wrap ? vs->sequence % c->wrap : vs->sequence) < 1) { -#else oc->url, 'd', vs->sequence) < 1) { -#endif av_log(c, AV_LOG_ERROR, "Invalid second level segment filename template '%s', " "you can try to remove second_level_segment_index flag\n", oc->url); @@ -1177,11 +1170,7 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, vs->initial_prog_date_time += en->duration; vs->segments = en->next; if (en && hls->flags & HLS_DELETE_SEGMENTS && -#if FF_API_HLS_WRAP - !(hls->flags & HLS_SINGLE_FILE || hls->wrap)) { -#else !(hls->flags & HLS_SINGLE_FILE)) { -#endif en->next = vs->old_segments; vs->old_segments = en; if ((ret = hls_delete_old_segments(s, hls, vs)) < 0) @@ -1702,11 +1691,7 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) } else if (c->max_seg_size > 0) { char *filename = NULL; if (replace_int_data_in_filename(&filename, -#if FF_API_HLS_WRAP - vs->basename, 'd', c->wrap ? vs->sequence % c->wrap : vs->sequence) < 1) { -#else vs->basename, 'd', vs->sequence) < 1) { -#endif av_freep(&filename); av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s', you can try to use -strftime 1 with it\n", vs->basename); return AVERROR(EINVAL); @@ -1745,11 +1730,7 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) } else { char *filename = NULL; if (replace_int_data_in_filename(&filename, -#if FF_API_HLS_WRAP - vs->basename, 'd', c->wrap ? vs->sequence % c->wrap : vs->sequence) < 1) { -#else vs->basename, 'd', vs->sequence) < 1) { -#endif av_freep(&filename); av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s' you can try to use -strftime 1 with it\n", vs->basename); return AVERROR(EINVAL); @@ -1759,11 +1740,7 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) if (vs->vtt_basename) { char *filename = NULL; if (replace_int_data_in_filename(&filename, -#if FF_API_HLS_WRAP - vs->vtt_basename, 'd', c->wrap ? vs->sequence % c->wrap : vs->sequence) < 1) { -#else vs->vtt_basename, 'd', vs->sequence) < 1) { -#endif av_freep(&filename); av_log(vtt_oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", vs->vtt_basename); return AVERROR(EINVAL); @@ -3120,9 +3097,6 @@ static const AVOption options[] = { {"hls_delete_threshold", "set number of unreferenced segments to keep before deleting", OFFSET(hls_delete_threshold), AV_OPT_TYPE_INT, {.i64 = 1}, 1, INT_MAX, E}, {"hls_ts_options","set hls mpegts list of options for the container format used for hls", OFFSET(format_options), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, E}, {"hls_vtt_options","set hls vtt list of options for the container format used for hls", OFFSET(vtt_format_options_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, -#if FF_API_HLS_WRAP - {"hls_wrap", "set number after which the index wraps (will be deprecated)", OFFSET(wrap), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E}, -#endif {"hls_allow_cache", "explicitly set whether the client MAY (1) or MUST NOT (0) cache media segments", OFFSET(allowcache), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, E}, {"hls_base_url", "url to prepend to each playlist entry", OFFSET(baseurl), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, {"hls_segment_filename", "filename template for segment files", OFFSET(segment_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, diff --git a/libavformat/version.h b/libavformat/version.h index 39aa408fd6..7f04b92d37 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_HLS_WRAP -#define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_HLS_USE_LOCALTIME #define FF_API_HLS_USE_LOCALTIME (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27033 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp559693iob; Mon, 19 Apr 2021 07:16:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyP/pwxeF3WwlvnbtJ96+EpdZtPpr2+wF2DMHuOOouYD/ZUi5k1O85i/XSIf82IkBebf2Eb X-Received: by 2002:aa7:d5da:: with SMTP id d26mr26660929eds.379.1618841778400; Mon, 19 Apr 2021 07:16:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841778; cv=none; d=google.com; s=arc-20160816; b=gLM6bEs7cWl8EgkAGMBU/vKZSgYWBEo04alaKJPRMfgSeK3tCwNrHUqzS857wOPPxf /RUudG+IUUt9Jr6u/quGLc7ieXsRbXog6xYB/Opo24Nyvn/bgOWqCfvXrvcEFKtlvKfO pZJVLgD8cJRObff9RbeOdbk5Aspgg6xnarHO4d/2tkNMM71UqEVGnE61auBjxuADOGZa tyw0z0vnY93HVgl6ixW2Br1eFdEQs4jtEXTgPauaQM06Ja82+CwX7yEITregNGMIzun4 CrKn1q3vqzB2yvy5V6J3fvOpXLs4hn0hfngdCmZRuMADYuD6iqyLqLFog5UfE58vFl2m GXxQ== 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=ES/kf70e+w0jYDG3Xo3idMjZ6satgFoHZDx+fB/C9HQ=; b=jW2VVqvXEHxZkgd2s75JUzkFQ+njGWtVAVbBGQv4i/WX4G0127r+8O1IWJqxj392jD IkVdPGhyCIEfswbZkC/RWQPGsJaeQV+ym+6h2EnQNFYe+o2i1i3fZnjTnERzdP2/OBTa CgB7D6n+yb3o461paGGNKMhBTh5BWXiUcgUb6INDZsJJrOs1w7yV2t8bcmDw5rD2YyDG SH2X4wmYYfO9ikSbFI5ev9brsF8eJeEKwrne3yCiaCE5boRZE3E6DFpFdlaohw0IadMb G8hwtcNuEn8ZNrZrNuhtfTQCqBg5dqi3hc0ZTNwZidTwwQEm/51rb8BJmyP61oxtEjvO YzIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=J5U3hDM8; 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 k23si5639089edx.591.2021.04.19.07.16.17; Mon, 19 Apr 2021 07:16:18 -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=J5U3hDM8; 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 73B6B689753; Mon, 19 Apr 2021 17:11:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F15106881C2 for ; Mon, 19 Apr 2021 17:11:52 +0300 (EEST) Received: by mail-qv1-f42.google.com with SMTP id i11so11394780qvu.10 for ; Mon, 19 Apr 2021 07:11:52 -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=q0NAFRK4CkzaePvnHqahb3uoJS1MH50b98gVbepoJX8=; b=J5U3hDM8TRCHlrivxPv+AhJ9ESI2cKOHN/GhXlZqXGkGKIacw8iWSTYlP5DeSk+8P0 uLa1F2LOwipH5y7Njna61g5f9ui+/qRNZ7sK89Bq02nSycOaTs/E/rS/poUvY0LIelb0 9hHPS+CAdJVk2fUjneJxEW22oKupmVnhYuhKS7oEC3wlacaG+gOSDdiB6Nh3dXtC8KMz 3zm54Ps7l44d2GIRTEzXpwLzfAYSY29dEzI8IteQTch66RXhv0EWg0NAwtc8u5ekL9dg XkL+iTSPn85H7LxczUoLDG2WuT4RNeu4SlTDg0tWi3bSZRha3tK1XlXb2Wjm4Btuw/C0 o71Q== 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=q0NAFRK4CkzaePvnHqahb3uoJS1MH50b98gVbepoJX8=; b=iQDtIozREEVTpiXiO1gbnxYRyHHiuvhi43UaGw34Q9P130AywwFeNfzp9QWMI174ME 4xGtkNr5WAB8Zya1FTlMGoRKA/JfE3Peb4RyAEWW9gd2K2QPJwWgRBXDULk9ZaDmFJCS Jg++6mQ6tk5oGDofxMOFNj5JJqwAkNm2Bbo/IMIXKEzyWjNZ3V7R8rm6L0q6QlCL3B+7 pBCijNzaaGrbkDhInSNyp9tA+6zF5/7j5jlwnfyXKbYGX4cC4/obcARSngIT86vFTt8z xY3bNCERYekybzwGbjQfHiVGTOf5dGc1jlGJO1MZYaSIOgERfKNOYRGIMSNI5d5HKEK5 auCQ== X-Gm-Message-State: AOAM530bDvddi8u7/yJvn1vsKIN27H8tyig9Evh2uLGS6FgwHp1F5Nq9 B8Nc1smn8/SaFD3MEWHK4cXZ3EAkCH8= X-Received: by 2002:a05:6214:1381:: with SMTP id g1mr22077231qvz.21.1618841511391; Mon, 19 Apr 2021 07:11:51 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:38 -0300 Message-Id: <20210419141024.8174-42-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 41/87] avformat/hlsenc: Remove deprecated localtime options 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: jKUG2JwGMEHQ From: Andreas Rheinhardt Deprecated in fbd8746efabe441469eb410d2ffa6af64987ca80. Signed-off-by: Andreas Rheinhardt --- doc/muxers.texi | 6 ------ libavformat/hlsenc.c | 6 ------ libavformat/version.h | 3 --- 3 files changed, 15 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index fb5fde05af..29f1d3aee4 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -833,9 +833,6 @@ This example will produce the playlists segment file sets: @file{vs0/file_000.ts}, @file{vs0/file_001.ts}, @file{vs0/file_002.ts}, etc. and @file{vs1/file_000.ts}, @file{vs1/file_001.ts}, @file{vs1/file_002.ts}, etc. -@item use_localtime -Same as strftime option, will be deprecated. - @item strftime Use strftime() on @var{filename} to expand the segment filename with localtime. The segment number is also available in this mode, but to use it, you need to specify second_level_segment_index @@ -853,9 +850,6 @@ ffmpeg -i in.nut -strftime 1 -hls_flags second_level_segment_index -hls_segment_ This example will produce the playlist, @file{out.m3u8}, and segment files: @file{file-20160215-0001.ts}, @file{file-20160215-0002.ts}, etc. -@item use_localtime_mkdir -Same as strftime_mkdir option, will be deprecated . - @item strftime_mkdir Used together with -strftime_mkdir, it will create all subdirectories which is expanded in @var{filename}. diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 3b9f61d2cb..6e7d6d554b 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -3128,13 +3128,7 @@ static const AVOption options[] = { {"periodic_rekey", "reload keyinfo file periodically for re-keying", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_PERIODIC_REKEY }, 0, UINT_MAX, E, "flags"}, {"independent_segments", "add EXT-X-INDEPENDENT-SEGMENTS, whenever applicable", 0, AV_OPT_TYPE_CONST, { .i64 = HLS_INDEPENDENT_SEGMENTS }, 0, UINT_MAX, E, "flags"}, {"iframes_only", "add EXT-X-I-FRAMES-ONLY, whenever applicable", 0, AV_OPT_TYPE_CONST, { .i64 = HLS_I_FRAMES_ONLY }, 0, UINT_MAX, E, "flags"}, -#if FF_API_HLS_USE_LOCALTIME - {"use_localtime", "set filename expansion with strftime at segment creation(will be deprecated)", OFFSET(use_localtime), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, -#endif {"strftime", "set filename expansion with strftime at segment creation", OFFSET(use_localtime), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, -#if FF_API_HLS_USE_LOCALTIME - {"use_localtime_mkdir", "create last directory component in strftime-generated filename(will be deprecated)", OFFSET(use_localtime_mkdir), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, -#endif {"strftime_mkdir", "create last directory component in strftime-generated filename", OFFSET(use_localtime_mkdir), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, {"hls_playlist_type", "set the HLS playlist type", OFFSET(pl_type), AV_OPT_TYPE_INT, {.i64 = PLAYLIST_TYPE_NONE }, 0, PLAYLIST_TYPE_NB-1, E, "pl_type" }, {"event", "EVENT playlist", 0, AV_OPT_TYPE_CONST, {.i64 = PLAYLIST_TYPE_EVENT }, INT_MIN, INT_MAX, E, "pl_type" }, diff --git a/libavformat/version.h b/libavformat/version.h index 7f04b92d37..ab103f410c 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_HLS_USE_LOCALTIME -#define FF_API_HLS_USE_LOCALTIME (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_LAVF_KEEPSIDE_FLAG #define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27032 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp559870iob; Mon, 19 Apr 2021 07:16:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyiAQhIlEx8/2aKKxvzwwf8G/ndhnWCFirTPt99lJo3Z4EHrWR6481ClGMBC9nlYd/Ofce X-Received: by 2002:a17:906:265b:: with SMTP id i27mr22340634ejc.450.1618841790882; Mon, 19 Apr 2021 07:16:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841790; cv=none; d=google.com; s=arc-20160816; b=BdtQosT3vTYKvnZljFpe8V2qzRq6np9o19ivy4h/CDTbx2B2RZqVU4gKrWmH53BOMi MmuELnmx/Tlb/n4NUDFJP2HpqCqGRqUeE/tdVU7XOc2H/mVj3/4u6hyNj208Uccf4IQF eIDWkD3F9uFU30B8tsfngGa3TiJT+09zJITVHCt+df3eCQ7dE4X4Q8mSLV75/cASFJcM 2zbNXE2Ch7epClzuEheOl0EHzJZpj7AJ0RyZzJ0gy6YTB9SA8WLbRdpT848AaB8yJwNx vr6AC3LxAWWfhJ7O4qKk2BiiOnL2CLUF7Ku2xy51nKVrjaL1GUMcC6SweJlrxbupIYQD 46WA== 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=3hwFJPvFg6O+Me27qI8pN3qyXavv/8QoKiKVpJLR0Vs=; b=rdAoAHmSTlA42RVbgPQpZ10Wd/zutvYclXv95LhrMyfxeROAqWjuMw0LfgZrIMxAxE PQn9Gwoy/Qnl6b+LVsWwV4anu4rc3G214K5O6DCH7V0pCHwQJPSWmUM98JQCK2Vz+VQa XV2BdUTGv2PqQnyiPBbhGGQ9qHvp8FANFjRnaCC6veJgjFuCqhci06aYCxIAFgM9M8Co fSuC5QSVe83XCix+UXG6cPbN+KQLGdEOjGxlaMsCMo2J5Tgb2oON/mh69jhSuuSNmpKd EZ+ijV5S2DXvq99L+cN01JOiTjzqeY0J2TjyhECZVMgJ5+MkWUZ4kBTVS9quPwUxNLRE RhNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rzVzCLPM; 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 v18si12346657ejy.223.2021.04.19.07.16.30; Mon, 19 Apr 2021 07:16: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=rzVzCLPM; 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 69B32689730; Mon, 19 Apr 2021 17:11:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 184326882E9 for ; Mon, 19 Apr 2021 17:11:55 +0300 (EEST) Received: by mail-qk1-f169.google.com with SMTP id o5so35881125qkb.0 for ; Mon, 19 Apr 2021 07:11:54 -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=7TuQUAsBKmh8wc7+E20lxtuEhZR+Vgetcm5HNj4DZgw=; b=rzVzCLPMK/EouKS4yeLGWzlSNfTYiofEEUaoV1OurSSqTKyK8Z9TR9kuMHKmww5Hri IeaCFydgG/dlWnunlZaIuJJjqTLQsXVO1ISylle9tsCIFildmNXCNkvsSy2uWdAOhzXY 8Df2ou829ySaIJKE8XzMnA1v9o5dkn6HvoYHQgN7owJkFN8zPB5GBF80WvxykGmQ45ea L4CQz9Tt2EI4p2HpvFoQ6lbwIvlofBdotEjWu6tYm1o377EO+KbF0DPzFp8OCqNTt4Fg dTnUYCsaj+cY9ukuV946+C5T1oyjZVA/MrdxUX4YTuxb2gFf1Rz7owFbOZEpOsBESB2l gIJQ== 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=7TuQUAsBKmh8wc7+E20lxtuEhZR+Vgetcm5HNj4DZgw=; b=sfV1CJr+ooWOILefWDuQQesWzmJ3X5jbEV2JURBxcgXjGSCqBpcT3Jqhji8BIZ+7T7 ApzJSFTESNdWCiRyWzRqoJDzzQEUuLFaXGs55zSEgaVSXn2WJrYAd2W3Wtzb/00gTHk+ K+uJ/ul0nRBWaK37tMDFT0JQSyERLxLhXiwKkrM9fIPqcRsp3twfsWaRZVWL1OfixEDW tO+VKQ170yUnWSxXHUCOm5sV+kCKCw+mGeiY46PsgIsaGfQofrJldBPkRePrXqL3S8O5 obaIhERLRT6cJ5PRU/oY4QNk/5okcjGQrAeLV3B3LMnibdETnZ5xe6HRLOm3/3U1P4gA f7ew== X-Gm-Message-State: AOAM531399G6ruYzxz8+BLkSisMJuJv+IOp040NZYnZZL5oVveELssjm SlBiQxGaFiqcvPVWQg18L4imBNrivtw= X-Received: by 2002:a05:620a:1093:: with SMTP id g19mr12412488qkk.112.1618841512550; Mon, 19 Apr 2021 07:11:52 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:52 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:39 -0300 Message-Id: <20210419141024.8174-43-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 42/87] avformat: Remove remnants of side data merging 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: 2f4AGyDXx19u From: Andreas Rheinhardt Deprecated in d682ae70b4b3a53fb73ec30281f9f4cfbc531edd, ineffective since ca4df37f06f8a47651c67693b4851ed8d7e3ef74. Signed-off-by: Andreas Rheinhardt --- doc/formats.texi | 1 - libavformat/avformat.h | 3 --- libavformat/options_table.h | 3 --- libavformat/version.h | 3 --- 4 files changed, 10 deletions(-) diff --git a/doc/formats.texi b/doc/formats.texi index fc80ce1d2b..9387f98b6a 100644 --- a/doc/formats.texi +++ b/doc/formats.texi @@ -49,7 +49,6 @@ Generate missing PTS if DTS is present. Ignore DTS if PTS is set. Inert when nofillin is set. @item ignidx Ignore index. -@item keepside (@emph{deprecated},@emph{inert}) @item nobuffer Reduce the latency introduced by buffering during initial input streams analysis. @item nofillin diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 093084221a..6c12621bbb 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1281,9 +1281,6 @@ typedef struct AVFormatContext { #if FF_API_LAVF_PRIV_OPT #define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (deprecated, will do nothing once av_demuxer_open() is removed) #endif -#if FF_API_LAVF_KEEPSIDE_FLAG -#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Deprecated, does nothing. -#endif #define AVFMT_FLAG_FAST_SEEK 0x80000 ///< Enable fast, but inaccurate seeks for some formats #define AVFMT_FLAG_SHORTEST 0x100000 ///< Stop muxing when the shortest stream stops. #define AVFMT_FLAG_AUTO_BSF 0x200000 ///< Add bitstream filters as requested by the muxer diff --git a/libavformat/options_table.h b/libavformat/options_table.h index b4141564c8..d041ffb641 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -48,9 +48,6 @@ static const AVOption avformat_options[] = { {"igndts", "ignore dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_IGNDTS }, INT_MIN, INT_MAX, D, "fflags"}, {"discardcorrupt", "discard corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_DISCARD_CORRUPT }, INT_MIN, INT_MAX, D, "fflags"}, {"sortdts", "try to interleave outputted packets by dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_SORT_DTS }, INT_MIN, INT_MAX, D, "fflags"}, -#if FF_API_LAVF_KEEPSIDE_FLAG -{"keepside", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_KEEP_SIDE_DATA }, INT_MIN, INT_MAX, D, "fflags"}, -#endif {"fastseek", "fast but inaccurate seeks", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_FAST_SEEK }, INT_MIN, INT_MAX, D, "fflags"}, #if FF_API_LAVF_MP4A_LATM {"latm", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_MP4A_LATM }, INT_MIN, INT_MAX, E, "fflags"}, diff --git a/libavformat/version.h b/libavformat/version.h index ab103f410c..7108482624 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_LAVF_KEEPSIDE_FLAG -#define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OLD_ROTATE_API #define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27044 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp560036iob; Mon, 19 Apr 2021 07:16:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy64hj4rgN7n9LCCfj68y6OOjRRLnBs9gHM/V8SL5pRAOsEjnHhrBNHlO1kLc/8M8E0bhxF X-Received: by 2002:a17:906:7d82:: with SMTP id v2mr22684483ejo.524.1618841803142; Mon, 19 Apr 2021 07:16:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841803; cv=none; d=google.com; s=arc-20160816; b=sJI+u/LuY6Z9CtY/uajPJ0FlHFj+lljCPZOuFdtSCQhgzUvAbmBeCYKm7F78y0fPI6 g2iRFS+nA3U6SJhb4DUWIxDa0oFAIyhiMijBPYoFtoOd3abjYdzPanxYM0Wuwko1hnkV Lrw1FU8pdv63Knpaj3W9TYeoGgvR4UV+N78BdAGK8T8ifb26k7oEirBd4RpqqaNgEcah 7hTz775+2TSOELl5uRK0YJ2/v20FdPOzxjzkaQwhR/JqzwfE6yAvP1Juk9BaUO5NIO8B d8EK7VQXeGljk7NtXMAV6ROWv5eopnVXpwZ9O95emlbLUQJqEH9ft5pjL0yvmhHb/Rgi jaIQ== 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=USMix0pAUuyxoAxG5ZlauzivE4xcjuVHGdYP7CcYIpY=; b=ZtMofmpfcNQReZ6n/DGxKf3Z5mtLCuO0i5n3LA3hrvQ8NhRSedMG5RnGu62XG5zu6e AUKVIcJztoy5qZjJr+IN874vldTS7+we4ZjVbBSjf/W0Xzo9GSZ7Z0quaT0vg8BmWllW USQVI7ttxF6omW+wncKLW32zdfPC8nCv+XMSV9Vi/j7ZjlUqSs5dg2g55yEWcDwKSX5c qbzyk8vv/PNnADlbikgEHhuyRcyUtsk3rdwebyXfjhcZzkgGXS3xU3A+mZhmy68v3Scg QO+2cUwLaadJigfmlW60Yra/Xu2wp6/68Jn7w03NqRRwDnyy0g/fVZyubkRdk61sVjlG MSmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qJiC3+XB; 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 zm17si13284426ejb.350.2021.04.19.07.16.42; Mon, 19 Apr 2021 07:16:43 -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=qJiC3+XB; 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 6C9F0689829; Mon, 19 Apr 2021 17:12:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 366C26882E9 for ; Mon, 19 Apr 2021 17:11:55 +0300 (EEST) Received: by mail-qk1-f177.google.com with SMTP id t17so7380961qkg.4 for ; Mon, 19 Apr 2021 07:11:55 -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=US8Ib/j20S5jUy/2CnFqlFI3X6lB8HOM2GfiQD77LYk=; b=qJiC3+XB7wGhc/f00KnRMA33F5p+o562PkL1EQGRS/Uup4jT/r3UgTgrNTSQCIuGlj 2lSK5ZN77X1HBPOm3SkVhmNwUjYKVLMncsDRCcPrfOuHwhn77u3/g8gtYv/qR8JIoNcE 8Uw5uR0WTcCLH+DFVj2veBgDgSBHHognNHI7PGeYo2F/TKuNIdQJCCKuD5VOBuR33eu1 3BRqfKqPyqkMe2aOjmEXVHWAB/ZnbOEiZhh2flJsQUMY+yMnn2xzsHq+qC/MmbZfOVOz Z494BqYboNXcj9818fl7GuncoqB4YE7cpg6VI9FD9CN6+mnsL6J0IGwx9ZlA7AspsZzd ugag== 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=US8Ib/j20S5jUy/2CnFqlFI3X6lB8HOM2GfiQD77LYk=; b=N77F55i+M3yeh8PTMhaL6y74yP47xTat9/I8KZdYdHGay50o4MiLVWArkB3KGVpXIJ JTK88qsWgIXtWn3BhDuYgqQWW+sqxLRIMWo6qG/cQq49MjTb16KD/8d8+JD2NFQkW286 Eb2yoodibilIl9rE2dN1/dghCeZBb0A6FZq1VbaYdppvvcutR8KZIrL9QvtHls1M3cpQ /vD5I8+dg2yggoC6UUW9GGZjXd7wyYWBGJa5xtwng98ShvziVdm2uCzXJyx0DOYZzl1h R7sHitch8kQUNxCJJ8MzC3HTeEp01pT0M+UwXjN18s0TeZQmyC2p3jSVjKOCpMzzV17d sYYQ== X-Gm-Message-State: AOAM5305bW+1REh6VMVfIoXtL6p2AsXa6MCHiz214d0LKfmBGLIVdslt vgRUO0wNVLCdkink7Hikr8nyBpgkiko= X-Received: by 2002:a37:2ec4:: with SMTP id u187mr12418639qkh.472.1618841513665; Mon, 19 Apr 2021 07:11:53 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:53 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:40 -0300 Message-Id: <20210419141024.8174-44-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 43/87] avformat/mov, movenc: Enc exporting rotation via metadata 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: DkDvhZQwuSmR From: Andreas Rheinhardt Deprecated in ddef3d902f0e4cbd6be6b3e5df7ec158ce51488b. (The reference file of the mov-zombie test needed to be updated, because a rotate metadata tag is no longer exported; the side-data is of course still present.) Signed-off-by: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavformat/mov.c | 14 -------------- libavformat/movenc.c | 15 --------------- libavformat/version.h | 3 --- tests/ref/fate/mov-zombie | 2 +- 4 files changed, 1 insertion(+), 33 deletions(-) ons=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple Video Media Handler|tag:vendor_id=appl|tag:encoder=H.264 side_data|side_data_type=Display Matrix|displaymatrix=\n00000000: 131072 0 0\n00000001: 0 65536 0\n00000002: 0 0 1073741824\n|rotation=0 diff --git a/libavformat/mov.c b/libavformat/mov.c index 9ca1ac89a8..8b3371abe6 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4582,8 +4582,6 @@ static int mov_read_tkhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) // save the matrix when it is not the default identity if (!IS_MATRIX_IDENT(res_display_matrix)) { - double rotate; - av_freep(&sc->display_matrix); sc->display_matrix = av_malloc(sizeof(int32_t) * 9); if (!sc->display_matrix) @@ -4592,18 +4590,6 @@ static int mov_read_tkhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) for (i = 0; i < 3; i++) for (j = 0; j < 3; j++) sc->display_matrix[i * 3 + j] = res_display_matrix[i][j]; - -#if FF_API_OLD_ROTATE_API - rotate = av_display_rotation_get(sc->display_matrix); - if (!isnan(rotate)) { - char rotate_buf[64]; - rotate = -rotate; - if (rotate < 0) // for backward compatibility - rotate += 360; - snprintf(rotate_buf, sizeof(rotate_buf), "%g", rotate); - av_dict_set(&st->metadata, "rotate", rotate_buf, 0); - } -#endif } // transform the display width/height according to the matrix diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8e6ed817d8..b15ecbe713 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3043,7 +3043,6 @@ static int mov_write_tkhd_tag(AVIOContext *pb, MOVMuxContext *mov, AV_ROUND_UP); int version = duration < INT32_MAX ? 0 : 1; int flags = MOV_TKHD_FLAG_IN_MOVIE; - int rotation = 0; int group = 0; uint32_t *display_matrix = NULL; @@ -3100,23 +3099,9 @@ static int mov_write_tkhd_tag(AVIOContext *pb, MOVMuxContext *mov, avio_wb16(pb, 0); /* reserved */ /* Matrix structure */ -#if FF_API_OLD_ROTATE_API - if (st && st->metadata) { - AVDictionaryEntry *rot = av_dict_get(st->metadata, "rotate", NULL, 0); - rotation = (rot && rot->value) ? atoi(rot->value) : 0; - } -#endif if (display_matrix) { for (i = 0; i < 9; i++) avio_wb32(pb, display_matrix[i]); -#if FF_API_OLD_ROTATE_API - } else if (rotation == 90) { - write_matrix(pb, 0, 1, -1, 0, track->par->height, 0); - } else if (rotation == 180) { - write_matrix(pb, -1, 0, 0, -1, track->par->width, track->par->height); - } else if (rotation == 270) { - write_matrix(pb, 0, -1, 1, 0, 0, track->par->width); -#endif } else { write_matrix(pb, 1, 0, 0, 1, 0, 0); } diff --git a/libavformat/version.h b/libavformat/version.h index 7108482624..4c186f2915 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_OLD_ROTATE_API -#define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OLD_AVIO_EOF_0 #define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59) #endif diff --git a/tests/ref/fate/mov-zombie b/tests/ref/fate/mov-zombie index 7b417e59dd..3001c6daa2 100644 --- a/tests/ref/fate/mov-zombie +++ b/tests/ref/fate/mov-zombie @@ -194,5 +194,5 @@ frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=188623|pkt_pts_time=2. packet|codec_type=video|stream_index=0|pts=197632|pts_time=2.195911|dts=191625|dts_time=2.129167|duration=3003|duration_time=0.033367|size=580|pos=101820|flags=__ frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=191626|pkt_pts_time=2.129178|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=191626|best_effort_timestamp_time=2.129178|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=99180|pkt_size=1666|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=63|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleftside_data|side_data_type=H.26[45] User Data Unregistered SEI message -stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|closed_captions=0|has_b_frames=1|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|refs=2|is_avc=true|nal_length_size=4|id=N/A|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:capti ons=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:rotate=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple Video Media Handler|tag:vendor_id=appl|tag:encoder=H.264 +stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|closed_captions=0|has_b_frames=1|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|refs=2|is_avc=true|nal_length_size=4|id=N/A|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:capti From patchwork Mon Apr 19 14:09:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27036 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp560131iob; Mon, 19 Apr 2021 07:16:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7eiVELo2TB4l7Tf81yPih5WWEYAGz5b3NRtTbgNo8S2rGxPtcYISbQoRDGeBzs0j5fQ3j X-Received: by 2002:a05:6402:2219:: with SMTP id cq25mr9052237edb.60.1618841812967; Mon, 19 Apr 2021 07:16:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841812; cv=none; d=google.com; s=arc-20160816; b=Uo4jqPmF2C6pihPSTo8reZqg0mYqe8n+CnIL6/zhfQdwWXBu9aigRWDvPbqUIO4zt4 +aUtaB0F1SBmwIoMYt0eD6lusrPe89z67ziB2Lee6etb0g8lzlHKZXRFIgk9cTuR8qG1 v8Kb2sH0etyDjVIkGSHWhh+FVoFQaUlsdePkKayNX9+SXrDlgFP7E3hgLOIpjxFnYGQK FX23xql2Ny0nkgQL7sZtU9Samrtp1Wl7n3b2Nm01unrptidNU68GMAeeSsRhvtB5YCfl bWPHETt5903E5HdlLj4fyfxIUwA8ok2nZV7FpkQ7nNxtyUo5fQbTOhsQA67Knx+kyjF2 aU7w== 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=ypasK/G35AnBKSK44q7+JtWQSp0tfpkv2dC6kKprK2o=; b=SzX9aA2c58CFOeiAoNZGqEksC0WY6pFhRrlC15AMwHSDZMHiqEzLdMkYOCBXWvrPxm 2mxfsPgdlObXd81ulIBQzCxguTRtsa/3ZY6gkROzbPG07ngJgevaGP2tqWFcw9oerMI4 qOaBakoHdwM4ehV/JhV4Zowu7dfqzkdzwal0fvAKUqidtKo1b9RSD56UesZGdCpTkhXD mRtjkvDXG+4hib7zrbcuAjOhthHWA4J4S7hWtv4oo21gpGYEm8ZHQ7/OCB/L4SmiJxRL L1pXDM8rwNPJR6SFNIxJGDctytvP4iKKGawPIZcpKzg1N64bNr6gSab9a/rgccJ6Gg9u 0B5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VXsUD8sO; 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 g20si12091881edt.518.2021.04.19.07.16.52; Mon, 19 Apr 2021 07:16:52 -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=VXsUD8sO; 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 4C1CD6898E3; Mon, 19 Apr 2021 17:12:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16D12688335 for ; Mon, 19 Apr 2021 17:11:56 +0300 (EEST) Received: by mail-qk1-f176.google.com with SMTP id e13so26002962qkl.6 for ; Mon, 19 Apr 2021 07:11:55 -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=1M8jYLTHQVOZSs3RQHZs/Oy5QYGvIXCUF3TUszvjhxw=; b=VXsUD8sOasaOmcGM8/cW+6C6ibl95H433rIjhWdM6v61rGbSBtvnmukvz9QJkZoy5S Xo1snnHfioogyixFJO8YZxcZN3Ihr1ce2lpyAW0RSrt4O8YjoY99rNErzVz+ZSewK2YY x8ZKIml7BqvaSj1eekIC8qhIPvAYfC2bhOfb44ojnN1pDyRVadjQpLBkKIct0ytwaaVn TzgaSL7N4JQ/n0UWaTEOGEIyKGeSArVO4nKK4OjaGjtloGYqdDQ7kKEFR4/lm5MvpC6G um6l1lEXRt8ZqsRD4JPFyueQ0E2OTbPlwNuMq5adTOBm5cBlanHWo15mSejQJqtiu9Fb TnJQ== 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=1M8jYLTHQVOZSs3RQHZs/Oy5QYGvIXCUF3TUszvjhxw=; b=GSUfXWpT+BE93DP6vpMQHdjv47x2S2V6Tn821IzaK3zSYpMQ2ellndYc2/MPFYvUri +DmXIUKG//TVgQA4bAGcKm4DoI+jAMH+rCsPNtgdbj0iTZAnayPv2u7u0WNTphWFsLah 0HOpUuUEPHpmvmyY2Pzycv3bmOtsHY1CDlfW1kY7Q4vcWuGIchGKSWXkMqfsNCqn/Uov U5BiAeLBAuh9iim03v8va8ljFwoH4E5YfLe+aDR8ejCJzLxpsQ9jGjprLDepAserAUiE MpbcixkYHpdHs1drVFsz+oxEJEnsWBn+4H6ciBPieheLJ5aPZWtJF1IeTuwp/Sbz7KkP TblQ== X-Gm-Message-State: AOAM532UkT5aJ5VqPhxspP2GUYP3V2ao6hMrNttx0zWbjVWGVPpq+yqZ TfiQWB+eedFp0invEvaijM9Bf/3WSLs= X-Received: by 2002:a05:620a:1522:: with SMTP id n2mr6460470qkk.298.1618841514781; Mon, 19 Apr 2021 07:11:54 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:41 -0300 Message-Id: <20210419141024.8174-45-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 44/87] avformat/aviobuf: End grace period of allowing 0 from read_packet 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: yoSnIXYnQZW3 From: Andreas Rheinhardt See a606f27f4c610708fa96e35eed7b7537d3d8f712. Signed-off-by: Andreas Rheinhardt --- libavformat/aviobuf.c | 7 ------- libavformat/version.h | 3 --- 2 files changed, 10 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 518cb11129..1ecc7fb095 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -519,14 +519,7 @@ static int read_packet_wrapper(AVIOContext *s, uint8_t *buf, int size) if (!s->read_packet) return AVERROR(EINVAL); ret = s->read_packet(s->opaque, buf, size); -#if FF_API_OLD_AVIO_EOF_0 - if (!ret && !s->max_packet_size) { - av_log(NULL, AV_LOG_WARNING, "Invalid return value 0 for stream protocol\n"); - ret = AVERROR_EOF; - } -#else av_assert2(ret || s->max_packet_size); -#endif return ret; } diff --git a/libavformat/version.h b/libavformat/version.h index 4c186f2915..3e82007383 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_OLD_AVIO_EOF_0 -#define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OLD_RTSP_OPTIONS #define FF_API_OLD_RTSP_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27040 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp560319iob; Mon, 19 Apr 2021 07:17:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxV15E98+XbPFkLPFzNpMsJypXVE1GQI6zVYxCcLKU8DeQXhZ8PEbCsfPkNPn4WMA5l8rwN X-Received: by 2002:a17:906:a45a:: with SMTP id cb26mr21708424ejb.537.1618841823015; Mon, 19 Apr 2021 07:17:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841823; cv=none; d=google.com; s=arc-20160816; b=HMD8LJjVbBxNdTZEUyQ2Pj0XSkho/BudSXVSpZj93Bq7a7zPivOrC0y+L6DNsNvlel 5I9nUYyD10TJxtMujZFuxEV8CK/SI6+Gu5wFj1BoHrCMvBmPH9KGzP1BE5oXitUIM+pJ b1mFVSNzNJ8iAq+sWokrt5PXF4cm0tgAvfX1/tdNsumLOsmwWM3Yfzut2rzbhdoUwTw9 ii/tdlHzqBR9iK1H1R7tddt4exzTV0HrFEHjSpuJgWx+1hqFdd15fFAQM9bY4YoV0RPC 1sYIR2ybWdN1YwlS3rZvW3UfzG4ahcJJbSKPrX3TpBHE57WC7kLZJ3f2HSC1vCw1N25h sfAA== 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=OmY+2JihYzX7ObC0zeWbacnbaJZ4GCIFfKw0Ln6icFM=; b=jrhOVC5p2AMAlF3MavDz5DOthG7OarNYBt/ZH7CmOFm0supHasFgdB22t5Y/Tama1u nZbz0XjegGmOmjEl3nZNjVVinmdxCeHujuR8ae42cNxkmFMoL31TfCyvPE4/r35DGbjb Wew38APLL07kZ2h6ZtC1mIFQkG3xQ9COAXFGFbHRYUuCRpxPlFWQXFECQsvPODKvxDbL uDDH2F40B1xBqek1mhMwOhn5Y81lBUjbIgBI8ScFwkTzaRyf/XZsdlBD06xBTLPZrNrP TsLVhkGSBOXVHmY8tMGcWxdMGQL8ciD16cdvFQ+8acTnwFyzNf38Zp0pkIZbVgTuevii 8epA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=fdtr7Cq+; 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 q11si12257877eju.518.2021.04.19.07.17.02; Mon, 19 Apr 2021 07:17:03 -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=fdtr7Cq+; 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 306396898E0; Mon, 19 Apr 2021 17:12:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C939689248 for ; Mon, 19 Apr 2021 17:11:57 +0300 (EEST) Received: by mail-qk1-f182.google.com with SMTP id x11so35789003qkp.11 for ; Mon, 19 Apr 2021 07:11:57 -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=OUtD1EexxjEdyIOpmRqFQoTGZ+mbapWwxT11XUC33Vs=; b=fdtr7Cq+Cft3tokqW7Y8UcGE/eoo6fBjuEMpDx6bHvCGj0q3WXN+6XiOn7DAmpeT8h y4rvpiHznHekkdI2l8IZQTnOQ7gqos+025R5GGF3SjDj/WkY3Y465icxiLS0Apx0nP/T Bh8+AykC7fdiLm+Dw6aAg91I7M4eOxXsOzIcqR+zA5uu0hGnsgkRkMC+4Vjt6uX//EIv KH9vUk/+6UYJ70SCbwHw8KLwTyA9SENGF0NvQTq8l9tZx9is9RIhZucXYAwMISnEBU0O TQOQzOcdJn2tb+VxMKDK5YI+qeJxSVtc1DIm3r1spDOCMDbCNJnmfr5SEKPGcok2zDIr 025A== 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=OUtD1EexxjEdyIOpmRqFQoTGZ+mbapWwxT11XUC33Vs=; b=IoQxNjNhfzZl+ZPzKdIqpAfuS5bIj0D0Jb6D38zavOnJZ7IsUdsBGzkqW+vd4s5SKe TOJh+h5YSkXR3xl01PWSf3o1iYkVc7n4sGH3da+vQcmOLOTn+smsfh8wsUTZN3LvR/LO aqVnVm2A35x2FOwmyPloxS3no8vB2wCVaS5pTv1uX07TGg7dsWtn0vLmtUEI0A/iX8Qk FMLohm1Bo0uaKsurKR4kDoMneZSZD4CzXY4iT1RM6fwNVOlKSWcefbc5DJS3kht0+RkZ adhbORrde/h+YWu1jvUPSM8VGzRG/q2DCgZGBKxgD1ZW0CuSr64bvL8xLpz+lSv9dfVE gpsg== X-Gm-Message-State: AOAM532mBJL6lGsSxwxhZG8EscDSe8AR0O8yoj126APOWBvYO4UPetBF w8rjbKxGn6YfjYpcTJ2DMw2dTFPExYU= X-Received: by 2002:a05:620a:2058:: with SMTP id d24mr3499174qka.469.1618841515876; Mon, 19 Apr 2021 07:11:55 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:55 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:42 -0300 Message-Id: <20210419141024.8174-46-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 45/87] avformat/rtsp: Remove deprecated old options, rename stimeout->timeout 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: 6XVw+P1ePfVH From: Andreas Rheinhardt Deprecated in ff46124b0df17a1d35249e09ae8eae9a61f16e04. Signed-off-by: Andreas Rheinhardt --- doc/protocols.texi | 12 +----------- libavformat/rtsp.c | 8 -------- libavformat/version.h | 3 --- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/doc/protocols.texi b/doc/protocols.texi index 2cc2b561de..8371f83059 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1161,12 +1161,6 @@ Set minimum local UDP port. Default value is 5000. @item max_port Set maximum local UDP port. Default value is 65000. -@item timeout -This option is deprecated. Use @option{listen_timeout} instead. Set maximum timeout (in seconds) to wait for incoming connections. - -A value of -1 means infinite (default). This option implies the -@option{rtsp_flags} set to @samp{listen}. - @item listen_timeout Set maximum timeout (in seconds) to establish an initial connection. Setting @option{listen_timeout} > 0 sets @option{rtsp_flags} to @samp{listen}. Default is -1 @@ -1175,13 +1169,9 @@ which means an infinite timeout when @samp{listen} mode is set. @item reorder_queue_size Set number of packets to buffer for handling of reordered packets. -@item stimeout +@item timeout Set socket TCP I/O timeout in microseconds. -@item user-agent -This option is deprecated. Use @option{user_agent} instead. Override User-Agent header. If not specified, it defaults to the -libavformat identifier string. - @item user_agent Override User-Agent header. If not specified, it defaults to the libavformat identifier string. diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 25bdf475b3..a8c5a641cb 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -94,17 +94,9 @@ const AVOption ff_rtsp_options[] = { { "min_port", "set minimum local UDP port", OFFSET(rtp_port_min), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MIN}, 0, 65535, DEC|ENC }, { "max_port", "set maximum local UDP port", OFFSET(rtp_port_max), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MAX}, 0, 65535, DEC|ENC }, { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC }, -#if FF_API_OLD_RTSP_OPTIONS - { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC|AV_OPT_FLAG_DEPRECATED }, - { "stimeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC }, -#else { "timeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC }, -#endif COMMON_OPTS(), { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC }, -#if FF_API_OLD_RTSP_OPTIONS - { "user-agent", "override User-Agent header (deprecated, use user_agent)", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC|AV_OPT_FLAG_DEPRECATED }, -#endif { NULL }, }; diff --git a/libavformat/version.h b/libavformat/version.h index 3e82007383..230ebd8a3e 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_OLD_RTSP_OPTIONS -#define FF_API_OLD_RTSP_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_DASH_MIN_SEG_DURATION #define FF_API_DASH_MIN_SEG_DURATION (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27034 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp560459iob; Mon, 19 Apr 2021 07:17:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzriveJjFMoRVsF3GO2l9mFVkUfsocOTg/BfG2wnkK+BAeFuYRoCE4dUZg2VkVmvvpJP8J7 X-Received: by 2002:a5d:6b81:: with SMTP id n1mr14651603wrx.265.1618841834063; Mon, 19 Apr 2021 07:17:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841834; cv=none; d=google.com; s=arc-20160816; b=jArW4mtXJuVoubUE96zzgdebP1LWB56eLaJES+b2jdxiRS208UcwrHhRcJXOUxEIq+ dzLkbL68XrtiLGtv9FBHB0441ei3lL/XuGlmjEGim3X6RjJVRwvvJt5GB6R3H3x7CCwY iJw6GdK8+rvGdFoKxDflV70tB46QlB4biWBNiRRVCzq+qcg1ZMabvjGO8s4zvUNOEOcu W06Lh/N3P+4UWk7Zo9LTOcPkaMAmgYPnNdMuSs0bQvRKIeO39EMIxKXhtao11OGPbZB9 SrDn5pW8DaURuO0qvDjc3G2L6QpEWy1AT0rK7jD11ESfEiLVemHk9ItNGK4oV9vKbVhZ aaRw== 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=A8/wzpOG1Cv4dF/u5f8LS1FSvL4QmCri/OgNYS+k44g=; b=kYBbIK8jtY0//DNqNN4hBVQfCwiaXGeCsIb+t6SF4m0d4A6sZG+3r7q57HjrcHX/ZL 4pXt1pH+4ars5z2NvY17TFNMJOxVSf4pQYZn0EuuLTVNN2GMUbJqXI0BjI16hwsh4V60 s6vWIldBsqa3B9jI7YJgGu497QeMRrzOYtOJb6S6vMhnY62N8J9DbanWhmcPTr8s1z/e vJ5GhTPN99t+jg2Wuv5zTwwhfhQe70+KMFXX7UQ8sjzmoOxJ/rRBtbFk8WUOodVaBvnZ bmLFWdkn/7c4CrYkhdZZ9Goxyik2EKG5vE4GAekPB1N9q5AoG3l2CTEM2CJMTNaqD3mE saYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lK0rSTxT; 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 i11si14102436edb.109.2021.04.19.07.17.13; Mon, 19 Apr 2021 07:17:14 -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=lK0rSTxT; 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 25BD4689900; Mon, 19 Apr 2021 17:12:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EEF9689753 for ; Mon, 19 Apr 2021 17:11:58 +0300 (EEST) Received: by mail-qt1-f173.google.com with SMTP id y12so26141036qtx.11 for ; Mon, 19 Apr 2021 07:11:58 -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=/qyCsve9IvWXCWocB1WZbXTjLstSyMnhlCmY1jUbzos=; b=lK0rSTxTAoCkLeIOGbiAIPtB/kSRADwa5PPKHY5cOLxWzfrMe0trRrQa5Ud4vu+DG/ nGtMFPMZZ2/WizsiNhP+YnpA9yVxCOR3RLMxK6sRAsS6ETqqm20k8ZR0zZ0b74YkuTgb +7XsMzYhm8hkLHD5cAMUNj4ev/RuRGfqoIu06e8VCqn2AN4T8WsYDw5YBLwGkEEznOp8 CxHrO8wwE4u00PX9Nm0TdV1nwxDvct617S6+KlzmD3P2gHXPsmnZymmgtnDTNAcQyqm8 MRW38AfS9MfW6L5nCtwDQMHIqgDdRozhuVh1vMrvOHUkN7IU10SVT0w3IuVS0mabKu3l BjUQ== 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=/qyCsve9IvWXCWocB1WZbXTjLstSyMnhlCmY1jUbzos=; b=djaz8S42GmueoJujT0QBtN7XrNq3zMjRU72Yo1EqBRzHytoZWCyH36pJUms0y2E2Zs Lc7NVbB992zw8p3UFWIkuYBSUZppnjDfsYZB4ez/cUULBbaEEYySjY2yJ88Ho+5cHkkm VE6ru+fkIfSXY1Yul/gqudLaKJAkU+RepAamksKDcOQVZTX14opymZyx05ACj/W/3W9L JwF4Lh/shaSLR5of79TCEU9gkZmZC3i/kPddu0FRKevton0PpVDxLUO94PGDS63LK5jH JQCxkggR4uM1UQKIoRXfkUS8pvQANGYaatNZyQVYZwIQ0HfjdZpqMACOWE+68kZewVHN ++vQ== X-Gm-Message-State: AOAM532dNWYegK+2MPhDDGSEHupJ4yf+TQGVH0ZYAVBloIgj7tvjiN/0 84+/w0H3O2NloE1FHLR6A21EQOMlW2g= X-Received: by 2002:ac8:5cc4:: with SMTP id s4mr11696857qta.214.1618841516988; Mon, 19 Apr 2021 07:11:56 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:56 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:43 -0300 Message-Id: <20210419141024.8174-47-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 46/87] avformat/dashenc: Remove deprecated min_seg_duration option 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: StthdIzR6FwM From: Andreas Rheinhardt Deprecated in 01ba52852d2ada3c79fe02a7de5bc1fdc27d56e8. Signed-off-by: Andreas Rheinhardt --- doc/muxers.texi | 2 -- libavformat/dashenc.c | 12 ------------ libavformat/version.h | 3 --- 3 files changed, 17 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 29f1d3aee4..9aa4f86801 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -211,8 +211,6 @@ ffmpeg -re -i -map 0 -map 0 -c:a libfdk_aac -c:v libx264 \ @end example @table @option -@item min_seg_duration @var{microseconds} -This is a deprecated option to set the segment length in microseconds, use @var{seg_duration} instead. @item seg_duration @var{duration} Set the segment length in seconds (fractional value can be set). The value is treated as average segment duration when @var{use_template} is enabled and diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 81a5c2b452..a73fa60d2a 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -147,9 +147,6 @@ typedef struct DASHContext { int nb_as; int window_size; int extra_window_size; -#if FF_API_DASH_MIN_SEG_DURATION - int min_seg_duration; -#endif int64_t seg_duration; int64_t frag_duration; int remove_at_exit; @@ -1374,12 +1371,6 @@ static int dash_init(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "At least one profile must be enabled.\n"); return AVERROR(EINVAL); } -#if FF_API_DASH_MIN_SEG_DURATION - if (c->min_seg_duration != 5000000) { - av_log(s, AV_LOG_WARNING, "The min_seg_duration option is deprecated and will be removed. Please use the -seg_duration\n"); - c->seg_duration = c->min_seg_duration; - } -#endif if (c->lhls && s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { av_log(s, AV_LOG_ERROR, "LHLS is experimental, Please set -strict experimental in order to enable it.\n"); @@ -2340,9 +2331,6 @@ static const AVOption options[] = { { "adaptation_sets", "Adaptation sets. Syntax: id=0,streams=0,1,2 id=1,streams=3,4 and so on", OFFSET(adaptation_sets), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, { "window_size", "number of segments kept in the manifest", OFFSET(window_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, E }, { "extra_window_size", "number of segments kept outside of the manifest before removing from disk", OFFSET(extra_window_size), AV_OPT_TYPE_INT, { .i64 = 5 }, 0, INT_MAX, E }, -#if FF_API_DASH_MIN_SEG_DURATION - { "min_seg_duration", "minimum segment duration (in microseconds) (will be deprecated)", OFFSET(min_seg_duration), AV_OPT_TYPE_INT, { .i64 = 5000000 }, 0, INT_MAX, E }, -#endif { "seg_duration", "segment duration (in seconds, fractional value can be set)", OFFSET(seg_duration), AV_OPT_TYPE_DURATION, { .i64 = 5000000 }, 0, INT_MAX, E }, { "frag_duration", "fragment duration (in seconds, fractional value can be set)", OFFSET(frag_duration), AV_OPT_TYPE_DURATION, { .i64 = 0 }, 0, INT_MAX, E }, { "frag_type", "set type of interval for fragments", OFFSET(frag_type), AV_OPT_TYPE_INT, {.i64 = FRAG_TYPE_NONE }, 0, FRAG_TYPE_NB - 1, E, "frag_type"}, diff --git a/libavformat/version.h b/libavformat/version.h index 230ebd8a3e..baef650f8e 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_DASH_MIN_SEG_DURATION -#define FF_API_DASH_MIN_SEG_DURATION (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_LAVF_MP4A_LATM #define FF_API_LAVF_MP4A_LATM (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27048 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp560619iob; Mon, 19 Apr 2021 07:17:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9jL3ilbbr9QWhkpHORBkBQtgLSlXnRH3fX/lh2oUt9gEDEkfP4yEbEFjhaKE60Y2shDio X-Received: by 2002:a17:906:170f:: with SMTP id c15mr22085091eje.358.1618841846069; Mon, 19 Apr 2021 07:17:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841846; cv=none; d=google.com; s=arc-20160816; b=FSDLHz4SuaIid/bu/I1sgNwaoJv9jUc2ulHPYLiqNMhEZyssrIw6ZEHk9ZJv03J8Y6 Bshxp57rYGC5wkS8u/Sj7ThFJy6W6VlRy7Vp5EhOqs8Unq1VO0mhQVTusVl4CRNHnyYt Oga1K1LNJDFo8C2Wf87qdTOPWGgTUSrqrR6nmsJdMiO0eI4lhbC0E00cReiEY7Tn0de+ HjDhvRaxwz5H8BEyq+vLGMI1tLUpE1+Ii6hZZ8+Xi90nSp20wWDAFRCKjXGkWmgWdAh4 OCsBu5B8uFeTso6h8DQ6Y4V6dhiXMZGCWHDirR8gE/2uk2plxd5aIEikHZUqRCpDuruc SxrA== 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=X/MgQmTOKCY8CDJxLuufU5VhVqQnPok7P+5tkdJP9P0=; b=JbdzoYRGpVOxPXjNfO0J86lWdKGiBVTu/y1/rNjhVwACd4tmrQ/TrrNTPo9K2JJsFt 6DWI4CU6MNbzoBugUebU6TyHYc8mMnTu8Zzn8trFLar+FvgSe06uN/Hetqm8EYa/wWyE lLACdOAIkLdBvjYyfKX7teZD9pLbwcZO3I2J5UfTetLX1V/iD2KW7s8JXsRVTWMjbE2i tBEoqL6Y4h42Ns7hU8yR6xRYRON462ILWoHj3Ao09LNRwlmc7sIOSjoirmW8zNiDGh2m nNT5ogfjEmBFglWTnFQi7tPTNodcPVtdqX6dZhzrYt96hdmk4+xe/fwMMQjYXBHMK6Xg 7G/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LzM9mdU4; 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 w17si12546184eja.56.2021.04.19.07.17.25; Mon, 19 Apr 2021 07:17:26 -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=LzM9mdU4; 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 03185689912; Mon, 19 Apr 2021 17:12:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7172268980B for ; Mon, 19 Apr 2021 17:11:59 +0300 (EEST) Received: by mail-qk1-f172.google.com with SMTP id x11so35789143qkp.11 for ; Mon, 19 Apr 2021 07:11:59 -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=TwvjtLSS+/MVPPyBjHpBd3iYY1TehFAtgb6GOSpYGFI=; b=LzM9mdU4fPlj3417KLz6nbLNgx3tnpfoXHx+kgk+GFFw/+f78+cQwQKnUGrwGIEVad 1PvwNl2DoMPtc3BzoeTnS0yuK0w84o8apM2rMfHsvLtBI1SLo3UW9JXFPZj2LhKrLJpa zEcUK/RP3MO+ADtwj/SZ5YB6cOU0k2L8F0nzL8CusVE9o1sDlLspNP1gfFA95SNDYBNL GlpncYv3XWWxLPwiAhdt6C7+MRQjx5RqBig13QTMKFm5GqYd0TuStEHtXBUf5wFnRUUr wzFycIIdPOPKXxHsPk0/ouSuy7Fd/O+H2YCTCeIpofygwnALo6U/5+YFGzEFfz2spZev 7Hbg== 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=TwvjtLSS+/MVPPyBjHpBd3iYY1TehFAtgb6GOSpYGFI=; b=of5N9zuhjex3ps0NN3CNhpPRZBAKfz/VUJwDE1SlGoywlde3upzV6EvLpsC8wCGUPC rSAmAzMzPOUTuBfY0TpP53o6OcApeAvrGKNE7jOEP0l7WyJVmZSfTsJ2GQ2pqBWEk3OE kK5+Mso7pXzfIg/DUPNMvTZfB2rzJJkeSLonprCnnfHhF/SilfnGLSMjogfotzHwRxbS IoPsE66ttCcNNhh+6GVDWu+999qHmu9yOdspYWt5dbQEQSvevjgjvuPov6iFi6XMtVL1 YmSEQV9Vbn7T2Yc07gnfJ1evONZp3Z9N1lD/R5dudVSyUf1vBnBYjUDyohUhlA+TRT7t 8FCQ== X-Gm-Message-State: AOAM532787mYPntOZVIvWoJ9Xu6CxA60vytzN30f8XYZTj0JXL3C6Duj WQqKR+Tn6MLeN69gLc0bKtOR6VdBw8E= X-Received: by 2002:a37:2ec4:: with SMTP id u187mr12418996qkh.472.1618841518106; Mon, 19 Apr 2021 07:11:58 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:57 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:44 -0300 Message-Id: <20210419141024.8174-48-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 47/87] avformat: Remove deprecated AVFMT_FLAG_MP4A_LATM flag, latm option 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: KarlRcuiUTCO From: Andreas Rheinhardt Deprecated in 67747c89ad4d3bfb4381c3d274603a4f0da773d8. Signed-off-by: Andreas Rheinhardt --- doc/formats.texi | 1 - libavformat/avformat.h | 3 --- libavformat/options_table.h | 3 --- libavformat/version.h | 3 --- 4 files changed, 10 deletions(-) diff --git a/doc/formats.texi b/doc/formats.texi index 9387f98b6a..640b23b790 100644 --- a/doc/formats.texi +++ b/doc/formats.texi @@ -69,7 +69,6 @@ This ensures that file and data checksums are reproducible and match between platforms. Its primary use is for regression testing. @item flush_packets Write out packets immediately. -@item latm (@emph{deprecated},@emph{inert}) @item shortest Stop muxing at the end of the shortest stream. It may be needed to increase max_interleave_delta to avoid flushing the longer diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 6c12621bbb..6658a0f315 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1274,9 +1274,6 @@ typedef struct AVFormatContext { * This flag is mainly intended for testing. */ #define AVFMT_FLAG_BITEXACT 0x0400 -#if FF_API_LAVF_MP4A_LATM -#define AVFMT_FLAG_MP4A_LATM 0x8000 ///< Deprecated, does nothing. -#endif #define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down) #if FF_API_LAVF_PRIV_OPT #define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (deprecated, will do nothing once av_demuxer_open() is removed) diff --git a/libavformat/options_table.h b/libavformat/options_table.h index d041ffb641..62c5bb40a3 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -49,9 +49,6 @@ static const AVOption avformat_options[] = { {"discardcorrupt", "discard corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_DISCARD_CORRUPT }, INT_MIN, INT_MAX, D, "fflags"}, {"sortdts", "try to interleave outputted packets by dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_SORT_DTS }, INT_MIN, INT_MAX, D, "fflags"}, {"fastseek", "fast but inaccurate seeks", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_FAST_SEEK }, INT_MIN, INT_MAX, D, "fflags"}, -#if FF_API_LAVF_MP4A_LATM -{"latm", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_MP4A_LATM }, INT_MIN, INT_MAX, E, "fflags"}, -#endif {"nobuffer", "reduce the latency introduced by optional buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOBUFFER }, 0, INT_MAX, D, "fflags"}, {"bitexact", "do not write random/volatile data", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_BITEXACT }, 0, 0, E, "fflags" }, {"shortest", "stop muxing with the shortest stream", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_SHORTEST }, 0, 0, E, "fflags" }, diff --git a/libavformat/version.h b/libavformat/version.h index baef650f8e..7ce6660f43 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_LAVF_MP4A_LATM -#define FF_API_LAVF_MP4A_LATM (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_DEMUXER_OPEN #define FF_API_DEMUXER_OPEN (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27030 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp560775iob; Mon, 19 Apr 2021 07:17:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIUbV/hqhzu8tdaf35c5weeRA1wRHSLD1ylIDfLe6YX+UKEDQUrHZgqYHG7QJjWmc/Ozfq X-Received: by 2002:a05:6402:646:: with SMTP id u6mr25732352edx.74.1618841858295; Mon, 19 Apr 2021 07:17:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841858; cv=none; d=google.com; s=arc-20160816; b=iaYvBBCjmpkUcpr11+lF+3q2vRpZzJ4Wj7u9ExNaMxiZeRBvMtUxxdy6N+4MV3MdXS tEvH1saVtQSZJT4HD6ZaEjoAr1RuzMLyDKB/pze6/8DgSCU8Db6ZRYDpZTz95KZS1wrN hbc6XLQB9rR2FsH5UUOwSKMnfR25tUThZXN+GhjydWBhj8uMuiQ9FLlkPfQGXreWvjyT SPMEm+s7kwBU6jrS/K73jVJ6u3NOFJRoWRU3mGovq3cHSL9BgEYmG0jEr+oOTNoOoktA KCOcgNeujrLfcdHnRQ9yopVF1ubhSVsftFYWvOyIJr7DnX+RdHbuZIDRlSlL7+L81Kmd /StA== 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=FgEE7zAFJpxMjTRKbfoe8JxwWBpdba/KV5rA8DjwzsM=; b=WtOoMUbv8pS58Yroz9AaGTU2Sgyylkth0j/nAUuZ6oDYwHyhHNiu0tRA0L6tlOKnHw 1vfpj3z5APhaikYN/KfG0OjtJxiz1xeRSaAFPbDYd7vMHzu3MrEKt3IujKTUnq6DLlPF KqCkSJmsIldlCII8wxRvEP7HoJvKk2vSdPFZH7QpcJ2BuFeU7cGv29Y4ehDPoGnkMndW vWctQevYLhF82VRqTRYGsVNMhL9cLAXHH95frWEtia2WS3r9xrSY1LnBGVCMrm6ULPN5 ZDYsQgO6c7vmUgKSuIyWaLGT8En9rqnp34gm2gTBwsxm17Dn0PTQtl6LoajuCodNyS7F WxEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="OOB/JWUE"; 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 z22si14858582edm.203.2021.04.19.07.17.37; Mon, 19 Apr 2021 07:17:38 -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="OOB/JWUE"; 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 1199068991B; Mon, 19 Apr 2021 17:12:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 497526898DF for ; Mon, 19 Apr 2021 17:12:00 +0300 (EEST) Received: by mail-qt1-f174.google.com with SMTP id u8so26075027qtq.12 for ; Mon, 19 Apr 2021 07:12:00 -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=wya30g0x9woxyxxCejN4hh+DIdxBU2uwVFCwlAZkVIE=; b=OOB/JWUEwmTZaKfU78QkqZcjHkLpwPWSKC/9UFsMb6q1jbSJOlQDqIn/vKn4MJjs8W e+kqWknpE1Ou4rgeTiaHivPjknkpSIhICntC03f29RpKejY9LgBnJEB9ncMp4p2cfhXj +Cy47a/vh5hZtoWnC1d0N2VVUOFXyU2lEROXI3AaJWZ+gSsjAjz0rFr/q1ragVKiFFKG yCTgiY2TJKnPs1t37E+IjyNAby1+Is9+8D2slhfdWyuOCtYgh2jMXpox3yhNk4Ux6E48 mwRMzwby06thgGwrsga4B9Q8JxbxBrtS8H9cbO6iBkavEHe4g764pJQlx3B+J24fLEZR 7qZg== 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=wya30g0x9woxyxxCejN4hh+DIdxBU2uwVFCwlAZkVIE=; b=j8mrZXJ78lpAJo5upiB7XirAMn8dyfQOB2u1f1exZQdTOpuf96mP2o0ZZWX2vTZyOS fVVsDxl2bN3IcV7ZQQRQchwClzaNu4ESx+8qc4iB/jYUERLsl7qCUqbeAX1iPj0Yd4+l X3Zaj5wJYz7yB6CHHNkwuT/aej9rB58TqSkcmnt1hPWM3nUWArCevO0ArJ5tm2vcynwF WSYIsoFwjV6MwOD/czFzVSiTCUOxfjo16wHCtFsC/9P6IjvCUdjuzjFdm5HW6zLge5dH TopFpk2t5krq/HqCw+7r/BvAwta98usP8Kvjr51NiFpOdtycxg2TRqGYkOVsmm3KGtKV /QCg== X-Gm-Message-State: AOAM5319wtwpk39fw4P2lcoRxlP5JXIUPWc7MDylWOQ6cAEVHleRMjyH Qn5JSpFvkeX+vgOLRGWxoaitmWyYNHw= X-Received: by 2002:a05:622a:11cd:: with SMTP id n13mr12110357qtk.37.1618841519618; Mon, 19 Apr 2021 07:11:59 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:58 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:45 -0300 Message-Id: <20210419141024.8174-49-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 48/87] avformat: Remove deprecated av_demuxer_open() 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: eLtFc7qZvzbt From: Andreas Rheinhardt Deprecate in e37f161e66e042d6c2c7470c4d9881df9427fc4a. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 10 +--------- libavformat/utils.c | 29 ----------------------------- libavformat/version.h | 3 --- 3 files changed, 1 insertion(+), 41 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 6658a0f315..272370db2a 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1276,7 +1276,7 @@ typedef struct AVFormatContext { #define AVFMT_FLAG_BITEXACT 0x0400 #define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down) #if FF_API_LAVF_PRIV_OPT -#define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (deprecated, will do nothing once av_demuxer_open() is removed) +#define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (deprecated, does nothing) #endif #define AVFMT_FLAG_FAST_SEEK 0x80000 ///< Enable fast, but inaccurate seeks for some formats #define AVFMT_FLAG_SHORTEST 0x100000 ///< Stop muxing when the shortest stream stops. @@ -2017,14 +2017,6 @@ int av_probe_input_buffer(AVIOContext *pb, const AVInputFormat **fmt, int avformat_open_input(AVFormatContext **ps, const char *url, const AVInputFormat *fmt, AVDictionary **options); -#if FF_API_DEMUXER_OPEN -/** - * @deprecated Use an AVDictionary to pass options to a demuxer. - */ -attribute_deprecated -int av_demuxer_open(AVFormatContext *ic); -#endif - /** * Read packets of a media file to get stream information. This * is useful for file formats with no headers such as MPEG. This diff --git a/libavformat/utils.c b/libavformat/utils.c index d8b44ce896..ba664f6214 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -370,27 +370,6 @@ FF_ENABLE_DEPRECATION_WARNINGS /************************************************************/ /* input media file */ -#if FF_API_DEMUXER_OPEN -int av_demuxer_open(AVFormatContext *ic) { - int err; - - if (ic->format_whitelist && av_match_list(ic->iformat->name, ic->format_whitelist, ',') <= 0) { - av_log(ic, AV_LOG_ERROR, "Format not on whitelist \'%s\'\n", ic->format_whitelist); - return AVERROR(EINVAL); - } - - if (ic->iformat->read_header) { - err = ic->iformat->read_header(ic); - if (err < 0) - return err; - } - - if (ic->pb && !ic->internal->data_offset) - ic->internal->data_offset = avio_tell(ic->pb); - - return 0; -} -#endif /* Open input file and probe the format if necessary. */ static int init_input(AVFormatContext *s, const char *filename, AVDictionary **options) @@ -603,11 +582,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, if (s->pb) ff_id3v2_read_dict(s->pb, &s->internal->id3v2_meta, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta); -#if FF_API_DEMUXER_OPEN - if (!(s->flags&AVFMT_FLAG_PRIV_OPT) && s->iformat->read_header) -#else if (s->iformat->read_header) -#endif if ((ret = s->iformat->read_header(s)) < 0) goto fail; @@ -636,11 +611,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, if ((ret = avformat_queue_attached_pictures(s)) < 0) goto close; -#if FF_API_DEMUXER_OPEN - if (!(s->flags&AVFMT_FLAG_PRIV_OPT) && s->pb && !s->internal->data_offset) -#else if (s->pb && !s->internal->data_offset) -#endif s->internal->data_offset = avio_tell(s->pb); s->internal->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE; diff --git a/libavformat/version.h b/libavformat/version.h index 7ce6660f43..70ac403a53 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_DEMUXER_OPEN -#define FF_API_DEMUXER_OPEN (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_CHAPTER_ID_INT #define FF_API_CHAPTER_ID_INT (LIBAVFORMAT_VERSION_MAJOR < 59) #endif From patchwork Mon Apr 19 14:09:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27039 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp560921iob; Mon, 19 Apr 2021 07:17:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCuUrUio8wfxXLFlcEd5mnkBCriMeB8Ac74A9kbljglQlJQSO5k5NKZrnKI6LsJj+r9cGF X-Received: by 2002:adf:e10f:: with SMTP id t15mr8578575wrz.331.1618841869709; Mon, 19 Apr 2021 07:17:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841869; cv=none; d=google.com; s=arc-20160816; b=ewNhunFNz5M/6HOlN+7HwQlgwp7b+oNv2WfEgwSwITU4uaz4Otjx5JMMbLrF9qp61Z ubtrT2o436LLzhgr8NPF8uH/ZsphH/JRMAmaDckJnDacvOug47YWy8pYDBxSWYnDicNL bWPNJCD1geqUUiWW/6uhP5E+01Y1yrsKoiesk2HPJAWHvvaEorwkbIbcS4PDWfMi24HC yavREFCmCpmrU2UQ9t/Hb+Z7YPaIvv7NYkHg7dq+Q1xexQDYxeTkkjX56o1FtSWa05dm ptmMQN3KTgZNtv1lD226DZJIr3ZFGCrI9mejAQwc09kacg5hhQwvB4ME1J7yAvjGUxhH LnzQ== 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=iuvIZNZf4f2lROo+qAmf/QTHZyyK3+OCjBsV5TZGvzI=; b=y3yyEmzDIzBkJc1WxxKRD1+1Fut4eDn0nvuTVEzpeIojnttMnh/vjSBYe9FA+3je6A xHl2ifiZWrx1AvmIf95IzwNMyRD2KaLO1NZUV2zXaPpP128LeE96FWZ5IGVDxM+L5bWW gekbR+5Ya7TMPIrMC4pWPR/j5pnB/55PjmJ9OpBt8rk9v0mDKCgYWcMLrxz+qPHJVWXI X5aYlMl3DDMeEpzp8Fdm/XBfge2RlkBDj/fsHtMRNLZwSReIAYpvg4T+Z2lnHIrOXjzO 2BLUOTQLf1S1V92Zlu5OOyeaOa0xOsxDwLwC5xM3mnRUlVcGOmGOArkUCcMTWopfUykp Z/lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hBACRQHj; 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 w5si4071340edt.395.2021.04.19.07.17.49; Mon, 19 Apr 2021 07:17:49 -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=hBACRQHj; 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 2A8246806EB; Mon, 19 Apr 2021 17:12:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12DA56806EB for ; Mon, 19 Apr 2021 17:12:02 +0300 (EEST) Received: by mail-qt1-f176.google.com with SMTP id c6so26141874qtc.1 for ; Mon, 19 Apr 2021 07:12:02 -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=G/pwkDvJivBEDXFbcpAH5SdgB+EXhQPnXE1f+wKWigI=; b=hBACRQHjXcEmIy5C6QlubIy8w0KHRvjlSlXXCJs18Ceq2t9mYFCzJtPYByiAdqIjjH WEVZl1xVOAQe1w018COTOg7jS0Rg/VLxbGh31RrkaIIyPLrfDYimJxKYd8TRuBhRmpaG 1ietslwdRgRA+DNyl0AQPEcR331MoHIeim/CTuLp4BC1kuXLbToDVLrNPaWK/f9wo+FC +inYEtSDZ7mqqKfNwrGoZacW3UW/tmGj8rQ9z8jOWO9aU2ictcD7vQYK+LlkPbK23kBY NxVpVkFghI3opZzQ4OkxbBHVA+YuesZ+4HMT+hJBuwxilCJ6dPmj5nBQf0lauJ+JW5g6 FEeQ== 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=G/pwkDvJivBEDXFbcpAH5SdgB+EXhQPnXE1f+wKWigI=; b=iWplGnmV3sR1xgQOytBtlKZR1bd8pQxokiSyD+/+uUk83fPZ8rDbtQP+aR0BqPp3a1 22Jlb6bxA2lUgQStd+A4i0X7lv3NFJOBYlbpf+wemPkeBOCodEfCf9rr3FzUNm9XXchY +c2ZRF1Z/k45u3uYI4mqrYGdnSZ2fjhpE4IM3R4TAGsswI6q5TPqkkiDKzRNJcCazqDv GR2Xl1OLv43rp9+eRCsTxnnKvYT+hHl0B3DBc20xWQ1a33+RFE2DQ45HYLoJ75xbjEFX 7IayB2tnmpzO5yDPZnt+kchPBShkqklG3J42T8A9efwG3dq+tPGo1JXg4fcboX+CpwfX gt8A== X-Gm-Message-State: AOAM532TmvLQrmA/eMA5WXoq08TLLFtvVS0DqJKX+mjIt/hoETuJVubt PyO+CYLyvGm5zoK+LG0sARr8vGkGzNg= X-Received: by 2002:ac8:5704:: with SMTP id 4mr1676171qtw.379.1618841520714; Mon, 19 Apr 2021 07:12:00 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:46 -0300 Message-Id: <20210419141024.8174-50-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 49/87] avformat: Switch AVChapter.id to 64bits 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: 6fv08OW2hkQN From: Andreas Rheinhardt Announced in e318438f2f30525d8baca2b5683aa9898d0c56f7. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.h | 4 ---- libavformat/internal.h | 4 ---- libavformat/matroskaenc.c | 4 ---- libavformat/utils.c | 4 ---- libavformat/version.h | 3 --- 5 files changed, 19 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 272370db2a..bb8ddef88d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1092,11 +1092,7 @@ typedef struct AVProgram { change dynamically at runtime. */ typedef struct AVChapter { -#if FF_API_CHAPTER_ID_INT - int id; ///< unique ID to identify the chapter -#else int64_t id; ///< unique ID to identify the chapter -#endif AVRational time_base; ///< time base in which the start/end timestamps are specified int64_t start, end; ///< chapter start/end time in time_base units AVDictionary *metadata; diff --git a/libavformat/internal.h b/libavformat/internal.h index a6987619f7..7d0eab44ac 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -579,11 +579,7 @@ void ff_configure_buffers_for_index(AVFormatContext *s, int64_t time_tolerance); * * @return AVChapter or NULL on error */ -#if FF_API_CHAPTER_ID_INT -AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base, -#else AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_base, -#endif int64_t start, int64_t end, const char *title); /** diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index b36e86ecb1..c3d895f931 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1671,11 +1671,7 @@ static int mkv_write_chapters(AVFormatContext *s) int64_t chapterstart = av_rescale_q(c->start, c->time_base, scale); int64_t chapterend = av_rescale_q(c->end, c->time_base, scale); const AVDictionaryEntry *t; -#if FF_API_CHAPTER_ID_INT - uint64_t uid = create_new_ids ? i + 1ULL : (uint32_t)c->id; -#else uint64_t uid = create_new_ids ? i + 1ULL : c->id; -#endif if (chapterstart < 0 || chapterstart > chapterend || chapterend < 0) { av_log(s, AV_LOG_ERROR, "Invalid chapter start (%"PRId64") or end (%"PRId64").\n", diff --git a/libavformat/utils.c b/libavformat/utils.c index ba664f6214..e36b75081f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4589,11 +4589,7 @@ AVProgram *av_new_program(AVFormatContext *ac, int id) return program; } -#if FF_API_CHAPTER_ID_INT -AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base, -#else AVChapter *avpriv_new_chapter(AVFormatContext *s, int64_t id, AVRational time_base, -#endif int64_t start, int64_t end, const char *title) { AVChapter *chapter = NULL; diff --git a/libavformat/version.h b/libavformat/version.h index 70ac403a53..e6b2807f22 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_CHAPTER_ID_INT -#define FF_API_CHAPTER_ID_INT (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_LAVF_PRIV_OPT #define FF_API_LAVF_PRIV_OPT (LIBAVFORMAT_VERSION_MAJOR < 60) #endif From patchwork Mon Apr 19 14:09:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27038 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp561263iob; Mon, 19 Apr 2021 07:18:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWDuSCOu+1/H6FX0oged4i31oRQOnN5ingXCqzjwRotGKjgmWjZ5xPTquONFYCscxql7L/ X-Received: by 2002:a5d:5444:: with SMTP id w4mr14516226wrv.202.1618841892022; Mon, 19 Apr 2021 07:18:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841892; cv=none; d=google.com; s=arc-20160816; b=fIDIsdsK7YauaLYrPaM8ULQrEPjIYhICSLJJrPBKDZRc3Eox77Wn/l9yl+Jkxet4my YdVB2r35ocbWwECHiKXcAXT0x1khmsgS3fF825f30b3nTq5G+X6tZD36+pusw6GBXZeq ZOrg/dK+LEUqgUiNtw6qgQ/TArblN72AIyd6ETcFaRdD+cZovG7tFkaklmnwQZIvfgLe vofzX/+zdHvqJhanKjAmqe5OMoL0wY8/RTk9vQiSx2D+5JIsGTZ59jfzsEvhDneHwMUv V6oR5rXlsDymKphTEdTmcwj6xrsFzvnMcnlfU4NSYhxAzNfRzAsRCOT77/iDRP51tj5q MXCA== 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=mkn494zROKqVocrihqm4uf8vtcZRaPvL2yYOG+Y1GD4=; b=1CBg8e4rv7c0XQvY7jDC89+KY+vaaOf5p/1m2dFYdjWmyJl/WHRccUP8dhnhqu2uym MDV/F/dmqgfKIZnRiek6pypBPXXtinG2HdhwF53MyitqRPguVpzlu/whJwocwBM7Ynhl Pvuc3RvCHLP4xXjj/i2HP2GpNIOS+yC4U7QI9e/ZFEyJVtQhLgpABHGIPdgSUY2YMInq tCorYCQEc1pw8dgDFYhLgwQaYG3vPm87ltgJThmClLQmWGQk9sirVKAQgg+5wIC2J4m7 liUINtAf/yi+TCzX0lpEA2bVuEt7zlqSiHvQUlK5akQug59+cD1ewmFcG/vTU+ptcz5A vXOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Q0If1GEQ; 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 a3si13441312ejd.575.2021.04.19.07.18.11; Mon, 19 Apr 2021 07:18:12 -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=Q0If1GEQ; 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 01761680867; Mon, 19 Apr 2021 17:12:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4717C689901 for ; Mon, 19 Apr 2021 17:12:03 +0300 (EEST) Received: by mail-qk1-f174.google.com with SMTP id e13so26003399qkl.6 for ; Mon, 19 Apr 2021 07:12:03 -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=4EsC+z21S9fSl1kTqpDckEaXLBeDzvebipiQCrc+9kA=; b=Q0If1GEQxjtRBmcxCXhltvsYlTCMChp3sRutFzFyuWtMEewTFZNUVO3yVuhwV/5GKg Ok5jlvplakeP058XpA2zdu2pq3PS3RYYwFVzhls6mR6jmUR91xtRRHZo/1jgMZVL568N U+2j7AEAdf3nukTECDsLMt1JxGepvs7/o/ICJUH2NH45DG4s2CL0elRvq5qFaJowmpSA ItHXBxSfTPgtXfyL1eXLb3hySTfqsftGG0ottAcG1tdu+pZVGcn7iKbwVbQXiulyNGGc X5GdfhiENAR1VnHxHsuXjzGgVSZ0JfeSbka2k5iTOYuYWcqR5lhFZwdDJi663/AujFU0 HhQg== 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=4EsC+z21S9fSl1kTqpDckEaXLBeDzvebipiQCrc+9kA=; b=UhjdfyaLJXwuJduMHzfi7gAgB6KsFY6b8i2RM9MJx+KHNj/KXKxTtKABFE0P0h7buh cJPe9L1Sxma1y9E82qbGqxagzZozBw11Ddx8JHHlrp4SDbUc7Nt/v37pcpS5uPm9CDNV AfLWL9Tcrlkh5BJ9iSWzTcSNdKbx9qucVh1oQ1x5kqhitlQjPcII0rBuU2la9ox8dv/H DarWCK+9/QeT3v7+lVIKPbjFK7vZTk+vQGQ3oIrVds8iKM8jyJHYfjhXD+cUP2YxSaa+ 7lwpyQfIIsgRrQ8nb3kZWJbweXXOoCB5KVLsbKgEDK8uAnpbqVuvCPNDxGUJj0V8SmEg jmGw== X-Gm-Message-State: AOAM5316fYb4dMp1RS/ZVHeo5zP8tqbOi3hqkgkd7UKkWBVyiZkcxseR 3NMtLVNISaiK3+Fo/7njlK5KswMG0nA= X-Received: by 2002:a37:6801:: with SMTP id d1mr3086706qkc.363.1618841521925; Mon, 19 Apr 2021 07:12:01 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:01 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:47 -0300 Message-Id: <20210419141024.8174-51-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 50/87] avfilter/avfilter: Remove compatibility code for old filter options 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: 4d1+I0w/+mBO From: Andreas Rheinhardt Added in ad7d972e08dddb1788ac6a434d1be314febcb09d; the old syntax has been deprecated in b439c992c23f3e0f3832fffd2a34a664b236c525. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 82 ++---------------------------------------- libavfilter/version.h | 3 -- 2 files changed, 3 insertions(+), 82 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 22ecad5f77..b3ad8d57b3 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -948,85 +948,9 @@ int avfilter_init_str(AVFilterContext *filter, const char *args) return AVERROR(EINVAL); } -#if FF_API_OLD_FILTER_OPTS_ERROR - if ( !strcmp(filter->filter->name, "format") || - !strcmp(filter->filter->name, "noformat") || - !strcmp(filter->filter->name, "frei0r") || - !strcmp(filter->filter->name, "frei0r_src") || - !strcmp(filter->filter->name, "ocv") || - !strcmp(filter->filter->name, "pan") || - !strcmp(filter->filter->name, "pp") || - !strcmp(filter->filter->name, "aevalsrc")) { - /* a hack for compatibility with the old syntax - * replace colons with |s */ - char *copy = av_strdup(args); - char *p = copy; - int nb_leading = 0; // number of leading colons to skip - int deprecated = 0; - - if (!copy) { - ret = AVERROR(ENOMEM); - goto fail; - } - - if (!strcmp(filter->filter->name, "frei0r") || - !strcmp(filter->filter->name, "ocv")) - nb_leading = 1; - else if (!strcmp(filter->filter->name, "frei0r_src")) - nb_leading = 3; - - while (nb_leading--) { - p = strchr(p, ':'); - if (!p) { - p = copy + strlen(copy); - break; - } - p++; - } - - deprecated = strchr(p, ':') != NULL; - - if (!strcmp(filter->filter->name, "aevalsrc")) { - deprecated = 0; - while ((p = strchr(p, ':')) && p[1] != ':') { - const char *epos = strchr(p + 1, '='); - const char *spos = strchr(p + 1, ':'); - const int next_token_is_opt = epos && (!spos || epos < spos); - if (next_token_is_opt) { - p++; - break; - } - /* next token does not contain a '=', assume a channel expression */ - deprecated = 1; - *p++ = '|'; - } - if (p && *p == ':') { // double sep '::' found - deprecated = 1; - memmove(p, p + 1, strlen(p)); - } - } else - while ((p = strchr(p, ':'))) - *p++ = '|'; - - if (deprecated) { - av_log(filter, AV_LOG_ERROR, "This syntax is deprecated. Use " - "'|' to separate the list items ('%s' instead of '%s')\n", - copy, args); - ret = AVERROR(EINVAL); - } else { - ret = process_options(filter, &options, copy); - } - av_freep(©); - - if (ret < 0) - goto fail; - } else -#endif - { - ret = process_options(filter, &options, args); - if (ret < 0) - goto fail; - } + ret = process_options(filter, &options, args); + if (ret < 0) + goto fail; } ret = avfilter_init_dict(filter, &options); diff --git a/libavfilter/version.h b/libavfilter/version.h index 18e1a95c72..fd38252411 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -50,9 +50,6 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_OLD_FILTER_OPTS_ERROR -#define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 8) -#endif #ifndef FF_API_LAVR_OPTS #define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8) #endif From patchwork Mon Apr 19 14:09:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27045 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp561555iob; Mon, 19 Apr 2021 07:18:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbkuwSYe7H3aE0Q+K1ipXwvOhrdoR1BaTVVYoBVjx8HoB+EKZeBfgJ0fi4pWY5mJ3n3Nsd X-Received: by 2002:a17:906:3190:: with SMTP id 16mr22614590ejy.355.1618841915485; Mon, 19 Apr 2021 07:18:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841915; cv=none; d=google.com; s=arc-20160816; b=d7GIdbrEQituajKvcOwspGQaC/EowAwEDs89c6gn7Vuj4x0XMxq32rl0fZ9l0B6hmG gKVGEYxZ/d2LL7W6NBHvwJtEdJfGZ7C3afXrqR4sOY4G+tO6H+11nhWQwINVTB3UUPwt Md1hFLzcjMHInUpnjtkKQMGN26xstaUzbSju6g7Tuce/ISznJ+OEKP/FQcNFGVzgTx0j R5igRzGaHU8669FhH0Phzkjb7nxL4WCjcJyKR6Mh1aO087bQxt5uwlXQQWFF+fsDIZBc 6x/ijHeOZT9nGOklomVnQbo5WhatgLnb7oLj+HTb+h+5SDzeN19Idu72FVZ5yzjJv487 9GpQ== 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=EvXZW54FWYz6N2XCEFOKUYZQXhNtJLZ/uXtrufm+q2o=; b=CQJXm1sEsTc68j3uckFXwMdQOGwESbFusVSbXu7tFytEkUgZTJ2BmU6DN5DyfvJ7BF 6Z/uAVSqA8Jfo5oeYhaCD4RWGTfR6U0HWC24ZG3m6WxYUa8CI2yiUm0vFja8vzc0KvOW akd7WM0aoUAVme1zJ66X2r4KS74SJUMz6lCSAFUoAMpBXW06TN5bD118y8unZnLfoOlg fcY29tfMZi6N9qcmuNfI6HFZ8RiOsKwpwpLUGY8Scbct9nQ3JtnYtghB8uOTNH5m3HBu o440fEH+NmPNZrJ0Z208q0QeXMseJXlj5UpBB03vMTK7v7rbHthdtBF45/4lBTAutuVD Qe1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=uKuPY63P; 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 ia20si11928654ejc.108.2021.04.19.07.18.35; Mon, 19 Apr 2021 07:18:35 -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=uKuPY63P; 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 076E16899E4; Mon, 19 Apr 2021 17:12:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 580FC689902 for ; Mon, 19 Apr 2021 17:12:04 +0300 (EEST) Received: by mail-qk1-f173.google.com with SMTP id h13so17167647qka.2 for ; Mon, 19 Apr 2021 07:12:04 -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=OMWwqrOJwFjgBg6ExApkq2o1YiuIekXvw2DUOtI374U=; b=uKuPY63POJFg8RTMY8aC1zeDws9UvdIZBO4pCW60kqnDd0jO9ar++pvvpShwQIibpQ Ut7YKkufaCxxQSfIjIJpR1s1XLRH7SIHj7YV5+A/IKDaGwEhvWV3WLy7DANb3s+hrjl+ itNG7sA8KwrE9UgLUg3cafcb/5HpF+zBZ4amgWuN6Bkl9hds0z3Q2dMqS9KXXSUbXwAk DB2bxsr9TC8sXYmzCwMU6sDOCuB0fpo/RdaxIs5rDX2Mb5PA7oHHCMTWlPmQmoP25YPm hyPQRM/4TIsAebcbqckdo7CvPJknkHszGkn1Ba+2PtoaLNOzBiYFclcjh5GhGLqgEAOl 941w== 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=OMWwqrOJwFjgBg6ExApkq2o1YiuIekXvw2DUOtI374U=; b=Rw01Z0PZlFO+g7y4pzc1g8aU35vfUDQN6Se5qK9gMaisbh2TFP2GwgQ/2mwDu3l1lZ ayUlkr4HqJig5E6Jfz5JmxQcqYvnkaSBSr9pog5NXGyjpMPVXUf3yZ7Pn4kr4x9+4jYq aq6N7LxPR+UnEQ+ZtBjqzZ6jD+J4qjxaqy6rp4dXG0cAu1T0Mx+qgpIaZyvO8muwBVxA hnr1v7vrOURPnpN5MegYGodwrZP2/9GVy9Z4yB7QkdGXgPQFoh6Z0eyT82sjaijf6QmF MhAJWLNJ0TFnJntgidKwd8cQFzQnGqBqmASjmS9jVJXlr9ZXxvIOV338PLXvsJIsRKsv 90fw== X-Gm-Message-State: AOAM532asMDZAYx8fglbK6ihTuwM8CNOPvvzTUAqWylJ3lU1RRq6NW0+ bjs4jx27csfxlZgZ67hWTPqQ8HpkddA= X-Received: by 2002:a37:a68c:: with SMTP id p134mr8428213qke.451.1618841523049; Mon, 19 Apr 2021 07:12:03 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:02 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:48 -0300 Message-Id: <20210419141024.8174-52-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 51/87] avfilter: Remove deprecated resample_lavr_opts 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: q754p3f/AAgY From: Andreas Rheinhardt Deprecated in 3796fb2692f87d0000fc0aa4572ac025a6469c2b. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.h | 3 --- libavfilter/avfiltergraph.c | 3 --- libavfilter/version.h | 3 --- 3 files changed, 9 deletions(-) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index be1242436b..b5e092f8bc 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -853,9 +853,6 @@ typedef struct AVFilterGraph { unsigned nb_filters; char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters -#if FF_API_LAVR_OPTS - attribute_deprecated char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters -#endif /** * Type of multithreading allowed for filters in this graph. A combination diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index f6b572b3de..ed54d3dc11 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -131,9 +131,6 @@ void avfilter_graph_free(AVFilterGraph **graph) av_freep(&(*graph)->scale_sws_opts); av_freep(&(*graph)->aresample_swr_opts); -#if FF_API_LAVR_OPTS - av_freep(&(*graph)->resample_lavr_opts); -#endif av_freep(&(*graph)->filters); av_freep(&(*graph)->internal); av_freep(graph); diff --git a/libavfilter/version.h b/libavfilter/version.h index fd38252411..ba9ff5f633 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -50,9 +50,6 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_LAVR_OPTS -#define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8) -#endif #ifndef FF_API_FILTER_GET_SET #define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8) #endif From patchwork Mon Apr 19 14:09:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27031 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp561862iob; Mon, 19 Apr 2021 07:18:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQe1j7JWg0vTbVKPFzgEHu9A+YH0+6lnz7jRpuT/GG9stZse4u91RXChLO1+/ASBqAhpku X-Received: by 2002:a17:906:b251:: with SMTP id ce17mr22602917ejb.333.1618841937947; Mon, 19 Apr 2021 07:18:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841937; cv=none; d=google.com; s=arc-20160816; b=EcDetynuFL0/S6B4ZbDVKRIQUQWIJNwNV3e5snJan5274qjc/XPq6/5LghZLbgFvL6 abCEiGvh0wPdV9uf7hw4esw19fC54bSQcYgW8XTWx7r/RDw1xXN+WhdbaIWD0B/haXA5 wmGpEJ80vuk/IyCALITbbUEQvZjk9F/bVPfL6RZjrh0qYhV1gvgW40FMtEcyr7Yq1iR4 CbtIhj94XoUwGahz8I2RrEwwfgGI54bMJC9m+FFVYQ3Y8k0nEBK0YY6PyHmm8QJ4b2OJ 6ND/xBCVItdS7+QLdhaz6hUKJZMhulPqTxMItXlg+V6Txyv9OcRheuJLcQKzMi83Idle 4cRA== 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=zNJ3wTtLATaDXwm1TDFbfhcAHbJuCx25YQbmioISqfE=; b=H1N7WHMb+stXdIq89ML+d52Fzppf3FVHXaDoJmJyiyL9NPa8zL0/RApZxULsr/LYFF KjmzRLU9qPbOIivSRZSVcZBY5pLVgGjr1JpJE9xSTV/P1hvNRFVrh9TKtu3aV3Kvxd69 rAzMw5I56EXGF8wvaMCZZCSAyN1NzrLvNUpCqG/F/WYK4yZhCo+oich/unpwSyaQHyh2 pY6pGm5oKtG8CfTyp7iNTW+r+Bp9vJ27TFd3RV5d8Bi3dxZeJb3WcVPLjcl0ncREHetr mwLNyjtuZxSuuyo55wbdk9Pmwkz1+hRTnCtwSZo6bUyObMtKR2fK6Rb6DAQ2De0k3ViC Fygw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="HX5Cm/WT"; 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 dn3si7108719ejc.198.2021.04.19.07.18.57; Mon, 19 Apr 2021 07:18:57 -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="HX5Cm/WT"; 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 A934C689A0D; Mon, 19 Apr 2021 17:12:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B0A2689966 for ; Mon, 19 Apr 2021 17:12:05 +0300 (EEST) Received: by mail-qk1-f175.google.com with SMTP id o5so35881840qkb.0 for ; Mon, 19 Apr 2021 07:12:05 -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=FrpRs7MAjjTmilw7uU+Wd35gA0vE+j7u8KzqRJdHnxQ=; b=HX5Cm/WTkQbkemyw0T7WmjN8XtwKsK8abYu00DxWGDXsdlWrJP0T8tMttio7ysqAOr DMdMizI/c5dKQ9Y8mHnFnoA8ssfZyAqvq8Nt9BTcjsPJ26r3wMGVog4zwdMbor6DVk5j thj5NGKjSNFvAKHTCKx6Icw938GAQRzMWjjSF/MgoaDE1I/hc7EcYReajiNBcSrB4jsZ Zxh81e46C3MZZICJ63na9t+a5GAh/jVg5FPV5FEOGxOXhDRjEzTRVf3NqNEnim8DVcn+ EEj/b8O0+zWAgXYtayr221tifuIDpRmM+wLq6Vn2UWjP/qyJveAsawijXcu7+w9OQ4NB 1bZQ== 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=FrpRs7MAjjTmilw7uU+Wd35gA0vE+j7u8KzqRJdHnxQ=; b=tyLC6zVzY/XTYSkEKsTuE3d3SojJGSFTmXQ88OOqKeI0wWpXW11lPMa8r/3spg15e6 uwppSDwNA4XBynOwR1GyDN2AMjjEW6l38w5Eedy4pwaVN8h0j7jp28IFLsffgrLcJt+a ZTBXNspC7o2dtmVpr5fK42b5mUk3OyCqy6lkcgPfU4ZEzDxr+jy+bJtiWUcmCuwyJIZB 0kKIOeBG7aN65rmXv0IOs2zwmdgUn9P6SaB0WFwmYuu+K6rNQs+5Ycjn8+Cl120fosEj Bb65aL/dd8zJJ8j2dA79kPhYp2zcGmnMZ/ro9BUxWjNHRIC3IrGpUSQTd+hF+thSo5MB yEKA== X-Gm-Message-State: AOAM533zE6SkZCpfPeG7X8n0JQpj+HFZBvz6RiPjSKXDlZRU9nKJ8Vgc E7mIBbjinfqxNMdfBDaP2ZVyNAM9Cts= X-Received: by 2002:a05:620a:1196:: with SMTP id b22mr11756417qkk.159.1618841524112; Mon, 19 Apr 2021 07:12:04 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:03 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:49 -0300 Message-Id: <20210419141024.8174-53-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 52/87] avfilter: Remove deprecated avfilter_link_get_channels 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: bg7+ubw5YLRw From: Andreas Rheinhardt Deprecated in b2c42fc6dc3502a8b6cae441c54d898972a51cff. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 7 ------- libavfilter/avfilter.h | 8 -------- libavfilter/version.h | 3 --- 3 files changed, 18 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index b3ad8d57b3..c0453be4de 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -183,13 +183,6 @@ void avfilter_link_free(AVFilterLink **link) av_freep(link); } -#if FF_API_FILTER_GET_SET -int avfilter_link_get_channels(AVFilterLink *link) -{ - return link->channels; -} -#endif - void ff_filter_set_ready(AVFilterContext *filter, unsigned priority) { filter->ready = FFMAX(filter->ready, priority); diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index b5e092f8bc..6e4b2464c5 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -673,14 +673,6 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, */ void avfilter_link_free(AVFilterLink **link); -#if FF_API_FILTER_GET_SET -/** - * Get the number of channels of a link. - * @deprecated Use av_buffersink_get_channels() - */ -attribute_deprecated -int avfilter_link_get_channels(AVFilterLink *link); -#endif #if FF_API_FILTER_LINK_SET_CLOSED /** * Set the closed field of a link. diff --git a/libavfilter/version.h b/libavfilter/version.h index ba9ff5f633..bbadb00f0d 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -50,9 +50,6 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_FILTER_GET_SET -#define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8) -#endif #ifndef FF_API_SWS_PARAM_OPTION #define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 8) #endif From patchwork Mon Apr 19 14:09:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27142 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp1098108yba; Mon, 19 Apr 2021 07:19:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWmtM0RjYEifAd0OsKzIPcDWJHUjjyUOv5gn/uon1aeWdv/aREUI6+9M+gi6yC6Er/uuZl X-Received: by 2002:a05:6402:34cd:: with SMTP id w13mr26193851edc.73.1618841965143; Mon, 19 Apr 2021 07:19:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841965; cv=none; d=google.com; s=arc-20160816; b=EO8IlYT3G/gytVOPoLanRTkUQQ2SglXH/WJ09QOEQLmkbF9trQvuxKF3a8xD3TSlhG B3tCyQkkwITpWPX0FkRS8DQ5k4DKOEOA9lDwOhe+pvCwgZbvNyrgS2Y+JkQLrVrAlBpA 9QqIWCf1hY3BU6c0YcmkA467u9JVDaIgHNEwDbis41cNgoxCg9X6Xp4sETVbA6nzF9vt e7xZ/jPWZrKcUyg6nk1vuGQz8Mu23GGRV3i0VaQxnBpJKrRw7yihpNJie0dYmJv7/BXl 6eE/HrLExT5Ae01GaCqOOipCaIMbmKGizJWh1rlDOhQTY8duFjB9K8GMQm2/a2l9jhS+ 5ExA== 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=tehfE+bpWv/xszziRbYEIJAbJCL8FU/ymzfxIs6opfE=; b=ynhXOau6+GHP8XdEG+81UMbEbZxMIZ6GMpiEv0kALuZtSfI/v09MpJwt2HNEsS8VHb KfKv3QbP6Dxo4Drk50LQ6wQ0FCclwiLTe6KbPfUIfzyBsHCnowgw5BtNDnt6FlEmUftK GrHqM2CsxlrSsuRvVd1TUe+4aqScrCpMCV0dUkcFiWv+I1ogR4WpflBGieaOBYCAUKRq mdXseWsZBbaVTlwbRfLom5W0sFDSWtyeesfO6U+cvjStYsbzSJw77rcL8Uk01MDVr/qS ivUPDQDMkEI9NdsS+u0DhcKh5mwa6XH3wbobXK2nEg+l9KeG6kNg0bquwNjhLE/lJDam Wg0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=d96M7IKP; 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 x13si11864923eju.369.2021.04.19.07.19.18; Mon, 19 Apr 2021 07:19:25 -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=d96M7IKP; 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 508C3689A61; Mon, 19 Apr 2021 17:12:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8193C68993B for ; Mon, 19 Apr 2021 17:12:06 +0300 (EEST) Received: by mail-qv1-f42.google.com with SMTP id dp18so12294113qvb.5 for ; Mon, 19 Apr 2021 07:12:06 -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=BnyvaDuGNlOQqu5PSkFlg8TkBLSDcOHF2k9oZXP40dg=; b=d96M7IKPyJjkdDG23+IBJoDHmP+mjgvjXQwcMGofHx0FrJgRRc4m1OqjQihKLCJc1g /nlT1BXyR/zu1qMRL0YJhrJv1aliGcbW5UXqWb5bkh7v7LAuQeyXfkM7710W9h1o0pVf HTPbhtnaUJAEfPzgHc5aI5K3C+dRG9K3NBN2XPwgDbdPIqR2ub/yVxjq5qBOwJE/9Hor reH5Khi3P9UnuTgJhRAU0X17AaZ4BUjFjYJbmcLz5DEryT28T3Q+vvED2T7wQbsf/FJx iFvefxuCLSFKCAwpsO3wcZbId0vZpypF03U9kpBzkbxn3WCeSzdPBJAnO1xDhZO3rwtT u3yA== 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=BnyvaDuGNlOQqu5PSkFlg8TkBLSDcOHF2k9oZXP40dg=; b=t2TOn1BbTKBXQmsFZRrCU5/sUGOlatyAZWTEb+qDO/qn3xuwGQRZrE/W5Wrk2mDQGG xkfEg6LgkQZajDrIvifQ3LkNKhC9+KQANWwjoLCU8vMFcOQzjIS3vxhnWxefXejTLWXN anPtxg3Joy+QGkrUdLWgG/yjOya2F4yW+Wq4kmC4jHbiPDqAVJO0mkLCf7wwcY8rj3tn IGBF2MW5APYCfu5Tax3OF1wlh96gtnW5/nL8WTrn5pGiPI+8C8Jv4pDOGxIjcDLxVP1m tSfWM5b9YuLrpp8TfiqZhsvFhpk3tbAd+DkmfIhs5djswE0ZOYgV/wXHaXFBbE9P4FEd ELqw== X-Gm-Message-State: AOAM531sL/8SL43AXzLxo7gtHj5bf1i8NNh9vgDQCSmZwCRJ77EQjzGg H3SWdzOIQRi6dL0XEK5IgBYs9GGP+aM= X-Received: by 2002:a05:6214:da7:: with SMTP id h7mr4462624qvh.48.1618841525212; Mon, 19 Apr 2021 07:12:05 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:04 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:50 -0300 Message-Id: <20210419141024.8174-54-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 53/87] avfilter: Remove avfilter_next/avfilter_register 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: geqn3OSsaCWa Content-Length: 3843 From: Andreas Rheinhardt Deprecated in 8f1382f80e0d4184c54c14afdda6482f050fbba7. Signed-off-by: Andreas Rheinhardt --- libavfilter/allfilters.c | 38 -------------------------------------- libavfilter/avfilter.h | 35 ----------------------------------- libavfilter/version.h | 3 --- 3 files changed, 76 deletions(-) diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 0d2bf7bbee..7dbd1fb1dd 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -557,41 +557,3 @@ const AVFilter *avfilter_get_by_name(const char *name) return NULL; } - - -#if FF_API_NEXT -FF_DISABLE_DEPRECATION_WARNINGS -static AVOnce av_filter_next_init = AV_ONCE_INIT; - -static void av_filter_init_next(void) -{ - AVFilter *prev = NULL, *p; - void *i = 0; - while ((p = (AVFilter*)av_filter_iterate(&i))) { - if (prev) - prev->next = p; - prev = p; - } -} - -void avfilter_register_all(void) -{ - ff_thread_once(&av_filter_next_init, av_filter_init_next); -} - -int avfilter_register(AVFilter *filter) -{ - ff_thread_once(&av_filter_next_init, av_filter_init_next); - - return 0; -} - -const AVFilter *avfilter_next(const AVFilter *prev) -{ - ff_thread_once(&av_filter_next_init, av_filter_init_next); - - return prev ? prev->next : filter_list[0]; -} - -FF_ENABLE_DEPRECATION_WARNINGS -#endif diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 6e4b2464c5..54fa656b01 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -286,14 +286,6 @@ typedef struct AVFilter { int flags_internal; ///< Additional flags for avfilter internal use only. -#if FF_API_NEXT - /** - * Used by the filter registration system. Must not be touched by any other - * code. - */ - struct AVFilter *next; -#endif - /** * Make the filter instance process a command. * @@ -710,33 +702,6 @@ int avfilter_process_command(AVFilterContext *filter, const char *cmd, const cha */ const AVFilter *av_filter_iterate(void **opaque); -#if FF_API_NEXT -/** Initialize the filter system. Register all builtin filters. */ -attribute_deprecated -void avfilter_register_all(void); - -/** - * Register a filter. This is only needed if you plan to use - * avfilter_get_by_name later to lookup the AVFilter structure by name. A - * filter can still by instantiated with avfilter_graph_alloc_filter even if it - * is not registered. - * - * @param filter the filter to register - * @return 0 if the registration was successful, a negative value - * otherwise - */ -attribute_deprecated -int avfilter_register(AVFilter *filter); - -/** - * Iterate over all registered filters. - * @return If prev is non-NULL, next registered filter after prev or NULL if - * prev is the last filter. If prev is NULL, return the first registered filter. - */ -attribute_deprecated -const AVFilter *avfilter_next(const AVFilter *prev); -#endif - /** * Get a filter definition matching the given name. * diff --git a/libavfilter/version.h b/libavfilter/version.h index bbadb00f0d..68923e4bd4 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -53,9 +53,6 @@ #ifndef FF_API_SWS_PARAM_OPTION #define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 8) #endif -#ifndef FF_API_NEXT -#define FF_API_NEXT (LIBAVFILTER_VERSION_MAJOR < 8) -#endif #ifndef FF_API_FILTER_LINK_SET_CLOSED #define FF_API_FILTER_LINK_SET_CLOSED (LIBAVFILTER_VERSION_MAJOR < 8) #endif From patchwork Mon Apr 19 14:09:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27041 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp561070iob; Mon, 19 Apr 2021 07:18:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx01bUKYlvXe2n8SegzE+lHtYLowynikl2EBUSESkK0GUKdXZ7ykULivohFJL/YO6ClZmNs X-Received: by 2002:a17:906:48c6:: with SMTP id d6mr9682201ejt.376.1618841880372; Mon, 19 Apr 2021 07:18:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841880; cv=none; d=google.com; s=arc-20160816; b=L7Prb5Tu5J6QasdrOBVhcgHJ+92CwCY9WYScFDeldJYS6XuPGqJE2cvufRb9shvUMB 1wOeY0HrTaf7QBBRwfWSZW30Nxrz5qYswTslnUdLozKmWsMkXt1Xfy7lu/pYJB39ESf9 Ga/OcVjJLDbhcsrS/Oib4aZcEn9ZQXsDt8B/aLSU9QkMCwtvrj08gciDW9g2YOr4kaWV S7iPGvtcMTgdZJsC5B6eYEQ9de9zgNn9El0pLv6Y4GoFqSHUFv2gpJyg4cPGe0m5FqBK DEL0/jMpAVIJVA/lzNZCU6UmQavIk9QZ6kjqYNjRNM3BIWnzFiPr7a4qC2eC/ypUdPBU wehw== 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=RJ/n7wi6EQ0EcKlWedAozHrgRKFYJxaZSHzMt8uq79s=; b=EcFkWGPvHZBXmwhUhQMm9/bltiT7eEbMUBjo8iJWLXmx3tK/i1Ir+n+CrM2zseFQ7c cxOh5hp5OvluK5CbWsqVd0kx3mazX07qUY5hAtuS/F9wBMQrKIhtP1xeqsTQTrueKJPL dT9l9jeEGeK8eVQmn+kfOTtjWu0uc31mWJN2ot1OZhFGJZ8MxxUeS+A2sowqJmJUbz2r zPBOJrKN1Iy44pEttZbZdNImwHioh/fOMAV15ZBVjeB0x7xZRVzjOFyWQOt6HnwaCyl7 DkCzgcpPa71vkry25PebwNdtugvtYK5FSUyGCdSgz1/pBv/PHLTvAbHon8x2/AV+hoxh Fmhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="pV/S2NP0"; 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 y19si1613113eda.399.2021.04.19.07.18.00; Mon, 19 Apr 2021 07:18:00 -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="pV/S2NP0"; 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 28C06689965; Mon, 19 Apr 2021 17:12:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D1C6689901 for ; Mon, 19 Apr 2021 17:12:07 +0300 (EEST) Received: by mail-qv1-f48.google.com with SMTP id er3so8416286qvb.6 for ; Mon, 19 Apr 2021 07:12:07 -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=cyAg/X/3CHeo1+SI4ly26gkqpjhEoh8QpDEvKKsW4Rw=; b=pV/S2NP0CaQRNJ1dGl8RqwQlcqcRIkLdgcv2n/Kb5ckno/ZViM2Vk/ROkRROSR1njR q6Z9xh5Mm6ICDBv+61afENGck4Kc3T+ElnJP14bQ1BQdvwow8SSdPNsgQ6PBUAfN8v8P ptfuaFZaaVDShfbWSOsuJFMdIDADaJmGHeRk+qP4Cs7BMtyPgyY4X0zNcl9gRkuf3yET 7cTbxAFJQrPDjNLxFGbmfgfqSuggdtm5JRJi+0k/93sbaOViHbLdP1olDYc2vfIYYb+/ AT4M6V0h9cHvDphNSE0K9Q3yuY7y41WQ3E/sOI/4SfFSef1bdtYfnb9BxrNo3zsldhQI im5Q== 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=cyAg/X/3CHeo1+SI4ly26gkqpjhEoh8QpDEvKKsW4Rw=; b=YA22PzExfo2FlbqBIpxyNAK5RZTBUQMYSWo0SncWYSUFWfZq27ebuSq5DzZhEdjj5s or9a/Qo5/e9QO8eMdknijEYVFca5C5bLiV3sT0DrBkAwJrolwn/bKcGIrDdOmiG7Un5Y ZpQDulkIbyawYRdAY6x3R/8rfw6o9aEXuczuq67f6YVsbzyl3PabWzDTfqoEEDVexgvU 6EeKOf8iOQgbT9Lf6p30w7Cs/QTjqgudfrwzXFyGQAinJ2Zc4k+dZMJGNB/t9Xn4fGcW 4jffYFjx5gj+DJzG0lHpg8qeX+BeqAVrkSqS9GO+OMxUb2Yj//pLJj9XBTW/1FfQg5qQ 0lKA== X-Gm-Message-State: AOAM533ZADe5yeElErbQ+HSJYGbAm1Wpvzroo+6Rzq5faTgyFngyEtW0 mpPoNx70Sf2ds5YWoAn1DvIbkZiUgx0= X-Received: by 2002:a05:6214:1d0c:: with SMTP id e12mr21805258qvd.0.1618841526294; Mon, 19 Apr 2021 07:12:06 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:06 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:51 -0300 Message-Id: <20210419141024.8174-55-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 54/87] avfilter/avfilter: Remove deprecated avfilter_link_set_closed() 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: yT+oHOGxi0IK From: Andreas Rheinhardt Deprecated in 39a09e995d32d16e4f8c87a6ff5273cb9d98146e. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 6 ------ libavfilter/avfilter.h | 9 --------- libavfilter/version.h | 3 --- 3 files changed, 18 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c0453be4de..6e12c8fa05 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -225,12 +225,6 @@ void ff_avfilter_link_set_out_status(AVFilterLink *link, int status, int64_t pts ff_filter_set_ready(link->src, 200); } -#if FF_API_FILTER_LINK_SET_CLOSED -void avfilter_link_set_closed(AVFilterLink *link, int closed) -{ - ff_avfilter_link_set_out_status(link, closed ? AVERROR_EOF : 0, AV_NOPTS_VALUE); -} -#endif int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt, unsigned filt_srcpad_idx, unsigned filt_dstpad_idx) { diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 54fa656b01..b82f72d040 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -665,15 +665,6 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, */ void avfilter_link_free(AVFilterLink **link); -#if FF_API_FILTER_LINK_SET_CLOSED -/** - * Set the closed field of a link. - * @deprecated applications are not supposed to mess with links, they should - * close the sinks. - */ -attribute_deprecated -void avfilter_link_set_closed(AVFilterLink *link, int closed); -#endif /** * Negotiate the media format, dimensions, etc of all inputs to a filter. * diff --git a/libavfilter/version.h b/libavfilter/version.h index 68923e4bd4..ebac663e0d 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -53,9 +53,6 @@ #ifndef FF_API_SWS_PARAM_OPTION #define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 8) #endif -#ifndef FF_API_FILTER_LINK_SET_CLOSED -#define FF_API_FILTER_LINK_SET_CLOSED (LIBAVFILTER_VERSION_MAJOR < 8) -#endif #ifndef FF_API_BUFFERSINK_ALLOC #define FF_API_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9) #endif From patchwork Mon Apr 19 14:09:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27035 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp561400iob; Mon, 19 Apr 2021 07:18:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5tAArHs4Tr1ta7dTpHDJ73jLu05p65tf5bQKULCCdVVCTz9AHf80c2bjKNvIxbU71yjT3 X-Received: by 2002:a05:6402:280c:: with SMTP id h12mr25441609ede.332.1618841903709; Mon, 19 Apr 2021 07:18:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841903; cv=none; d=google.com; s=arc-20160816; b=WLoOrtbV/D6j3zOf0pe1U8SwPQ/5/aa8GVc5JR+Lg/mj4u4dg08suuyRiiqNZL3PCh z7yl+Bg24zKQQEmqZYqkoOWBgtV+6UIgo2DUuH+J+39TNSMN4uyADyu/4tEfXUbAXEed GK+TEy1I5RU+P5Jzoqu2YXeZ8Uqcr/bJB2chZDoiEv3PLPc6OHjSx7Td6I3vHDpodbdR Lgsoh01JABCnFNgBWLyXqmvw9yYhpfj0apwpeRGv0oSTgLAoutuTzVjDgtEDUDNPPWtm njsmE48mjHFLEbVY10ho46I9GghGUuFZ0URAkJxcXo9OEdquP6fw0PSOS1ocEbvsORGw tnLA== 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=HaWdKvVWgcm7ces2ZZfUtSfLnCK/rabtGxMyYqHoSbw=; b=z7opF8L8v9CtELERUAu/+S4CaI4mu5E9OYU9o9sFPcjB+GazJeg29r0cmxAyjqGpE2 MK1Rmqsj+l0D9XdaOCZUNgGxWbF3be8CPttZTauf9ZY+qHcSE6pN/RbWSaR0AIpYUnD7 Sh2CXqmw66LrCUWIP9PmeVQud8MQi98ASNF9nlEoFTwLJM7PkqDAdHq1Bp8Gv5DlQcwn uDIUkXz7qZJ2TyX52q8z0rFJ0QI+XAzJ9wy7gkCe33Zi+MBrydMhJsK9fOMo3RLPLrTG aV2l3JsOnyE0is7ZckP6r9yXosJw3cSJ7FCzMp4/BuVAf+ElYgVgo4HLSoheKiwmmx2t md/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Z70GXyN2; 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 kq15si12398231ejb.556.2021.04.19.07.18.23; Mon, 19 Apr 2021 07:18:23 -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=Z70GXyN2; 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 0BC776899A7; Mon, 19 Apr 2021 17:12:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B612068993C for ; Mon, 19 Apr 2021 17:12:08 +0300 (EEST) Received: by mail-qk1-f177.google.com with SMTP id o5so35882091qkb.0 for ; Mon, 19 Apr 2021 07:12:08 -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=re/MsFgQtTRLgPblW4qmKtHIqOS0RxpIOzUw3lO0HQo=; b=Z70GXyN2UQm0RoMqqeMRfjzyNX8vPk/NUs1ijpGYgcby0EMNKkfzSOKIPJmbYeW+bg fsx/sq8K05lPTJQ8r7IQhEMF41tWYpxc/OVWt+8pBTXIGgNcoD7pGVEzVQMjj18zcq14 60ih58AgvJnDvSToAoA7kaJkPkMO3CK/DdQ0QynC3CgSK9WY+B6WFwvxmu5wfG0PV80z 7RsGzQ3LsXqxnJBymRYAYbjFwj3Gk6o/nkMq2gfrA8sINRD+PH+Sd8rGyuQrCdR7H6Tr F/mouvNT9c9lRqbz3PwUuW739ckOO9Qy5Bw9qagKhUoppAdmLiroP4odk//H8RFmI49d k6+g== 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=re/MsFgQtTRLgPblW4qmKtHIqOS0RxpIOzUw3lO0HQo=; b=EI05S2VYptqIe25+SfJYqhX6pUsEuuCwFsfQb0XYbdz6R0mSMy26O1c7zN5ua/r21+ 0zNMoTyk9N7k8l07hVp2YpBi7+A49hIIJz2ptQe65nPQ4LrVH5Bk6LSscRNcE4YDSqmI eGDQaskqFgFr+PZjgWS/h9L11XGzPDD8Fn3z1ZXTulyxSrR3Nw8RSKmmbhJPaQ8q2JmG 6II6253A7nUWCjv/Ugad2YVP6qXYt1PhdyGWhq92EeS0voXEhYjCQZNE4wZ35kqQk2Cc VW8d3HcVIP97egRH/fmPX8WCEY2yVeDVthWuKDUjVKXrOnpB6AkGulOQgqy6Rcwg4UcN TPaw== X-Gm-Message-State: AOAM532kXyI5Me3ocYvsBCSJ8OI2gpb74PlpiDo3x7D6UT7kPyVqae/c ta6p/6s9LhJW4vHswX5jHnOPKcIktcU= X-Received: by 2002:a05:620a:66a:: with SMTP id a10mr7143299qkh.272.1618841527398; Mon, 19 Apr 2021 07:12:07 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:07 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:52 -0300 Message-Id: <20210419141024.8174-56-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 55/87] avfilter/formats: Remove avfilter_make_format64_list() 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: PvuMhI7hjXdZ From: Andreas Rheinhardt The API it is part of has been made private long ago (see commit b74a1da49db5ebed51aceae6cacc2329288a92c1). Signed-off-by: Andreas Rheinhardt --- libavfilter/formats.c | 7 ------- libavfilter/formats.h | 4 ---- 2 files changed, 11 deletions(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 713173e707..6c05b118c9 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -304,13 +304,6 @@ AVFilterChannelLayouts *ff_make_format64_list(const int64_t *fmts) return formats; } -#if LIBAVFILTER_VERSION_MAJOR < 8 -AVFilterChannelLayouts *avfilter_make_format64_list(const int64_t *fmts) -{ - return ff_make_format64_list(fmts); -} -#endif - #define ADD_FORMAT(f, fmt, unref_fn, type, list, nb) \ do { \ type *fmts; \ diff --git a/libavfilter/formats.h b/libavfilter/formats.h index 0520bf42a9..3a6044971b 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -157,10 +157,6 @@ AVFilterChannelLayouts *ff_all_channel_counts(void); av_warn_unused_result AVFilterChannelLayouts *ff_make_format64_list(const int64_t *fmts); -#if LIBAVFILTER_VERSION_MAJOR < 8 -AVFilterChannelLayouts *avfilter_make_format64_list(const int64_t *fmts); -#endif - /** * A helper for query_formats() which sets all links to the same list of channel * layouts/sample rates. If there are no links hooked to this filter, the list From patchwork Mon Apr 19 14:09:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27042 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp561717iob; Mon, 19 Apr 2021 07:18:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxI2ZIApt8/jucj1UKjc2GuJl6OlGmgMyiADj3QzscoAZd/ZjN4BhN0i2zPn/kypIPHR3JA X-Received: by 2002:a17:907:20f0:: with SMTP id rh16mr23452803ejb.320.1618841927096; Mon, 19 Apr 2021 07:18:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841927; cv=none; d=google.com; s=arc-20160816; b=Boa0PABbfM1PPgF0H8WcqdsQBojwYAIvhZo9GEYeRit9UXFIMzFcFkoWmz3Buw3B9t tQja5jePRZcu0wb1MGB5Hf8OC9mc3LEPv0IT2EoWaXcJgWhxRWdXb5ysA4wX8qcgx0OX DL/fJYFsyZYNo8eJLvB1asH6YBwx65u3we1m2kUYS5dul4C3yDELoVpQNrwLjN/nb5ev 9kFLWAM8B5KwVlNN+xSeyL8xLk5U04nryB8mJzD315xo9Mv8+tJQu77Fa4tW4MPB3MeE SFI8ZJvqWwEcm0+c+nQWUoXfafKBhiOLaQgvXOwWWwfQ9Jl0nd0A9kOW8O4bPIbmTJD5 3YvA== 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=Yl6uRITgRVd5jKX3VFHc/EV/yOkVP9ssrilb9uTofHE=; b=hL/KEYzuLD6MDiL6+JlR+gppexL/qLNXJPi4HigWjUugi4elKu/QIkAoOCxMRgoT97 te0X+kvMSg8gd3zNINtVTybgsTE79CNgIiC+qqKpsybIG6UrXucBK2QAe3hOknOQOB1y uuFFRQt4mSVgyQjo69DpRS2O539L1DY+Vkc3Pb2AY3H/3+CYxsm5z0YVBOBQh4aNp4l0 SHJ8Cbl35TUoOkxE2oQvcwxzzGmr8tN+Z1OAQ0/eBeUdiueRNb9WZVY0/GnQDACLunql sbbtPcYuz1ZMF2Qj7Lot4Ngtqp9HnKpcx46OjcOODg1A+s2cpdZ2gDvNRagLyQmAOjrA 8Z+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cFlNOHo4; 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 o16si1665783edc.1.2021.04.19.07.18.46; Mon, 19 Apr 2021 07:18:47 -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=cFlNOHo4; 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 CCF156899EC; Mon, 19 Apr 2021 17:12:14 +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 422E768995F for ; Mon, 19 Apr 2021 17:12:09 +0300 (EEST) Received: by mail-qt1-f180.google.com with SMTP id h7so26145228qtx.3 for ; Mon, 19 Apr 2021 07:12:09 -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=f+GW4B6OTvck4V+xGSGS8qpc7JB1kxIBLpWjLgXc1Mo=; b=cFlNOHo4A2/kL+SuObmVYVC55OAvqGYbMgodns+Omhyw9TsClcmgP8FBmsCxj7LeD1 xgcPH878k3XOg3eqDaw5wdIALelSDCPe7nVllnNUkRR+SgDmGue0Yiy/Ocv9N45perER 8TDK0logHTfZtEngt1g7JXkA7vHnv8QlmZ5TeRXpRxCqodtS/jqOYtOS4DF9F6TQurx/ RSyFgUJtpcm3LEXLEt+R6NtW3zavfQHBp5as2VYPzCjwSbtuUOVDwKP9BHZoVbf3r1FR TmfOSPdZnbylVzGurBCYNenYbvM0Y1racE3PsylxYfxusp3DcwHeovDxTPLapYjoSgVB azWA== 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=f+GW4B6OTvck4V+xGSGS8qpc7JB1kxIBLpWjLgXc1Mo=; b=n4NnJtWdPNldAudjD+cP5rU7McPYISF8NcmML2DtfNi0VoLNuFuVEzFHngiAkam+If uPXDcStQFIZ7T/jmycnbYXGKgJ/+tfP2IYwvnES1st2tWeORJf24wEFgvcjrACXbBKWC gE/PU7jThGw+s6LxEIldDvDMYqin3x7+nEvysDhgyq0YQT6Z0Fyu5efSFlIfSrxhhrSV p7SfTNCNY2CDyajPZ47BYgCQUS52lYVR1NLEuHMSC1jj8CQIVYUl4WqdmAppQnENy93+ PkK6xei235fOyaziwWtajPpv9tneVxjXG7BhxgW8XAnPyP/uuzu4UYhHOjp5sg967T59 E7Pg== X-Gm-Message-State: AOAM532/etd8ilhM9rgdLFIGdbjI5O3OaANBR6A3bBXbq+gKCSkbYu31 GJO2+avm1l4tzfYgodbKaWVMWU+naOE= X-Received: by 2002:a05:622a:1487:: with SMTP id t7mr11468069qtx.345.1618841528568; Mon, 19 Apr 2021 07:12:08 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:08 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:53 -0300 Message-Id: <20210419141024.8174-57-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 56/87] avfilter/transform: Stop exporting internal functions 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: 95C55lCHb+dX From: Andreas Rheinhardt avfilter_transform, avfilter_(add|sub|mult)_matrix are not part of the public API (transform.h is not a public header), yet they are currently exported because of their name. This commit changes this: avfilter_transform is renamed to ff_affine_transform; the other functions are just removed as they have never been used at all. Found-by: Anton Khirnov Signed-off-by: Andreas Rheinhardt --- libavfilter/transform.c | 23 +---------------------- libavfilter/transform.h | 29 +---------------------------- libavfilter/vf_deshake.c | 5 +++-- 3 files changed, 5 insertions(+), 52 deletions(-) diff --git a/libavfilter/transform.c b/libavfilter/transform.c index f4f9e0a47d..1f91436f73 100644 --- a/libavfilter/transform.c +++ b/libavfilter/transform.c @@ -122,28 +122,7 @@ void ff_get_matrix( matrix[8] = 1; } -void avfilter_add_matrix(const float *m1, const float *m2, float *result) -{ - int i; - for (i = 0; i < 9; i++) - result[i] = m1[i] + m2[i]; -} - -void avfilter_sub_matrix(const float *m1, const float *m2, float *result) -{ - int i; - for (i = 0; i < 9; i++) - result[i] = m1[i] - m2[i]; -} - -void avfilter_mul_matrix(const float *m1, float scalar, float *result) -{ - int i; - for (i = 0; i < 9; i++) - result[i] = m1[i] * scalar; -} - -int avfilter_transform(const uint8_t *src, uint8_t *dst, +int ff_affine_transform(const uint8_t *src, uint8_t *dst, int src_stride, int dst_stride, int width, int height, const float *matrix, enum InterpolateMethod interpolate, diff --git a/libavfilter/transform.h b/libavfilter/transform.h index 9b0c19ceca..0344f9c228 100644 --- a/libavfilter/transform.h +++ b/libavfilter/transform.h @@ -83,33 +83,6 @@ void ff_get_matrix( float *matrix ); -/** - * Add two matrices together. result = m1 + m2. - * - * @param m1 9-item transformation matrix - * @param m2 9-item transformation matrix - * @param result 9-item transformation matrix - */ -void avfilter_add_matrix(const float *m1, const float *m2, float *result); - -/** - * Subtract one matrix from another. result = m1 - m2. - * - * @param m1 9-item transformation matrix - * @param m2 9-item transformation matrix - * @param result 9-item transformation matrix - */ -void avfilter_sub_matrix(const float *m1, const float *m2, float *result); - -/** - * Multiply a matrix by a scalar value. result = m1 * scalar. - * - * @param m1 9-item transformation matrix - * @param scalar a number - * @param result 9-item transformation matrix - */ -void avfilter_mul_matrix(const float *m1, float scalar, float *result); - /** * Do an affine transformation with the given interpolation method. This * multiplies each vector [x,y,1] by the matrix and then interpolates to @@ -126,7 +99,7 @@ void avfilter_mul_matrix(const float *m1, float scalar, float *result); * @param fill edge fill method * @return negative on error */ -int avfilter_transform(const uint8_t *src, uint8_t *dst, +int ff_affine_transform(const uint8_t *src, uint8_t *dst, int src_stride, int dst_stride, int width, int height, const float *matrix, enum InterpolateMethod interpolate, diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index 28a541b94a..8771399351 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -330,8 +330,9 @@ static int deshake_transform_c(AVFilterContext *ctx, for (i = 0; i < 3; i++) { // Transform the luma and chroma planes - ret = avfilter_transform(in->data[i], out->data[i], in->linesize[i], out->linesize[i], - plane_w[i], plane_h[i], matrixs[i], interpolate, fill); + ret = ff_affine_transform(in->data[i], out->data[i], in->linesize[i], + out->linesize[i], plane_w[i], plane_h[i], + matrixs[i], interpolate, fill); if (ret < 0) return ret; } From patchwork Mon Apr 19 14:09:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27144 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp1097899yba; Mon, 19 Apr 2021 07:19:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmZj3oFG6++4/lhT8XTyQ158pVPm9KCHVqc9E+laeySmjM6AxTeBHik6gG23xuGPIyHsde X-Received: by 2002:a05:6402:31ac:: with SMTP id dj12mr7703067edb.267.1618841949478; Mon, 19 Apr 2021 07:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841949; cv=none; d=google.com; s=arc-20160816; b=rhxP0o4/eaMb4m3eFfSMkbyzdfcRNLkph6s9YRnSDH9zh/mXQ3CLHF3Cvm2I2j/EqW uuBa4QdtoCh4zcqInNxboamy8qrLOiHLHnD1n8KXsdgaJGCSo0SWzgRcgWFCv4nCFS1F KMgQO07uknZ9JMgdDA8N3SRf6Y3lOmqvkQ5qq1yHEMh2TmBKuDLLgc9vwGxgRfdw3t0/ kwaSwJKxANN/ws8Au6e+Skg5Pz0jarAjnbSdCVIVMHiSk0G3HCLDhQFApHyVo8v86oX4 TgFWdzY2VqZK9ZmgI52efsKVl99Kl9V6kE/QgEsnnFyvI2WzOWCMaFiHZs+oPKNAKj8w 7exQ== 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=6513IzkhW/Qfp+qLAatwYyqCzUpTrCVj+QKhxa6CiAw=; b=Qf8Ot4QsBJX2ByTs2bFsxtKM+5ZLrHrDTNw81LM8v9Eo1KNsqQd/YyOoUcApV1KQC3 fgs1F7LNAoQV9nH28t1ouneQFIvdxSZVI1/dCC5A+KMJkidtX37IAyXE0Rr/+6FY0Atl sr2B6xm2HFvG0qZWKpeHacjbSNqn3yQKUAjH12bHWTqu1ygdcQ97YSNiPNMRIwIaDnCY 6nFexgJSpZKt8hOK7IufgnHajlaLXKKTV2Auh7cLDriyPCWsln6hhF03k73ujL5zMGgS YBsxRVsdaCOdcbjafQYKBeqZnP7j/27Qs+VwZ58XcvZylGxU8oBEed8NuOCbLMrCK/BR 2vyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Z0fZ0lQw; 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 q2si12513905ejf.168.2021.04.19.07.19.08; Mon, 19 Apr 2021 07:19:09 -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=Z0fZ0lQw; 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 E4739689A1C; Mon, 19 Apr 2021 17:12:16 +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 F2098689981 for ; Mon, 19 Apr 2021 17:12:10 +0300 (EEST) Received: by mail-qk1-f180.google.com with SMTP id o5so35882222qkb.0 for ; Mon, 19 Apr 2021 07:12:10 -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=3gIYD55/XoMkEurf9k1vRxM6gR58jFuDkrOUex8iR6U=; b=Z0fZ0lQwL6X2gdr+0xBftKkMOC1RS7wUH3GxJ/LEiFO6iWgfvqyZSj0S+xakuk0QkA uWRsZMgqzOvB6xcw9DDx2+Wru7jp/DLWMZLCtgxXQFFgiZuVB4HVYn8eU9JoZbw5a8l6 zkAiC3/ygtEmlGGA/pFcDETn/USuDf4TbK52Rj9d2XC67yKR6nkL7cW8705ojblVEr1r RQeaEXbuq9sBoU436vwB5XCrkcHlzVfQa+D+ld50JGIrJ0nf3+dWMM7pjjWFFET5YK6M D2O/ih+/06hhJoNXUds8UbegWJzuGmOeDR84rzN/9W8j9fhugWxkgXUbjy6U7VT2I3T+ q6rQ== 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=3gIYD55/XoMkEurf9k1vRxM6gR58jFuDkrOUex8iR6U=; b=qV22W+V3e0+AD/MnYW9ZIk4blJp54wnS7Oh/51W7kZ741sisjHiYT1509qw98qVrYZ tJXDHdIfbbF7VuojABNp2h9V/A3Hq0LSXN5yzPJHTVXdeXacdwbEoZ7NlJWKQJAytreq pHF1vgcA7MT6KhqSdu26raC0M+DnxPSZk1Mgg+EorYWnwS7V8OZbuVMVW1OLso5Eu5x7 AsGqPi4dMibBKxIBl8nCE01NSTEJNvTQhLEbzhFK1ANPrOS9jcHvQUc4Bknl2Dy0uwZU h37jcs9yEBMgjokJV0783lDCm5ENJ07yXfhZHr9mdoVmas42uvzMljL0wimFXF2yxKKG KGHg== X-Gm-Message-State: AOAM5317RO9Q7lELV0wBnefmoBArV7hPfIwlK7pDhoe7Xyf3pxRPNboY rugA+pGoE01IyuPoJb5k0iZHp8tnaUk= X-Received: by 2002:a37:a794:: with SMTP id q142mr11983764qke.216.1618841529640; Mon, 19 Apr 2021 07:12:09 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:09 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:54 -0300 Message-Id: <20210419141024.8174-58-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 57/87] avfilter/Makefile: Don't compile transform.c unconditionally 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: vN0XbCUoc7hg Content-Length: 1915 From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavfilter/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index b77f2276a4..42efa14a67 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -19,7 +19,6 @@ OBJS = allfilters.o \ framequeue.o \ graphdump.o \ graphparser.o \ - transform.o \ video.o \ OBJS-$(HAVE_THREADS) += pthread.o @@ -237,8 +236,8 @@ OBJS-$(CONFIG_DEJUDDER_FILTER) += vf_dejudder.o OBJS-$(CONFIG_DELOGO_FILTER) += vf_delogo.o OBJS-$(CONFIG_DENOISE_VAAPI_FILTER) += vf_misc_vaapi.o vaapi_vpp.o OBJS-$(CONFIG_DESHAKE_OPENCL_FILTER) += vf_deshake_opencl.o opencl.o \ - opencl/deshake.o -OBJS-$(CONFIG_DESHAKE_FILTER) += vf_deshake.o + opencl/deshake.o transform.o +OBJS-$(CONFIG_DESHAKE_FILTER) += vf_deshake.o transform.o OBJS-$(CONFIG_DESPILL_FILTER) += vf_despill.o OBJS-$(CONFIG_DETELECINE_FILTER) += vf_detelecine.o OBJS-$(CONFIG_DILATION_FILTER) += vf_neighbor.o From patchwork Mon Apr 19 14:09:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27137 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp1098208yba; Mon, 19 Apr 2021 07:19:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1CDQlfE5xT+/VMPxkT3JXqjK2o+Dbr0yp8eacUx6hhtRO9MviPt9QJDWFdOOuo3Xd4yKe X-Received: by 2002:a17:906:f41:: with SMTP id h1mr12506076ejj.399.1618841973800; Mon, 19 Apr 2021 07:19:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841973; cv=none; d=google.com; s=arc-20160816; b=ynYMkv9xraaLJ9UCy4YSfYXn6is+U8kLFYg8rXtmctdBQmqF5W1uniNWhZ8qDZgvp9 EsQJ/YRyiFbwEz2tZXxR9uZ85HKTTdEYvZezJ0F0me4VYo/rKbnq9EV86WdLCzt5AIQR w+1XNZrUFAy4A4jA/gDATu2RmDQ7Dp0QB9VTFLSlNCLTqP7AppStPZofPXHs2dOsFKJt ffyxpWM8o0ZORAM7MGJp2DnkCHG5PU4kkNpiRgyT4McqXNVu3oqPLiKLcyq42hSw0XNc fPjJnzO+Uh4H0PxxZrayqNMP2dzBoeS4R6bhUhDxxJWTpKN2FwQsNJuUAz3GrFFA7NpH e+MA== 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=6TzkrorM0rU0AMR/rSV3L5l/YTe/Lb6w/IwbflaYkiM=; b=LUnKDeZgSp0MZrn8BrRvVPJIr+MC91AqmXJiidOjeckAsLXfhh5drzLshp9jCR7902 ysOQ/+YyY7CEFrNVf0g/6B4x+UBSHipOu8DoRbdUe875Tcsgc5SlCc2Schl/Ck7pZdVk O2hbZJ2V/snVRnzhQTE23nfmuu2mTHM70cazxKG0MLzLitEFt7GCBc+fzoBa6/RD06Sj 3tV4GANwh77lmllC6u9+rpPCCxwCBq5wGM/t4uEI42ZYhySR5N/Y01qeYINI+M3BWC4q HxQa4j6Iojn8wAc+ws313j/+d88vlQ/6M+Pr8mzs7gWDFHiWBL0L0PQa+IMExO2O6oBn YsaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VjUXUkrf; 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 y3si7347627edw.274.2021.04.19.07.19.33; Mon, 19 Apr 2021 07:19:33 -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=VjUXUkrf; 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 DD9F4689ADE; Mon, 19 Apr 2021 17:12:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 317FD680987 for ; Mon, 19 Apr 2021 17:12:12 +0300 (EEST) Received: by mail-qt1-f175.google.com with SMTP id 1so26142533qtb.0 for ; Mon, 19 Apr 2021 07:12:12 -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=gLmpGIrebt4FqP4u4OuApbAcL6uJ9N+BRIwe48t2CaU=; b=VjUXUkrfQ30ca1xIuEmKxLcimEMf+k6C6oEYOtk2+QUiBy2Kn2o9MK4+v28w7PSzUZ AeYMgV7quv2H+nGuobcCQ44ockzguxbE5oM6JGrgBH5pISyMGiCxna2/exCJhAJN7Q+Q 6MMayTITujaQDC5lP5mOYDydvLXvKg/Tl+2SyYggBb5bRcO3tlgWmy3YdYpf+uFC3VXC 70q0grrZMEU+zF03Ix1v69C1KWCjG0aTnHWssuuRvpcpKdG3ToJVSmEaL3Oc/xtpTqXN +kjgDrtELp5aw4lU2ipVV5ee5EVhqBLfBP5rCPsUhYs9oE1eEQQP6tgWhwxTqTf1A1Su ci1Q== 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=gLmpGIrebt4FqP4u4OuApbAcL6uJ9N+BRIwe48t2CaU=; b=AmegGvBQyAwZrKzSgp431s3aiCQueTJkrOn5w996lu/Ysy2yfrQsiw65zZmi4di9Mh OWHwee25Bn83ywC/XihM3Y9rIvSuxPztb1GyVIYQF9SFYilNJYU2JiUFuR4TB0j6l5C9 n5VQLtxPiCWI4vRecLLoJt+2ZDUaI6B40EKyQBOAFCRFfvKIwWjGu4ptTabEaIJGeWoH Cy5nA6nUd33r+KQm0YsvHdhSB38jhtcp8kzg/89ZRh85z6M9vKkqsBq4aQxPMONES9x5 0fP3PuRrZEcfvXBQ/jz84UXL0Hulw/vki9aRZovKhodwTvwpwCo0AE+kJAVdYhOhHL06 8u8Q== X-Gm-Message-State: AOAM531Q5ZbKmmGW/qzmdyLvOc3uq5ggzXE+RtFbcgHX/H9XkyqdHMF+ H6PSDg0dkwDF5Sgd5nJsECl3NeFSqaY= X-Received: by 2002:a05:622a:11cd:: with SMTP id n13mr12087947qtk.52.1618841530773; Mon, 19 Apr 2021 07:12:10 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:55 -0300 Message-Id: <20210419141024.8174-59-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 58/87] libswscale: Remove unused deprecated functions, make used ones static 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: rfAZRH87x/0/ Content-Length: 6273 From: Andreas Rheinhardt Deprecated in 3b905b9fe611efb3282aa4c5c659e1870d91a83b. Signed-off-by: Andreas Rheinhardt --- libswscale/swscale.h | 11 ----- libswscale/utils.c | 96 -------------------------------------------- libswscale/version.h | 4 -- 3 files changed, 111 deletions(-) diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 7713f51ec6..50d6d46553 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -260,17 +260,6 @@ void sws_scaleVec(SwsVector *a, double scalar); */ void sws_normalizeVec(SwsVector *a, double height); -#if FF_API_SWS_VECTOR -attribute_deprecated SwsVector *sws_getConstVec(double c, int length); -attribute_deprecated SwsVector *sws_getIdentityVec(void); -attribute_deprecated void sws_convVec(SwsVector *a, SwsVector *b); -attribute_deprecated void sws_addVec(SwsVector *a, SwsVector *b); -attribute_deprecated void sws_subVec(SwsVector *a, SwsVector *b); -attribute_deprecated void sws_shiftVec(SwsVector *a, int shift); -attribute_deprecated SwsVector *sws_cloneVec(SwsVector *a); -attribute_deprecated void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level); -#endif - void sws_freeVec(SwsVector *a); SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur, diff --git a/libswscale/utils.c b/libswscale/utils.c index 352a8ed116..6bac7b658d 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -54,21 +54,14 @@ #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" -// We have to implement deprecated functions until they are removed, this is the -// simplest way to prevent warnings -#undef attribute_deprecated -#define attribute_deprecated - #include "rgb2rgb.h" #include "swscale.h" #include "swscale_internal.h" -#if !FF_API_SWS_VECTOR static SwsVector *sws_getIdentityVec(void); static void sws_addVec(SwsVector *a, SwsVector *b); static void sws_shiftVec(SwsVector *a, int shift); static void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level); -#endif static void handle_formats(SwsContext *c); @@ -2081,9 +2074,7 @@ SwsVector *sws_getGaussianVec(double variance, double quality) * Allocate and return a vector with length coefficients, all * with the same value c. */ -#if !FF_API_SWS_VECTOR static -#endif SwsVector *sws_getConstVec(double c, int length) { int i; @@ -2102,9 +2093,7 @@ SwsVector *sws_getConstVec(double c, int length) * Allocate and return a vector with just one coefficient, with * value 1.0. */ -#if !FF_API_SWS_VECTOR static -#endif SwsVector *sws_getIdentityVec(void) { return sws_getConstVec(1.0, 1); @@ -2134,26 +2123,6 @@ void sws_normalizeVec(SwsVector *a, double height) sws_scaleVec(a, height / sws_dcVec(a)); } -#if FF_API_SWS_VECTOR -static SwsVector *sws_getConvVec(SwsVector *a, SwsVector *b) -{ - int length = a->length + b->length - 1; - int i, j; - SwsVector *vec = sws_getConstVec(0.0, length); - - if (!vec) - return NULL; - - for (i = 0; i < a->length; i++) { - for (j = 0; j < b->length; j++) { - vec->coeff[i + j] += a->coeff[i] * b->coeff[j]; - } - } - - return vec; -} -#endif - static SwsVector *sws_sumVec(SwsVector *a, SwsVector *b) { int length = FFMAX(a->length, b->length); @@ -2171,25 +2140,6 @@ static SwsVector *sws_sumVec(SwsVector *a, SwsVector *b) return vec; } -#if FF_API_SWS_VECTOR -static SwsVector *sws_diffVec(SwsVector *a, SwsVector *b) -{ - int length = FFMAX(a->length, b->length); - int i; - SwsVector *vec = sws_getConstVec(0.0, length); - - if (!vec) - return NULL; - - for (i = 0; i < a->length; i++) - vec->coeff[i + (length - 1) / 2 - (a->length - 1) / 2] += a->coeff[i]; - for (i = 0; i < b->length; i++) - vec->coeff[i + (length - 1) / 2 - (b->length - 1) / 2] -= b->coeff[i]; - - return vec; -} -#endif - /* shift left / or right if "shift" is negative */ static SwsVector *sws_getShiftedVec(SwsVector *a, int shift) { @@ -2208,9 +2158,7 @@ static SwsVector *sws_getShiftedVec(SwsVector *a, int shift) return vec; } -#if !FF_API_SWS_VECTOR static -#endif void sws_shiftVec(SwsVector *a, int shift) { SwsVector *shifted = sws_getShiftedVec(a, shift); @@ -2224,9 +2172,7 @@ void sws_shiftVec(SwsVector *a, int shift) av_free(shifted); } -#if !FF_API_SWS_VECTOR static -#endif void sws_addVec(SwsVector *a, SwsVector *b) { SwsVector *sum = sws_sumVec(a, b); @@ -2240,53 +2186,11 @@ void sws_addVec(SwsVector *a, SwsVector *b) av_free(sum); } -#if FF_API_SWS_VECTOR -void sws_subVec(SwsVector *a, SwsVector *b) -{ - SwsVector *diff = sws_diffVec(a, b); - if (!diff) { - makenan_vec(a); - return; - } - av_free(a->coeff); - a->coeff = diff->coeff; - a->length = diff->length; - av_free(diff); -} - -void sws_convVec(SwsVector *a, SwsVector *b) -{ - SwsVector *conv = sws_getConvVec(a, b); - if (!conv) { - makenan_vec(a); - return; - } - av_free(a->coeff); - a->coeff = conv->coeff; - a->length = conv->length; - av_free(conv); -} - -SwsVector *sws_cloneVec(SwsVector *a) -{ - SwsVector *vec = sws_allocVec(a->length); - - if (!vec) - return NULL; - - memcpy(vec->coeff, a->coeff, a->length * sizeof(*a->coeff)); - - return vec; -} -#endif - /** * Print with av_log() a textual representation of the vector a * if log_level <= av_log_level. */ -#if !FF_API_SWS_VECTOR static -#endif void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level) { int i; diff --git a/libswscale/version.h b/libswscale/version.h index 7a616a42e0..f7bade61ca 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -46,8 +46,4 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_SWS_VECTOR -#define FF_API_SWS_VECTOR (LIBSWSCALE_VERSION_MAJOR < 6) -#endif - #endif /* SWSCALE_VERSION_H */ From patchwork Mon Apr 19 14:09:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27138 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp1098352yba; Mon, 19 Apr 2021 07:19:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+unXgxYAzI4FcZ4P3BpViNyzRwT61l+0+TRHtod+rt9SlAIrE7olzCcNaAlxR0Bfw6Wsn X-Received: by 2002:a17:906:5490:: with SMTP id r16mr23034937ejo.352.1618841985058; Mon, 19 Apr 2021 07:19:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841985; cv=none; d=google.com; s=arc-20160816; b=ukpCoiaIEgF3+fdFFy31ggsuKCKgftrlUSBtqCeQWsWHTZT6JbtgeKq/H2VF/e5/4T sx1S0bepsuMDCfjlyeEf4OrdWmGFinRk8zAxY8R2qg8J0YIu1nOmphNvQs+0XEYMFS6v FGfjBibF9DfXIN6K03kHJEZvXCPShV1P2mepUbCrOitoMCLwH+AXPh/e37HmO+aYWzk5 /Uk4gqeYWDGwi7IAxXzmc3ZPN6EZGia2NoB6TvwLT+IkPPyjIiGbwasQW40wqum8+7t3 c/0ckH6Tu6EXqUric+PzBwabHPUN7Mngde5/f79qvkB9M1S3eb18kJAH41VPOh2UGhgf ZIBg== 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=o38hk9hqcG+721VEl8NMeEkYjVQm2JctRy5oT1efYTo=; b=r9NaePhqIHpJzn33m0yQD/IPNmXmp6gZMHQuRI6Ki38zos/bm0K5PZ4iNzV+HjmuXF 222zVSOkvnc3MHtWM3IiYhp1zldWkSD3TC15TCedcqYU2QXkZCIk2zH+IbL9sdiQz42N dlTkxwE+bxUwQhrefALIOBvYvQbyvpkwKXdwNUUfPO5MsBybQOXxbGtHQfQN4GG3/VZk YfIKff5FuvAMuG56LKtpGsrR9GL20H1ZcKd/OFppbv55DhCyVsD7gPOE+HGCe6T/b7ya Hpy5B73C4PeotDI9xk9JYMd1BQsb7L9mb8IW1MUFsoalN3AoK+9JLmNBl3kS6rb4D2Qu GUhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ryxtewXr; 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 p1si12630504edm.205.2021.04.19.07.19.44; Mon, 19 Apr 2021 07:19:45 -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=ryxtewXr; 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 EE699689A04; Mon, 19 Apr 2021 17:12:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 396D46899CF for ; Mon, 19 Apr 2021 17:12:13 +0300 (EEST) Received: by mail-qk1-f181.google.com with SMTP id o5so35882378qkb.0 for ; Mon, 19 Apr 2021 07:12:13 -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=118pzRIsfBniqvJMUcL7u6ztpAn+fYHZh9kA0kZN76w=; b=ryxtewXr4wU5YubHyGjH4wgrsdrhlipeIsbAB99cAGZ8kMnpHB1hGR+TUqbAShMzHo 3Mm08t+5jCb0q/zWyaj9x8A//iXiFf892l3tF2KIaFEpU72BQXFkoBgaodaLcPTwnEay xrQGsdqFFb1UGkhCAyGPIT34Y1+7fRH00H8nazSHl/OrYRZVtgwQkYDs3QOnhT4ay4WP cUgaYsNcS7Ik19W0DONA6MLn9ZSkHWxgWpOcINpCCexySmA1i/O5fUJDaB/uTYuhVm5v W9hpzFQeVvcNwNKqZSUirqQ5PMUQDQkep6ALyzrLcnZdLb4j2ra9UQq8vc4HWrCWnU4B OYag== 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=118pzRIsfBniqvJMUcL7u6ztpAn+fYHZh9kA0kZN76w=; b=FBrz5/M00431ul1/ZGU1jAoWC5BX2Nl2PSanN7JW4ArzdRA5faQP6Rn5VNx7uRxnNI GUfA5z+qCDEXXOf04/vT51ogvDJEbQ8PP+ApXQQyNyh12Jzkh1VyIr0thTwkOQuSpwBA DuffzJkXCF5CWYZ7GJLhoK4NUJoha2amPf0GQDj83FTmvmgOhUhrSU2ouTpqqfbqZasX UWjcyipmAtWEc8vA63IbKhuQvgHLFSq4z7BWuqtezxAK9FUPZore4WtOJJDru2zGy65N +p8wgUf4Fb1Zb/EHSEAawdHrLRa0lHcNHlyEYgGEgo8e5+vVXB+1t7QyUvdxOA6NetjL fj9w== X-Gm-Message-State: AOAM53216sghBkFuG2GcjXFQZuNAThQAjddjw23x3IneXyi+QqImuoct bBBn8XIkhotkS0EG1b/AkbRzPmlRkIE= X-Received: by 2002:a37:a98e:: with SMTP id s136mr3483372qke.16.1618841531899; Mon, 19 Apr 2021 07:12:11 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:11 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:56 -0300 Message-Id: <20210419141024.8174-60-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 59/87] Disable vf_uspp/mcdeint. 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: VH58GKPWmtEN Content-Length: 1013 From: Anton Khirnov These filters depend on avcodec APIs that are to be removed. Some people have expressed potential interest in updating these filters, so they are merely disabled for now instead of being removed. --- configure | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure b/configure index cc1013fb1d..d552d5e150 100755 --- a/configure +++ b/configure @@ -7095,6 +7095,12 @@ esac enable frame_thread_encoder +# these filters depend on removed avcodec APIs +# they are kept disabled for now, but will be removed if +# nobody updates and re-enables them +disable mcdeint_filter +disable uspp_filter + enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; } check_deps $CONFIG_LIST \ From patchwork Mon Apr 19 14:09:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27150 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp1098494yba; Mon, 19 Apr 2021 07:19:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwveLq4daGWjC0oxpeei+gFsfC8UGgyyni9W1H7A+AjPV6VIAvoYpi8qTj/LkV2AmGC8P3h X-Received: by 2002:aa7:c245:: with SMTP id y5mr7872543edo.154.1618841996595; Mon, 19 Apr 2021 07:19:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841996; cv=none; d=google.com; s=arc-20160816; b=XeSS0YUS0Ilk3WiMWVmLivbCbr6m6SX/X1h4Ks8m62I9v6E9tCmBrNcrG/cd4BNmd/ JywGQE9T2y6FrVLJHuZYFCDrOkWiGTWB0plwApXqo+acdcO1kNVbN19TiNfBnhyyHTZ7 S1ko4U5rWEWQXRjzPXYJ0xdRaWTEQz58l6CJeRkCgpcioD09Nz5TG6VW2pmS3VNg9bLm f/7xZYaQrwzyZACJnvvI96zd76XIGXW1A/lgoGBAo4H+MfrT2Ca5e3Y9VREjLy8UMG+Z lnQncM+TwVe/zfcTq615SGkhx73MpvFUbJcChgh/w6MhnlZvgROuiV58WwtlUM/E0hYq bePw== 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=okeKwiYqxWYjDX3yui0caplCnnWB8tCz1omLGK+titE=; b=BQ9zY0q6ZwECS6P91uue6RVQi2OTVEFfjaAhMGd112W51t9bMC3kEhjXHEbhgMVSed GjlbhjKkVyWGkNNhQQec46tcVp4aKomqsxD9L9onYOGGqIDk27fVQz1hUPDKx7ymujAb hYFfFGLh+K4hbQ5veC4jSr0wP5QfvxH0tT8ndd+ABnM6xNwWrnwg2rISq76lGWRBHLHG pA+T9AGtaGEoRoI1U+QoEUjIvlX9hlWJxsKoRyP/mJtXLKqer01aJmRBEIKgc+CQpQ+t EUuEPfn9FJlcqOvMYWMIUYd7KYl2GsB/jKFuvxSqwresZt9kI8EZ+lfBdZY/a8CykFWw Bhdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hFrtnbj6; 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 pg28si11725328ejb.525.2021.04.19.07.19.52; Mon, 19 Apr 2021 07:19:56 -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=hFrtnbj6; 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 70314689B02; Mon, 19 Apr 2021 17:12:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 10CBD6899D2 for ; Mon, 19 Apr 2021 17:12:15 +0300 (EEST) Received: by mail-qk1-f173.google.com with SMTP id d19so136367qkk.12 for ; Mon, 19 Apr 2021 07:12:14 -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=3fKIC5Aofb8atMRM8zg5t+otcOsYlx5XKP1Wo4C7EXc=; b=hFrtnbj6FKPjQPwCfI4xaSfnv0bWVoFPFEOfN1nKqtvlvKgaRVs6GnfZo+rolzl3IU 0mXu1aBl+DnJapvhChZNw0l5cRLpF9hmAWrnRWBYHrffaMdMRSzbsEcG2mgs1D3cRs5d uUHoHxXWAFIhloJ47aTNVFjcs1CDtTV9pT9L3tAeJ+GzJYT1sQ7f33JO2qGxSY84SJBj BDrYJEAH2PWmkKfnWWGT3Tn3AqhIe5udF9WaQGxuwYDllYkMiyirpfTFAExFCcuimwUg hgvkc+5TuSROAIYPGXi4f+9VLESHKPx9NNhgLlB1CvwsbqpSN58f24JgQ/CAAqWTbplc 8yUQ== 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=3fKIC5Aofb8atMRM8zg5t+otcOsYlx5XKP1Wo4C7EXc=; b=l/rllK0+DgwuYuuDdP7Q9mZ6CmMmfgiRtkXDyVMd7PDQDsZfXTLqZGaXNis4+Ecn3h SgGqYfjlhoR86HfYkR1JUe2t5gE/uwh0j/DhPDXCric/5LhPg6XnIq3PM6A6folsCqOq BSHV1o/z4TGZ9tR/y2F3GCR/6SM+eCeSAsNi55r9BHCBiPPDpBAOb+ERcvWF8+pmw1Dx m355JnRv2aGfs/gSBx2on6lMcvQSJl+hRJGhiidjSVf6mrnQJ2m10R3iJhF0J99upWDg 6jAE02pvWhGR7f7RUh+H3il9VvtJ4zb0shxNRr1FPF6j//BXLUKxF3Dyq+SdN27Kk1Ci 6miQ== X-Gm-Message-State: AOAM530M46dFlc6QaZIPybUocJAROaxvwLtneCxuXQ280mzg0WPf3cCy FInOeV3d6yPjOph7iSswSLkYHHenla0= X-Received: by 2002:a37:a68c:: with SMTP id p134mr8429034qke.451.1618841533147; Mon, 19 Apr 2021 07:12:13 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:12 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:57 -0300 Message-Id: <20210419141024.8174-61-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 60/87] avcodec: Remove deprecated AVCodecContext.coded_frame 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: /f/z9k8W7IwU Content-Length: 37505 From: Andreas Rheinhardt Deprecated in 40cf1bbacc6220a0aa6bed5c331871d43f9ce370. (The currently disabled filter vf_mcdeint and vf_uspp were users of this field; they have not been changed, so that whoever wants to fix them can see the state of these filters when they were disabled.) Signed-off-by: Andreas Rheinhardt --- libavcodec/aliaspixenc.c | 7 ------- libavcodec/avcodec.c | 10 ---------- libavcodec/avcodec.h | 11 ----------- libavcodec/bmpenc.c | 6 ------ libavcodec/dnxhdenc.c | 17 ----------------- libavcodec/dvenc.c | 6 ------ libavcodec/encode.c | 8 -------- libavcodec/ffv1enc.c | 17 ----------------- libavcodec/flashsvenc.c | 13 ------------- libavcodec/huffyuvenc.c | 7 ------- libavcodec/jpeglsenc.c | 13 ------------- libavcodec/lclenc.c | 7 ------- libavcodec/libkvazaar.c | 11 ----------- libavcodec/libtheoraenc.c | 5 ----- libavcodec/libvpxenc.c | 24 ------------------------ libavcodec/libx264.c | 11 ----------- libavcodec/libx265.c | 6 ------ libavcodec/libxavs.c | 21 --------------------- libavcodec/libxvid.c | 18 ------------------ libavcodec/ljpegenc.c | 7 ------- libavcodec/mpegvideo_enc.c | 6 ------ libavcodec/nvenc.c | 6 ------ libavcodec/pamenc.c | 13 ------------- libavcodec/pcxenc.c | 13 ------------- libavcodec/pngenc.c | 7 ------- libavcodec/pnmenc.c | 17 ----------------- libavcodec/proresenc_kostya.c | 6 ------ libavcodec/pthread_frame.c | 5 ----- libavcodec/qsvenc.c | 6 ------ libavcodec/qtrleenc.c | 7 ------- libavcodec/rawenc.c | 5 ----- libavcodec/sgienc.c | 7 ------- libavcodec/snowenc.c | 19 ------------------- libavcodec/svq1enc.c | 7 ------- libavcodec/targaenc.c | 7 ------- libavcodec/tiffenc.c | 6 ------ libavcodec/utvideoenc.c | 9 +-------- libavcodec/v210enc.c | 6 ------ libavcodec/v410enc.c | 7 ------- libavcodec/version.h | 3 --- libavcodec/zmbvenc.c | 6 ------ libavdevice/v4l2.c | 15 --------------- 42 files changed, 1 insertion(+), 407 deletions(-) diff --git a/libavcodec/aliaspixenc.c b/libavcodec/aliaspixenc.c index a9ba00cd29..7c881d2e0a 100644 --- a/libavcodec/aliaspixenc.c +++ b/libavcodec/aliaspixenc.c @@ -33,13 +33,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, int width, height, bits_pixel, i, j, length, ret; uint8_t *in_buf, *buf; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - width = avctx->width; height = avctx->height; diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 8e91350d67..62556301ce 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -400,11 +400,6 @@ free_and_end: av_opt_free(avctx); if (av_codec_is_encoder(avctx->codec)) { -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - av_frame_free(&avctx->coded_frame); -FF_ENABLE_DEPRECATION_WARNINGS -#endif av_freep(&avctx->extradata); avctx->extradata_size = 0; } @@ -577,11 +572,6 @@ av_cold int avcodec_close(AVCodecContext *avctx) av_freep(&avctx->priv_data); if (av_codec_is_encoder(avctx->codec)) { av_freep(&avctx->extradata); -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - av_frame_free(&avctx->coded_frame); -FF_ENABLE_DEPRECATION_WARNINGS -#endif } avctx->codec = NULL; avctx->active_thread_type = 0; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c99b455814..144f299d46 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1578,17 +1578,6 @@ typedef struct AVCodecContext { */ int lowres; -#if FF_API_CODED_FRAME - /** - * the picture in the bitstream - * - encoding: Set by libavcodec. - * - decoding: unused - * - * @deprecated use the quality factor packet side data instead - */ - attribute_deprecated AVFrame *coded_frame; -#endif - /** * thread count * is used to decide how many independent tasks should be passed to execute() diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index e829d68475..bab2558bc9 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -74,12 +74,6 @@ static int bmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt, int bit_count = avctx->bits_per_coded_sample; uint8_t *ptr, *buf; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif switch (avctx->pix_fmt) { case AV_PIX_FMT_RGB444: compression = BMP_BITFIELDS; diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 2461c51727..19e11b4214 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -499,12 +499,6 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) !FF_ALLOCZ_TYPED_ARRAY(ctx->mb_bits, ctx->m.mb_num) || !FF_ALLOCZ_TYPED_ARRAY(ctx->mb_qscale, ctx->m.mb_num)) return AVERROR(ENOMEM); -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->key_frame = 1; - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (avctx->active_thread_type == FF_THREAD_SLICE) { if (avctx->thread_count > MAX_THREADS) { @@ -1252,11 +1246,6 @@ static void dnxhd_load_picture(DNXHDEncContext *ctx, const AVFrame *frame) ctx->thread[i]->dct_uv_offset = ctx->m.uvlinesize*8; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - ctx->m.avctx->coded_frame->interlaced_frame = frame->interlaced_frame; -FF_ENABLE_DEPRECATION_WARNINGS -#endif ctx->cur_field = frame->interlaced_frame && !frame->top_field_first; } @@ -1317,12 +1306,6 @@ encode_coding_unit: goto encode_coding_unit; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->quality = ctx->qscale * FF_QP2LAMBDA; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - ff_side_data_set_encoder_stats(pkt, ctx->qscale * FF_QP2LAMBDA, NULL, 0, AV_PICTURE_TYPE_I); pkt->flags |= AV_PKT_FLAG_KEY; diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index e0679c538c..f1be3e43f6 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -1169,12 +1169,6 @@ static int dvvideo_encode_frame(AVCodecContext *c, AVPacket *pkt, c->pix_fmt = s->sys->pix_fmt; s->frame = frame; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - c->coded_frame->key_frame = 1; - c->coded_frame->pict_type = AV_PICTURE_TYPE_I; -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->buf = pkt->data; dv_format_frame(s, pkt->data); diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 9a4140f91a..cb4821066c 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -527,14 +527,6 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, int ff_encode_preinit(AVCodecContext *avctx) { int i; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame = av_frame_alloc(); - if (!avctx->coded_frame) { - return AVERROR(ENOMEM); - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (avctx->time_base.num <= 0 || avctx->time_base.den <= 0) { av_log(avctx, AV_LOG_ERROR, "The encoder timebase is not set.\n"); diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index b610d5d65e..749f6265f3 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -745,12 +745,6 @@ static av_cold int encode_init(AVCodecContext *avctx) if ((ret = ff_ffv1_allocate_initial_states(s)) < 0) return ret; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (!s->transparency) s->plane_count = 2; if (!s->chroma_planes && s->version > 3) @@ -1174,11 +1168,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, av_frame_unref(p); if ((ret = av_frame_ref(p, pict)) < 0) return ret; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (avctx->gop_size == 0 || f->picture_number % avctx->gop_size == 0) { put_rac(c, &keystate, 1); @@ -1244,12 +1233,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (avctx->flags & AV_CODEC_FLAG_PASS1) avctx->stats_out[0] = '\0'; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->key_frame = f->key_frame; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - f->picture_number++; pkt->size = buf_p - pkt->data; pkt->pts = diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 95ae988448..d365ff3999 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -245,21 +245,8 @@ static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, //mark the frame type so the muxer can mux it correctly if (I_frame) { -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->last_key_frame = avctx->frame_number; ff_dlog(avctx, "Inserting keyframe at frame %d\n", avctx->frame_number); - } else { -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_P; - avctx->coded_frame->key_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } if (I_frame) diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 218e57600d..f1b42c8499 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -222,13 +222,6 @@ static av_cold int encode_init(AVCodecContext *avctx) if (!avctx->extradata) return AVERROR(ENOMEM); -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - s->bps = desc->comp[0].depth; s->yuv = !(desc->flags & AV_PIX_FMT_FLAG_RGB) && desc->nb_components >= 2; s->chroma = desc->nb_components > 2; diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index 0f109c1304..bc64288c95 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -413,18 +413,6 @@ static int encode_picture_ls(AVCodecContext *avctx, AVPacket *pkt, return 0; } -static av_cold int encode_init_ls(AVCodecContext *ctx) -{ -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - ctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - ctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - - return 0; -} - #define OFFSET(x) offsetof(JPEGLSContext, x) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { @@ -450,7 +438,6 @@ AVCodec ff_jpegls_encoder = { .id = AV_CODEC_ID_JPEGLS, .priv_data_size = sizeof(JPEGLSContext), .priv_class = &jpegls_class, - .init = encode_init_ls, .capabilities = AV_CODEC_CAP_FRAME_THREADS, .encode2 = encode_picture_ls, .pix_fmts = (const enum AVPixelFormat[]) { diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c index 4fe52b40da..250cb5625c 100644 --- a/libavcodec/lclenc.c +++ b/libavcodec/lclenc.c @@ -121,13 +121,6 @@ static av_cold int encode_init(AVCodecContext *avctx) if (!avctx->extradata) return AVERROR(ENOMEM); -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - c->compression = avctx->compression_level == FF_COMPRESSION_DEFAULT ? COMP_ZLIB_NORMAL : av_clip(avctx->compression_level, 0, 9); diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c index 4432649853..7dca605059 100644 --- a/libavcodec/libkvazaar.c +++ b/libavcodec/libkvazaar.c @@ -276,20 +276,9 @@ static int libkvazaar_encode(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "Unknown picture type encountered.\n"); return AVERROR_EXTERNAL; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = pict_type; -FF_ENABLE_DEPRECATION_WARNINGS -#endif ff_side_data_set_encoder_stats(avpkt, frame_info.qp * FF_QP2LAMBDA, NULL, 0, pict_type); -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->quality = frame_info.qp * FF_QP2LAMBDA; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - *got_packet_ptr = 1; } diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index 16966ed433..a067fa3344 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -346,11 +346,6 @@ static int encode_frame(AVCodecContext* avc_context, AVPacket *pkt, // HACK: assumes no encoder delay, this is true until libtheora becomes // multithreaded (which will be disabled unless explicitly requested) pkt->pts = pkt->dts = frame->pts; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avc_context->coded_frame->key_frame = !(o_packet.granulepos & h->keyframe_mask); -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (!(o_packet.granulepos & h->keyframe_mask)) pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 76013a74d3..bcfbbf3e76 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1179,28 +1179,12 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame, int pict_type; memcpy(pkt->data, cx_frame->buf, pkt->size); pkt->pts = pkt->dts = cx_frame->pts; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pts = cx_frame->pts; - avctx->coded_frame->key_frame = !!(cx_frame->flags & VPX_FRAME_IS_KEY); -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (!!(cx_frame->flags & VPX_FRAME_IS_KEY)) { pict_type = AV_PICTURE_TYPE_I; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = pict_type; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->flags |= AV_PKT_FLAG_KEY; } else { pict_type = AV_PICTURE_TYPE_P; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = pict_type; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } ff_side_data_set_encoder_stats(pkt, 0, cx_frame->sse + 1, @@ -1209,14 +1193,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (cx_frame->have_sse) { int i; /* Beware of the Y/U/V/all order! */ -#if FF_API_CODED_FRAME && FF_API_ERROR_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->error[0] = cx_frame->sse[1]; - avctx->coded_frame->error[1] = cx_frame->sse[2]; - avctx->coded_frame->error[2] = cx_frame->sse[3]; - avctx->coded_frame->error[3] = 0; // alpha -FF_ENABLE_DEPRECATION_WARNINGS -#endif for (i = 0; i < 3; ++i) { avctx->error[i] += cx_frame->sse[i + 1]; } diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 4e7097e569..23f7ad897b 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -481,23 +481,12 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, av_log(ctx, AV_LOG_ERROR, "Unknown picture type encountered.\n"); return AVERROR_EXTERNAL; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - ctx->coded_frame->pict_type = pict_type; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->flags |= AV_PKT_FLAG_KEY*pic_out.b_keyframe; if (ret) { ff_side_data_set_encoder_stats(pkt, (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA, NULL, 0, pict_type); if (wallclock) ff_side_data_set_prft(pkt, wallclock); - -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - ctx->coded_frame->quality = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } *got_packet = ret; diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index b2008e96f1..a1bd205201 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -566,12 +566,6 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, return AVERROR_EXTERNAL; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = pict_type; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - #if X265_BUILD >= 130 if (x265pic_out.sliceType == X265_TYPE_B) #else diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index 0f22016731..b0b6b247b6 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -165,11 +165,6 @@ static int XAVS_frame(AVCodecContext *avctx, AVPacket *pkt, return 0; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pts = pic_out.i_pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->pts = pic_out.i_pts; if (avctx->has_b_frames) { if (!x4->out_frame_count) @@ -194,29 +189,13 @@ FF_ENABLE_DEPRECATION_WARNINGS default: pict_type = AV_PICTURE_TYPE_NONE; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = pict_type; -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* There is no IDR frame in AVS JiZhun */ /* Sequence header is used as a flag */ if (pic_out.i_type == XAVS_TYPE_I) { -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->flags |= AV_PKT_FLAG_KEY; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->quality = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - ff_side_data_set_encoder_stats(pkt, (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA, NULL, 0, pict_type); x4->out_frame_count++; diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 22582680a0..2bc32bddb1 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -828,31 +828,13 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt, else pict_type = AV_PICTURE_TYPE_I; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = pict_type; - avctx->coded_frame->quality = xvid_enc_stats.quant * FF_QP2LAMBDA; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - ff_side_data_set_encoder_stats(pkt, xvid_enc_stats.quant * FF_QP2LAMBDA, NULL, 0, pict_type); if (xvid_enc_frame.out_flags & XVID_KEYFRAME) { -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->flags |= AV_PKT_FLAG_KEY; if (x->quicktime_format) return xvid_strip_vol_header(avctx, pkt, xvid_enc_stats.hlength, xerr); - } else { -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->key_frame = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } pkt->size = xerr; diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 9a107e85ce..788fd4260b 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -281,13 +281,6 @@ static av_cold int ljpeg_encode_init(AVCodecContext *avctx) if (ret < 0) return ret; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - s->scratch = av_malloc_array(avctx->width + 1, sizeof(*s->scratch)); if (!s->scratch) return AVERROR(ENOMEM); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 8785f25787..0aa94dc7d8 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1605,12 +1605,6 @@ static void frame_end(MpegEncContext *s) if (s->pict_type!= AV_PICTURE_TYPE_B) s->last_non_b_pict_type = s->pict_type; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - av_frame_unref(s->avctx->coded_frame); - av_frame_copy_props(s->avctx->coded_frame, s->current_picture.f); -FF_ENABLE_DEPRECATION_WARNINGS -#endif #if FF_API_ERROR_FRAME FF_DISABLE_DEPRECATION_WARNINGS memcpy(s->current_picture.f->error, s->current_picture.encoding_error, diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index d33ee489d0..0dcd93a99c 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -2041,12 +2041,6 @@ static int process_output_surface(AVCodecContext *avctx, AVPacket *pkt, NvencSur goto error; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = pict_type; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - ff_side_data_set_encoder_stats(pkt, (lock_params.frameAvgQP - 1) * FF_QP2LAMBDA, NULL, 0, pict_type); diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c index 50c9fcb404..ef3bc3bf16 100644 --- a/libavcodec/pamenc.c +++ b/libavcodec/pamenc.c @@ -127,24 +127,11 @@ static int pam_encode_frame(AVCodecContext *avctx, AVPacket *pkt, return 0; } -static av_cold int pam_encode_init(AVCodecContext *avctx) -{ -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - - return 0; -} - AVCodec ff_pam_encoder = { .name = "pam", .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PAM, - .init = pam_encode_init, .encode2 = pam_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c index 6135944c31..709bf84d12 100644 --- a/libavcodec/pcxenc.c +++ b/libavcodec/pcxenc.c @@ -33,18 +33,6 @@ static const uint32_t monoblack_pal[16] = { 0x000000, 0xFFFFFF }; -static av_cold int pcx_encode_init(AVCodecContext *avctx) -{ -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - - return 0; -} - /** * PCX run-length encoder * @param dst output buffer @@ -209,7 +197,6 @@ AVCodec ff_pcx_encoder = { .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PCX, - .init = pcx_encode_init, .encode2 = pcx_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_RGB24, diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index e2636b7daf..374d7c9cf7 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -1008,13 +1008,6 @@ static av_cold int png_enc_init(AVCodecContext *avctx) avctx->bits_per_coded_sample = 8; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - ff_llvidencdsp_init(&s->llvidencdsp); if (avctx->pix_fmt == AV_PIX_FMT_MONOBLACK) diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 276504bf14..56e929a5f0 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -148,25 +148,12 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, return 0; } -static av_cold int pnm_encode_init(AVCodecContext *avctx) -{ -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - - return 0; -} - #if CONFIG_PGM_ENCODER AVCodec ff_pgm_encoder = { .name = "pgm", .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PGM, - .init = pnm_encode_init, .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_NONE @@ -181,7 +168,6 @@ AVCodec ff_pgmyuv_encoder = { .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PGMYUV, - .init = pnm_encode_init, .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P16BE, AV_PIX_FMT_NONE @@ -196,7 +182,6 @@ AVCodec ff_ppm_encoder = { .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PPM, - .init = pnm_encode_init, .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48BE, AV_PIX_FMT_NONE @@ -211,7 +196,6 @@ AVCodec ff_pbm_encoder = { .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PBM, - .init = pnm_encode_init, .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, @@ -225,7 +209,6 @@ AVCodec ff_pfm_encoder = { .long_name = NULL_IF_CONFIG_SMALL("PFM (Portable FloatMap) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_PFM, - .init = pnm_encode_init, .encode2 = pnm_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_GBRPF32, AV_PIX_FMT_NONE }, diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 54fc6707a1..81a8cd73e7 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -1179,12 +1179,6 @@ static av_cold int encode_init(AVCodecContext *avctx) int interlaced = !!(avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT); avctx->bits_per_raw_sample = 10; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif ctx->fdct = prores_fdct; ctx->scantable = interlaced ? ff_prores_interlaced_scan diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index ae5b000d97..78116e7e5a 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -321,11 +321,6 @@ static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src, } if (for_user) { -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - dst->coded_frame = src->coded_frame; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (dst->codec->update_thread_context_for_user) err = dst->codec->update_thread_context_for_user(dst, src); } else { diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 6281e63a54..0ec8e0e597 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1555,12 +1555,6 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, return AVERROR_INVALIDDATA; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = pict_type; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - #if QSV_VERSION_ATLEAST(1, 26) if (avctx->codec_id == AV_CODEC_ID_H264) { enc_buf = bs->ExtParam; diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index f7eee4a591..9340563084 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -391,13 +391,6 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt, return ret; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->key_frame = s->key_frame; - avctx->coded_frame->pict_type = s->key_frame ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (s->key_frame) pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c index d181b74570..a7dd162d55 100644 --- a/libavcodec/rawenc.c +++ b/libavcodec/rawenc.c @@ -36,11 +36,6 @@ static av_cold int raw_encode_init(AVCodecContext *avctx) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; -FF_ENABLE_DEPRECATION_WARNINGS -#endif avctx->bits_per_coded_sample = av_get_bits_per_pixel(desc); if(!avctx->codec_tag) avctx->codec_tag = avcodec_pix_fmt_to_codec_tag(avctx->pix_fmt); diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c index 2a898f5a4f..d31f6340f7 100644 --- a/libavcodec/sgienc.c +++ b/libavcodec/sgienc.c @@ -100,13 +100,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, unsigned int width, height, depth, dimension; unsigned int bytes_per_channel, pixmax, put_be; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - width = avctx->width; height = avctx->height; bytes_per_channel = 1; diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index fc0e5230a9..255968341a 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1618,22 +1618,10 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, s->lambda = 0; }//else keep previous frame's qlog until after motion estimation -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - av_frame_unref(avctx->coded_frame); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (s->current_picture->data[0]) { int w = s->avctx->width; int h = s->avctx->height; -#if FF_API_CODED_FRAME - ret = av_frame_make_writable(s->current_picture); - if (ret < 0) - return ret; -#endif - s->mpvencdsp.draw_edges(s->current_picture->data[0], s->current_picture->linesize[0], w , h , EDGE_WIDTH , EDGE_WIDTH , EDGE_TOP | EDGE_BOTTOM); @@ -1649,13 +1637,6 @@ FF_ENABLE_DEPRECATION_WARNINGS } ff_snow_frame_start(s); -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - ret = av_frame_ref(avctx->coded_frame, s->current_picture); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (ret < 0) - return ret; s->m.current_picture_ptr= &s->m.current_picture; s->m.current_picture.f = s->current_picture; diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 2b74f009e0..b68df598c1 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -615,13 +615,6 @@ static int svq1_encode_frame(AVCodecContext *avctx, AVPacket *pkt, s->pict_type = AV_PICTURE_TYPE_I; s->quality = pict->quality; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = s->pict_type; - avctx->coded_frame->key_frame = s->pict_type == AV_PICTURE_TYPE_I; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - ff_side_data_set_encoder_stats(pkt, pict->quality, NULL, 0, s->pict_type); svq1_write_header(s, s->pict_type); diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c index f662e4a489..cd6cc9e874 100644 --- a/libavcodec/targaenc.c +++ b/libavcodec/targaenc.c @@ -184,13 +184,6 @@ static av_cold int targa_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->key_frame = 1; - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return 0; } diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 6661e59d31..03262f97b2 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -533,12 +533,6 @@ static av_cold int encode_init(AVCodecContext *avctx) } #endif -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; - avctx->coded_frame->key_frame = 1; -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->avctx = avctx; return 0; diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 8c8a9535a1..670e48aa9f 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -621,15 +621,8 @@ static int utvideo_encode_frame(AVCodecContext *avctx, AVPacket *pkt, * At least currently Ut Video is IDR only. * Set flags accordingly. */ -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->key_frame = 1; - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - - pkt->size = bytestream2_tell_p(&pb); pkt->flags |= AV_PKT_FLAG_KEY; + pkt->size = bytestream2_tell_p(&pb); /* Packet should be done */ *got_packet = 1; diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index 16e8810271..91af88b359 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -101,12 +101,6 @@ static av_cold int encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - ff_v210enc_init(s); avctx->bits_per_coded_sample = 20; diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c index 5e2450279f..9dc13f7144 100644 --- a/libavcodec/v410enc.c +++ b/libavcodec/v410enc.c @@ -51,13 +51,6 @@ static int v410_encode_frame(AVCodecContext *avctx, AVPacket *pkt, return ret; dst = pkt->data; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->key_frame = 1; - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - y = (uint16_t *)pic->data[0]; u = (uint16_t *)pic->data[1]; v = (uint16_t *)pic->data[2]; diff --git a/libavcodec/version.h b/libavcodec/version.h index 0830acf8b2..9e3181e810 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -51,9 +51,6 @@ * at once through the bump. This improves the git bisect-ability of the change. */ -#ifndef FF_API_CODED_FRAME -#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OPENH264_SLICE_MODE #define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 59) #endif diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index 319381dd48..1d4c617b4a 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -180,12 +180,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, c->curfrm++; if(c->curfrm == c->keyint) c->curfrm = 0; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; - avctx->coded_frame->key_frame = keyframe; -FF_ENABLE_DEPRECATION_WARNINGS -#endif palptr = (avctx->pix_fmt == AV_PIX_FMT_PAL8) ? (uint32_t *)p->data[1] : NULL; chpal = !keyframe && palptr && memcmp(palptr, c->pal2, 1024); diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 365bacd771..a5226d5e6f 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -981,27 +981,12 @@ fail: static int v4l2_read_packet(AVFormatContext *ctx, AVPacket *pkt) { -#if FF_API_CODED_FRAME && FF_API_LAVF_AVCTX -FF_DISABLE_DEPRECATION_WARNINGS - struct video_data *s = ctx->priv_data; - AVFrame *frame = ctx->streams[0]->codec->coded_frame; -FF_ENABLE_DEPRECATION_WARNINGS -#endif int res; if ((res = mmap_read_frame(ctx, pkt)) < 0) { return res; } -#if FF_API_CODED_FRAME && FF_API_LAVF_AVCTX -FF_DISABLE_DEPRECATION_WARNINGS - if (frame && s->interlaced) { - frame->interlaced_frame = 1; - frame->top_field_first = s->top_field_first; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return pkt->size; } From patchwork Mon Apr 19 14:09:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27058 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp562857iob; Mon, 19 Apr 2021 07:20:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycWQutQY2VUq6Xuvd8V+Us6Y1H8Rz+YlgAXz88kqf0tEPZZJzVkyPczMyYjj7b5zTd0Qda X-Received: by 2002:a17:906:8a79:: with SMTP id hy25mr22533181ejc.461.1618842010298; Mon, 19 Apr 2021 07:20:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842010; cv=none; d=google.com; s=arc-20160816; b=txIN3u/j4CYSNgyDoLOzWK0PSckcSc/SgN84aRwbwi9jS1CIpvz+e88sB5Ap3trOdZ Rxyh5+pZlz5Cggsu9qEapccqOv7ttcSeULJVUkXnvpyNMlqmMPANx9izisihRJbMDRuG 3wFQK2+dA+XOa/bBUn7plgH5pL49T0mgBDcbeE7Gf3YrsEw76opRR2UAWkVo1YqWpG9w IHClFQ7YNk5waJuM+xo1mZadDWOzYUdUqymO0zfuV6AR8PfFSqQLbDcQVQaS2eAr7pPr P4JMzAipx+xhPbU/4Q+VHuTsQJ5LD5QENyFrA8T72hjqwZOFR/8vIJPeIVFO0b+dLxjG +54w== 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=FdMhOloodrSEFIImRLVvKPvpO7EBzrmDmVKGmOyXb9o=; b=wsXgufeQ8A/qhPMJrxJF1kynK0UgueOgjrg4aON8I1FK5AZM7Alf3lyjJoyZeDJ0K0 GHkXp1aEU2h4UHYkDStPNacgSXjuPIqLf+w3JDkROeCRnDZ4EUMYUscp5NmE/t/YfOPB uFRBHsAb39jSpw6UToZw1/epQZHrNuZIXvEe2jh/F/3Bfxmyt+H2ZKWdNCRXvtF9DD7y 8JBlgvM57ZtSkcbNmIz17F9B2S7pTOt2yMrN3+QH+W4hYfe1owTlKpBPZ81Wo+12Xk0b kNYgX74mPRGPQRbo9Rg7J0l5GmES4YkFvqP3p29iFiqn/TX5VVktX5u1BOSxwj6wB6qh bxIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ZgggC8qD; 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 n18si6599104eja.397.2021.04.19.07.20.09; Mon, 19 Apr 2021 07:20:10 -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=ZgggC8qD; 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 5C311689AFD; Mon, 19 Apr 2021 17:12:22 +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 6F712689A1C for ; Mon, 19 Apr 2021 17:12:16 +0300 (EEST) Received: by mail-qt1-f180.google.com with SMTP id m16so25493132qtx.9 for ; Mon, 19 Apr 2021 07:12:16 -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=2YLdlA7+k+U9XP3i3S7SO0rii6S5zNEMSfzTZv2CKn4=; b=ZgggC8qDRo0H7Jpvx0lAYLd6Qu5VkQnctGBhIUGyxnHRNaQebXm96zhZ1u6qgx4PJP o0QWdaFsuZ2oIpy7F99BG48MM+zX+ppO4cEDikoytmf6nTgUfGYvAXPm7xnA3yL7CgL2 UdydCmTAnJLAlykWTBvFqQ3X4mmONVT49svVi4Eyfd2TMi7H67cLaeDOmhg5mAdxrFKc 3Bp0Nfg1PUXCqwcUGaT5R7/D2QgHkfJFAZBjXF9OrX/9ItALg3QwdvUHCDFP8evKYYdg AoL3mSxntyE73brAyZfYesvh7MnLXxS+/18/nxI3chSG39XKQceWVKN8Mowt4EF5dkb2 FeKQ== 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=2YLdlA7+k+U9XP3i3S7SO0rii6S5zNEMSfzTZv2CKn4=; b=gXZRqroCM7MTTiEsUPvh21mbmDINE0mPEh+4ICYVtzqM+Y2spzNmdu7fmfdOksLbkv tgLVmvqYVIOy678v86YsFFBNds2LnqQdF/UCrehkwGr3EYBlUUXYbkcqMqlqP43ng+k8 hoaPfnajaMRkdPQARNKGGhVUTvQBrPlco5WKp6S+F+BiaiOUJ10k00h0xEJ1MxvSjHUe ovMoR31Ko1FbvrQKpeOGv/4dKyR27ZNa7zZd+8TNLUXSK1VMqA5yv+MXOQ3bGzcENF4R 7o0B8XGRt+MjdI5v40EnkxNp2bc7VNuphMa6mACdeRB9nGhJmSH8K6xj2y6ZwTJWC1Qm pwfg== X-Gm-Message-State: AOAM532ni63c+iXqKV0bgSnBDyGuBfGrqp16JqdTwEy4jtYlFCy1PN88 VaMdXWqHkc85v/+K/LRRsp9kw5JWThM= X-Received: by 2002:ac8:5f49:: with SMTP id y9mr12184995qta.152.1618841534402; Mon, 19 Apr 2021 07:12:14 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:14 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:58 -0300 Message-Id: <20210419141024.8174-62-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 61/87] avcodec: Remove deprecated old encode/decode APIs 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: o8QlbKvrZ8P8 From: Andreas Rheinhardt Deprecated in commits 7fc329e2dd6226dfecaa4a1d7adf353bf2773726 and 31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3. Signed-off-by: Andreas Rheinhardt --- configure | 8 -- libavcodec/aarch64/neontest.c | 35 ----- libavcodec/arm/neontest.c | 35 ----- libavcodec/avcodec.c | 30 ----- libavcodec/avcodec.h | 245 +--------------------------------- libavcodec/decode.c | 155 --------------------- libavcodec/encode.c | 111 --------------- libavcodec/internal.h | 16 --- libavcodec/mpegvideo.h | 2 +- libavcodec/options_table.h | 3 - libavcodec/thread.h | 4 +- libavcodec/version.h | 3 - libavcodec/x86/w64xmmtest.c | 35 ----- 13 files changed, 4 insertions(+), 678 deletions(-) diff --git a/configure b/configure index d552d5e150..30b598dcc6 100755 --- a/configure +++ b/configure @@ -6857,11 +6857,7 @@ check_stripflags -x enabled neon_clobber_test && check_ldflags -Wl,--wrap,avcodec_open2 \ - -Wl,--wrap,avcodec_decode_audio4 \ - -Wl,--wrap,avcodec_decode_video2 \ -Wl,--wrap,avcodec_decode_subtitle2 \ - -Wl,--wrap,avcodec_encode_audio2 \ - -Wl,--wrap,avcodec_encode_video2 \ -Wl,--wrap,avcodec_encode_subtitle \ -Wl,--wrap,avcodec_send_packet \ -Wl,--wrap,avcodec_receive_packet \ @@ -6873,11 +6869,7 @@ enabled neon_clobber_test && enabled xmm_clobber_test && check_ldflags -Wl,--wrap,avcodec_open2 \ - -Wl,--wrap,avcodec_decode_audio4 \ - -Wl,--wrap,avcodec_decode_video2 \ -Wl,--wrap,avcodec_decode_subtitle2 \ - -Wl,--wrap,avcodec_encode_audio2 \ - -Wl,--wrap,avcodec_encode_video2 \ -Wl,--wrap,avcodec_encode_subtitle \ -Wl,--wrap,avcodec_send_packet \ -Wl,--wrap,avcodec_receive_packet \ diff --git a/libavcodec/aarch64/neontest.c b/libavcodec/aarch64/neontest.c index a4fc5a0e2f..ed84b6e073 100644 --- a/libavcodec/aarch64/neontest.c +++ b/libavcodec/aarch64/neontest.c @@ -29,41 +29,6 @@ wrap(avcodec_open2(AVCodecContext *avctx, testneonclobbers(avcodec_open2, avctx, codec, options); } -#if FF_API_OLD_ENCDEC -wrap(avcodec_decode_audio4(AVCodecContext *avctx, - AVFrame *frame, - int *got_frame_ptr, - AVPacket *avpkt)) -{ - testneonclobbers(avcodec_decode_audio4, avctx, frame, - got_frame_ptr, avpkt); -} - -wrap(avcodec_decode_video2(AVCodecContext *avctx, - AVFrame *picture, - int *got_picture_ptr, - AVPacket *avpkt)) -{ - testneonclobbers(avcodec_decode_video2, avctx, picture, - got_picture_ptr, avpkt); -} - -wrap(avcodec_encode_audio2(AVCodecContext *avctx, - AVPacket *avpkt, - const AVFrame *frame, - int *got_packet_ptr)) -{ - testneonclobbers(avcodec_encode_audio2, avctx, avpkt, frame, - got_packet_ptr); -} - -wrap(avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt, - const AVFrame *frame, int *got_packet_ptr)) -{ - testneonclobbers(avcodec_encode_video2, avctx, avpkt, frame, got_packet_ptr); -} -#endif - wrap(avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, diff --git a/libavcodec/arm/neontest.c b/libavcodec/arm/neontest.c index d1ede4955c..df64c6f778 100644 --- a/libavcodec/arm/neontest.c +++ b/libavcodec/arm/neontest.c @@ -29,41 +29,6 @@ wrap(avcodec_open2(AVCodecContext *avctx, testneonclobbers(avcodec_open2, avctx, codec, options); } -#if FF_API_OLD_ENCDEC -wrap(avcodec_decode_audio4(AVCodecContext *avctx, - AVFrame *frame, - int *got_frame_ptr, - AVPacket *avpkt)) -{ - testneonclobbers(avcodec_decode_audio4, avctx, frame, - got_frame_ptr, avpkt); -} - -wrap(avcodec_decode_video2(AVCodecContext *avctx, - AVFrame *picture, - int *got_picture_ptr, - AVPacket *avpkt)) -{ - testneonclobbers(avcodec_decode_video2, avctx, picture, - got_picture_ptr, avpkt); -} - -wrap(avcodec_encode_audio2(AVCodecContext *avctx, - AVPacket *avpkt, - const AVFrame *frame, - int *got_packet_ptr)) -{ - testneonclobbers(avcodec_encode_audio2, avctx, avpkt, frame, - got_packet_ptr); -} - -wrap(avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt, - const AVFrame *frame, int *got_packet_ptr)) -{ - testneonclobbers(avcodec_encode_video2, avctx, avpkt, frame, got_packet_ptr); -} -#endif - wrap(avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 62556301ce..4c6be665ff 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -181,15 +181,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code } avctx->internal = avci; -#if FF_API_OLD_ENCDEC - avci->to_free = av_frame_alloc(); - avci->compat_decode_frame = av_frame_alloc(); - avci->compat_encode_packet = av_packet_alloc(); - if (!avci->to_free || !avci->compat_decode_frame || !avci->compat_encode_packet) { - ret = AVERROR(ENOMEM); - goto free_and_end; - } -#endif avci->buffer_frame = av_frame_alloc(); avci->buffer_pkt = av_packet_alloc(); avci->es.in_frame = av_frame_alloc(); @@ -408,11 +399,6 @@ free_and_end: av_freep(&avctx->priv_data); av_freep(&avctx->subtitle_header); -#if FF_API_OLD_ENCDEC - av_frame_free(&avci->to_free); - av_frame_free(&avci->compat_decode_frame); - av_packet_free(&avci->compat_encode_packet); -#endif av_frame_free(&avci->buffer_frame); av_packet_free(&avci->buffer_pkt); av_packet_free(&avci->last_pkt_props); @@ -452,10 +438,6 @@ void avcodec_flush_buffers(AVCodecContext *avctx) avci->draining_done = 0; avci->nb_draining_errors = 0; av_frame_unref(avci->buffer_frame); -#if FF_API_OLD_ENCDEC - av_frame_unref(avci->compat_decode_frame); - av_packet_unref(avci->compat_encode_packet); -#endif av_packet_unref(avci->buffer_pkt); av_packet_unref(avci->last_pkt_props); @@ -480,13 +462,6 @@ void avcodec_flush_buffers(AVCodecContext *avctx) if (av_codec_is_decoder(avctx->codec)) av_bsf_flush(avci->bsf); - -#if FF_API_OLD_ENCDEC -FF_DISABLE_DEPRECATION_WARNINGS - if (!avctx->refcounted_frames) - av_frame_unref(avci->to_free); -FF_ENABLE_DEPRECATION_WARNINGS -#endif } void avsubtitle_free(AVSubtitle *sub) @@ -528,11 +503,6 @@ av_cold int avcodec_close(AVCodecContext *avctx) avctx->codec->close(avctx); avci->byte_buffer_size = 0; av_freep(&avci->byte_buffer); -#if FF_API_OLD_ENCDEC - av_frame_free(&avci->to_free); - av_frame_free(&avci->compat_decode_frame); - av_packet_free(&avci->compat_encode_packet); -#endif av_frame_free(&avci->buffer_frame); av_packet_free(&avci->buffer_pkt); av_packet_unref(avci->last_pkt_props); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 144f299d46..bb5e8490ca 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -155,29 +155,6 @@ * at least will not fail with AVERROR(EAGAIN). In general, no codec will * permit unlimited buffering of input or output. * - * This API replaces the following legacy functions: - * - avcodec_decode_video2() and avcodec_decode_audio4(): - * Use avcodec_send_packet() to feed input to the decoder, then use - * avcodec_receive_frame() to receive decoded frames after each packet. - * Unlike with the old video decoding API, multiple frames might result from - * a packet. For audio, splitting the input packet into frames by partially - * decoding packets becomes transparent to the API user. You never need to - * feed an AVPacket to the API twice (unless it is rejected with AVERROR(EAGAIN) - then - * no data was read from the packet). - * Additionally, sending a flush/draining packet is required only once. - * - avcodec_encode_video2()/avcodec_encode_audio2(): - * Use avcodec_send_frame() to feed input to the encoder, then use - * avcodec_receive_packet() to receive encoded packets. - * Providing user-allocated buffers for avcodec_receive_packet() is not - * possible. - * - The new API does not handle subtitles yet. - * - * Mixing new and old function calls on the same AVCodecContext is not allowed, - * and will result in undefined behavior. - * - * Some codecs might require using the new API; using the old API will return - * an error when calling it. All codecs support the new API. - * * A codec is not allowed to return AVERROR(EAGAIN) for both sending and receiving. This * would be an invalid state, which could put the codec user into an endless * loop. The API has no concept of time either: it cannot happen that trying to @@ -685,7 +662,7 @@ typedef struct AVCodecContext { * picture width / height. * * @note Those fields may not match the values of the last - * AVFrame output by avcodec_decode_video2 due frame + * AVFrame output by avcodec_receive_frame() due frame * reordering. * * - encoding: MUST be set by user. @@ -1275,24 +1252,6 @@ typedef struct AVCodecContext { */ int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags); -#if FF_API_OLD_ENCDEC - /** - * If non-zero, the decoded audio and video frames returned from - * avcodec_decode_video2() and avcodec_decode_audio4() are reference-counted - * and are valid indefinitely. The caller must free them with - * av_frame_unref() when they are not needed anymore. - * Otherwise, the decoded frames must not be freed by the caller and are - * only valid until the next decode call. - * - * This is always automatically enabled if avcodec_receive_frame() is used. - * - * - encoding: unused - * - decoding: set by the caller before avcodec_open2(). - */ - attribute_deprecated - int refcounted_frames; -#endif - /* - encoding parameters */ float qcompress; ///< amount of qscale change between easy & hard scenes (0.0-1.0) float qblur; ///< amount of qscale smoothing over time (0.0-1.0) @@ -2644,115 +2603,6 @@ int avcodec_enum_to_chroma_pos(int *xpos, int *ypos, enum AVChromaLocation pos); */ enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos); -#if FF_API_OLD_ENCDEC -/** - * Decode the audio frame of size avpkt->size from avpkt->data into frame. - * - * Some decoders may support multiple frames in a single AVPacket. Such - * decoders would then just decode the first frame and the return value would be - * less than the packet size. In this case, avcodec_decode_audio4 has to be - * called again with an AVPacket containing the remaining data in order to - * decode the second frame, etc... Even if no frames are returned, the packet - * needs to be fed to the decoder with remaining data until it is completely - * consumed or an error occurs. - * - * Some decoders (those marked with AV_CODEC_CAP_DELAY) have a delay between input - * and output. This means that for some packets they will not immediately - * produce decoded output and need to be flushed at the end of decoding to get - * all the decoded data. Flushing is done by calling this function with packets - * with avpkt->data set to NULL and avpkt->size set to 0 until it stops - * returning samples. It is safe to flush even those decoders that are not - * marked with AV_CODEC_CAP_DELAY, then no samples will be returned. - * - * @warning The input buffer, avpkt->data must be AV_INPUT_BUFFER_PADDING_SIZE - * larger than the actual read bytes because some optimized bitstream - * readers read 32 or 64 bits at once and could read over the end. - * - * @note The AVCodecContext MUST have been opened with @ref avcodec_open2() - * before packets may be fed to the decoder. - * - * @param avctx the codec context - * @param[out] frame The AVFrame in which to store decoded audio samples. - * The decoder will allocate a buffer for the decoded frame by - * calling the AVCodecContext.get_buffer2() callback. - * When AVCodecContext.refcounted_frames is set to 1, the frame is - * reference counted and the returned reference belongs to the - * caller. The caller must release the frame using av_frame_unref() - * when the frame is no longer needed. The caller may safely write - * to the frame if av_frame_is_writable() returns 1. - * When AVCodecContext.refcounted_frames is set to 0, the returned - * reference belongs to the decoder and is valid only until the - * next call to this function or until closing or flushing the - * decoder. The caller may not write to it. - * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is - * non-zero. Note that this field being set to zero - * does not mean that an error has occurred. For - * decoders with AV_CODEC_CAP_DELAY set, no given decode - * call is guaranteed to produce a frame. - * @param[in] avpkt The input AVPacket containing the input buffer. - * At least avpkt->data and avpkt->size should be set. Some - * decoders might also require additional fields to be set. - * @return A negative error code is returned if an error occurred during - * decoding, otherwise the number of bytes consumed from the input - * AVPacket is returned. - * -* @deprecated Use avcodec_send_packet() and avcodec_receive_frame(). - */ -attribute_deprecated -int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame, - int *got_frame_ptr, const AVPacket *avpkt); - -/** - * Decode the video frame of size avpkt->size from avpkt->data into picture. - * Some decoders may support multiple frames in a single AVPacket, such - * decoders would then just decode the first frame. - * - * @warning The input buffer must be AV_INPUT_BUFFER_PADDING_SIZE larger than - * the actual read bytes because some optimized bitstream readers read 32 or 64 - * bits at once and could read over the end. - * - * @warning The end of the input buffer buf should be set to 0 to ensure that - * no overreading happens for damaged MPEG streams. - * - * @note Codecs which have the AV_CODEC_CAP_DELAY capability set have a delay - * between input and output, these need to be fed with avpkt->data=NULL, - * avpkt->size=0 at the end to return the remaining frames. - * - * @note The AVCodecContext MUST have been opened with @ref avcodec_open2() - * before packets may be fed to the decoder. - * - * @param avctx the codec context - * @param[out] picture The AVFrame in which the decoded video frame will be stored. - * Use av_frame_alloc() to get an AVFrame. The codec will - * allocate memory for the actual bitmap by calling the - * AVCodecContext.get_buffer2() callback. - * When AVCodecContext.refcounted_frames is set to 1, the frame is - * reference counted and the returned reference belongs to the - * caller. The caller must release the frame using av_frame_unref() - * when the frame is no longer needed. The caller may safely write - * to the frame if av_frame_is_writable() returns 1. - * When AVCodecContext.refcounted_frames is set to 0, the returned - * reference belongs to the decoder and is valid only until the - * next call to this function or until closing or flushing the - * decoder. The caller may not write to it. - * - * @param[in] avpkt The input AVPacket containing the input buffer. - * You can create such packet with av_init_packet() and by then setting - * data and size, some decoders might in addition need other fields like - * flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least - * fields possible. - * @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero. - * @return On error a negative value is returned, otherwise the number of bytes - * used or zero if no frame could be decompressed. - * - * @deprecated Use avcodec_send_packet() and avcodec_receive_frame(). - */ -attribute_deprecated -int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, - int *got_picture_ptr, - const AVPacket *avpkt); -#endif - /** * Decode a subtitle message. * Return a negative value on error, otherwise return the number of bytes used. @@ -2796,10 +2646,6 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, * larger than the actual read bytes because some optimized bitstream * readers read 32 or 64 bits at once and could read over the end. * - * @warning Do not mix this API with the legacy API (like avcodec_decode_video2()) - * on the same AVCodecContext. It will return unexpected results now - * or in future libavcodec versions. - * * @note The AVCodecContext MUST have been opened with @ref avcodec_open2() * before packets may be fed to the decoder. * @@ -3265,95 +3111,6 @@ void av_parser_close(AVCodecParserContext *s); * @{ */ -#if FF_API_OLD_ENCDEC -/** - * Encode a frame of audio. - * - * Takes input samples from frame and writes the next output packet, if - * available, to avpkt. The output packet does not necessarily contain data for - * the most recent frame, as encoders can delay, split, and combine input frames - * internally as needed. - * - * @param avctx codec context - * @param avpkt output AVPacket. - * The user can supply an output buffer by setting - * avpkt->data and avpkt->size prior to calling the - * function, but if the size of the user-provided data is not - * large enough, encoding will fail. If avpkt->data and - * avpkt->size are set, avpkt->destruct must also be set. All - * other AVPacket fields will be reset by the encoder using - * av_init_packet(). If avpkt->data is NULL, the encoder will - * allocate it. The encoder will set avpkt->size to the size - * of the output packet. - * - * If this function fails or produces no output, avpkt will be - * freed using av_packet_unref(). - * @param[in] frame AVFrame containing the raw audio data to be encoded. - * May be NULL when flushing an encoder that has the - * AV_CODEC_CAP_DELAY capability set. - * If AV_CODEC_CAP_VARIABLE_FRAME_SIZE is set, then each frame - * can have any number of samples. - * If it is not set, frame->nb_samples must be equal to - * avctx->frame_size for all frames except the last. - * The final frame may be smaller than avctx->frame_size. - * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the - * output packet is non-empty, and to 0 if it is - * empty. If the function returns an error, the - * packet can be assumed to be invalid, and the - * value of got_packet_ptr is undefined and should - * not be used. - * @return 0 on success, negative error code on failure - * - * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead. - * If allowed and required, set AVCodecContext.get_encode_buffer to - * a custom function to pass user supplied output buffers. - */ -attribute_deprecated -int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt, - const AVFrame *frame, int *got_packet_ptr); - -/** - * Encode a frame of video. - * - * Takes input raw video data from frame and writes the next output packet, if - * available, to avpkt. The output packet does not necessarily contain data for - * the most recent frame, as encoders can delay and reorder input frames - * internally as needed. - * - * @param avctx codec context - * @param avpkt output AVPacket. - * The user can supply an output buffer by setting - * avpkt->data and avpkt->size prior to calling the - * function, but if the size of the user-provided data is not - * large enough, encoding will fail. All other AVPacket fields - * will be reset by the encoder using av_init_packet(). If - * avpkt->data is NULL, the encoder will allocate it. - * The encoder will set avpkt->size to the size of the - * output packet. The returned data (if any) belongs to the - * caller, he is responsible for freeing it. - * - * If this function fails or produces no output, avpkt will be - * freed using av_packet_unref(). - * @param[in] frame AVFrame containing the raw video data to be encoded. - * May be NULL when flushing an encoder that has the - * AV_CODEC_CAP_DELAY capability set. - * @param[out] got_packet_ptr This field is set to 1 by libavcodec if the - * output packet is non-empty, and to 0 if it is - * empty. If the function returns an error, the - * packet can be assumed to be invalid, and the - * value of got_packet_ptr is undefined and should - * not be used. - * @return 0 on success, negative error code on failure - * - * @deprecated use avcodec_send_frame()/avcodec_receive_packet() instead. - * If allowed and required, set AVCodecContext.get_encode_buffer to - * a custom function to pass user supplied output buffers. - */ -attribute_deprecated -int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt, - const AVFrame *frame, int *got_packet_ptr); -#endif - int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, const AVSubtitle *sub); diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 0078f00607..dbc3f0110b 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -241,11 +241,6 @@ int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt) if (ret < 0) goto finish; -#if FF_API_OLD_ENCDEC - if (avctx->codec->receive_frame) - avci->compat_decode_consumed += pkt->size; -#endif - return 0; finish: av_packet_unref(pkt); @@ -490,10 +485,6 @@ FF_ENABLE_DEPRECATION_WARNINGS } } -#if FF_API_OLD_ENCDEC - avci->compat_decode_consumed += ret; -#endif - if (ret >= pkt->size || ret < 0) { av_packet_unref(pkt); av_packet_unref(avci->last_pkt_props); @@ -716,152 +707,6 @@ int attribute_align_arg avcodec_receive_frame(AVCodecContext *avctx, AVFrame *fr return 0; } -#if FF_API_OLD_ENCDEC -FF_DISABLE_DEPRECATION_WARNINGS -static int unrefcount_frame(AVCodecInternal *avci, AVFrame *frame) -{ - int ret; - - /* move the original frame to our backup */ - av_frame_unref(avci->to_free); - av_frame_move_ref(avci->to_free, frame); - - /* now copy everything except the AVBufferRefs back - * note that we make a COPY of the side data, so calling av_frame_free() on - * the caller's frame will work properly */ - ret = av_frame_copy_props(frame, avci->to_free); - if (ret < 0) - return ret; - - memcpy(frame->data, avci->to_free->data, sizeof(frame->data)); - memcpy(frame->linesize, avci->to_free->linesize, sizeof(frame->linesize)); - if (avci->to_free->extended_data != avci->to_free->data) { - int planes = avci->to_free->channels; - int size = planes * sizeof(*frame->extended_data); - - if (!size) { - av_frame_unref(frame); - return AVERROR_BUG; - } - - frame->extended_data = av_malloc(size); - if (!frame->extended_data) { - av_frame_unref(frame); - return AVERROR(ENOMEM); - } - memcpy(frame->extended_data, avci->to_free->extended_data, - size); - } else - frame->extended_data = frame->data; - - frame->format = avci->to_free->format; - frame->width = avci->to_free->width; - frame->height = avci->to_free->height; - frame->channel_layout = avci->to_free->channel_layout; - frame->nb_samples = avci->to_free->nb_samples; - frame->channels = avci->to_free->channels; - - return 0; -} - -static int compat_decode(AVCodecContext *avctx, AVFrame *frame, - int *got_frame, const AVPacket *pkt) -{ - AVCodecInternal *avci = avctx->internal; - int ret = 0; - - av_assert0(avci->compat_decode_consumed == 0); - - if (avci->draining_done && pkt && pkt->size != 0) { - av_log(avctx, AV_LOG_WARNING, "Got unexpected packet after EOF\n"); - avcodec_flush_buffers(avctx); - } - - *got_frame = 0; - - if (avci->compat_decode_partial_size > 0 && - avci->compat_decode_partial_size != pkt->size) { - av_log(avctx, AV_LOG_ERROR, - "Got unexpected packet size after a partial decode\n"); - ret = AVERROR(EINVAL); - goto finish; - } - - if (!avci->compat_decode_partial_size) { - ret = avcodec_send_packet(avctx, pkt); - if (ret == AVERROR_EOF) - ret = 0; - else if (ret == AVERROR(EAGAIN)) { - /* we fully drain all the output in each decode call, so this should not - * ever happen */ - ret = AVERROR_BUG; - goto finish; - } else if (ret < 0) - goto finish; - } - - while (ret >= 0) { - ret = avcodec_receive_frame(avctx, frame); - if (ret < 0) { - if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) - ret = 0; - goto finish; - } - - if (frame != avci->compat_decode_frame) { - if (!avctx->refcounted_frames) { - ret = unrefcount_frame(avci, frame); - if (ret < 0) - goto finish; - } - - *got_frame = 1; - frame = avci->compat_decode_frame; - } else { - if (!avci->compat_decode_warned) { - av_log(avctx, AV_LOG_WARNING, "The deprecated avcodec_decode_* " - "API cannot return all the frames for this decoder. " - "Some frames will be dropped. Update your code to the " - "new decoding API to fix this.\n"); - avci->compat_decode_warned = 1; - } - } - - if (avci->draining || (!avctx->codec->bsfs && avci->compat_decode_consumed < pkt->size)) - break; - } - -finish: - if (ret == 0) { - /* if there are any bsfs then assume full packet is always consumed */ - if (avctx->codec->bsfs) - ret = pkt->size; - else - ret = FFMIN(avci->compat_decode_consumed, pkt->size); - } - avci->compat_decode_consumed = 0; - avci->compat_decode_partial_size = (ret >= 0) ? pkt->size - ret : 0; - - return ret; -} - -int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, - int *got_picture_ptr, - const AVPacket *avpkt) -{ - return compat_decode(avctx, picture, got_picture_ptr, avpkt); -} - -int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, - AVFrame *frame, - int *got_frame_ptr, - const AVPacket *avpkt) -{ - return compat_decode(avctx, frame, got_frame_ptr, avpkt); -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - static void get_subtitle_defaults(AVSubtitle *sub) { memset(sub, 0, sizeof(*sub)); diff --git a/libavcodec/encode.c b/libavcodec/encode.c index cb4821066c..ba084d1f76 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -413,117 +413,6 @@ int attribute_align_arg avcodec_receive_packet(AVCodecContext *avctx, AVPacket * return 0; } -#if FF_API_OLD_ENCDEC -static int compat_encode(AVCodecContext *avctx, AVPacket *avpkt, - int *got_packet, const AVFrame *frame) -{ - AVCodecInternal *avci = avctx->internal; - AVPacket user_pkt; - int ret; - - *got_packet = 0; - - if (frame && avctx->codec->type == AVMEDIA_TYPE_VIDEO) { - if (frame->format == AV_PIX_FMT_NONE) - av_log(avctx, AV_LOG_WARNING, "AVFrame.format is not set\n"); - if (frame->width == 0 || frame->height == 0) - av_log(avctx, AV_LOG_WARNING, "AVFrame.width or height is not set\n"); - } - - if (avctx->codec->capabilities & AV_CODEC_CAP_DR1) { - av_log(avctx, AV_LOG_WARNING, "The deprecated avcodec_encode_* API does not support " - "AV_CODEC_CAP_DR1 encoders\n"); - return AVERROR(ENOSYS); - } - - ret = avcodec_send_frame(avctx, frame); - if (ret == AVERROR_EOF) - ret = 0; - else if (ret == AVERROR(EAGAIN)) { - /* we fully drain all the output in each encode call, so this should not - * ever happen */ - return AVERROR_BUG; - } else if (ret < 0) - return ret; - - av_packet_move_ref(&user_pkt, avpkt); - while (ret >= 0) { - ret = avcodec_receive_packet(avctx, avpkt); - if (ret < 0) { - if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) - ret = 0; - goto finish; - } - - if (avpkt != avci->compat_encode_packet) { - if (avpkt->data && user_pkt.data) { - if (user_pkt.size >= avpkt->size) { - memcpy(user_pkt.data, avpkt->data, avpkt->size); - av_buffer_unref(&avpkt->buf); - avpkt->buf = user_pkt.buf; - avpkt->data = user_pkt.data; -FF_DISABLE_DEPRECATION_WARNINGS - av_init_packet(&user_pkt); -FF_ENABLE_DEPRECATION_WARNINGS - } else { - av_log(avctx, AV_LOG_ERROR, "Provided packet is too small, needs to be %d\n", avpkt->size); - av_packet_unref(avpkt); - ret = AVERROR(EINVAL); - goto finish; - } - } - - *got_packet = 1; - avpkt = avci->compat_encode_packet; - } else { - if (!avci->compat_decode_warned) { - av_log(avctx, AV_LOG_WARNING, "The deprecated avcodec_encode_* " - "API cannot return all the packets for this encoder. " - "Some packets will be dropped. Update your code to the " - "new encoding API to fix this.\n"); - avci->compat_decode_warned = 1; - av_packet_unref(avpkt); - } - } - - if (avci->draining) - break; - } - -finish: - if (ret < 0) - av_packet_unref(&user_pkt); - - return ret; -} - -int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, - AVPacket *avpkt, - const AVFrame *frame, - int *got_packet_ptr) -{ - int ret = compat_encode(avctx, avpkt, got_packet_ptr, frame); - - if (ret < 0) - av_packet_unref(avpkt); - - return ret; -} - -int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, - AVPacket *avpkt, - const AVFrame *frame, - int *got_packet_ptr) -{ - int ret = compat_encode(avctx, avpkt, got_packet_ptr, frame); - - if (ret < 0) - av_packet_unref(avpkt); - - return ret; -} -#endif - int ff_encode_preinit(AVCodecContext *avctx) { int i; diff --git a/libavcodec/internal.h b/libavcodec/internal.h index b57b996816..b101f20c40 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -136,10 +136,6 @@ typedef struct AVCodecInternal { */ int last_audio_frame; -#if FF_API_OLD_ENCDEC - AVFrame *to_free; -#endif - AVBufferRef *pool; void *thread_ctx; @@ -186,18 +182,6 @@ typedef struct AVCodecInternal { AVFrame *buffer_frame; int draining_done; -#if FF_API_OLD_ENCDEC - int compat_decode_warned; - /* this variable is set by the decoder internals to signal to the old - * API compat wrappers the amount of data consumed from the last packet */ - size_t compat_decode_consumed; - /* when a partial packet has been consumed, this stores the remaining size - * of the packet (that should be submitted in the next decode call */ - size_t compat_decode_partial_size; - AVFrame *compat_decode_frame; - AVPacket *compat_encode_packet; -#endif - int showed_multi_packet_warning; int skip_samples_multiplier; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 75e343838a..546d9c7929 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -137,7 +137,7 @@ typedef struct MpegEncContext { Picture **input_picture; ///< next pictures on display order for encoding Picture **reordered_input_picture; ///< pointer to the next pictures in coded order for encoding - int64_t user_specified_pts; ///< last non-zero pts from AVFrame which was passed into avcodec_encode_video2() + int64_t user_specified_pts; ///< last non-zero pts from AVFrame which was passed into avcodec_send_frame() /** * pts difference between the first and second input frame, used for * calculating dts of the first frame when there's a delay */ diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 6ad54c2d67..ed428b1310 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -368,9 +368,6 @@ static const AVOption avcodec_options[] = { {"ignore", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_IGNORE}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, {"sub_text_format", "set decoded text subtitle format", OFFSET(sub_text_format), AV_OPT_TYPE_INT, {.i64 = FF_SUB_TEXT_FMT_ASS}, 0, 1, S|D, "sub_text_format"}, {"ass", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_TEXT_FMT_ASS}, INT_MIN, INT_MAX, S|D, "sub_text_format"}, -#if FF_API_OLD_ENCDEC -{"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, A|V|D }, -#endif {"apply_cropping", NULL, OFFSET(apply_cropping), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, V | D }, {"skip_alpha", "Skip processing alpha", OFFSET(skip_alpha), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, V|D }, {"field_order", "Field order", OFFSET(field_order), AV_OPT_TYPE_INT, {.i64 = AV_FIELD_UNKNOWN }, 0, 5, V|D|E, "field_order" }, diff --git a/libavcodec/thread.h b/libavcodec/thread.h index 413196269f..d7d2ddd8f1 100644 --- a/libavcodec/thread.h +++ b/libavcodec/thread.h @@ -52,10 +52,10 @@ void ff_thread_flush(AVCodecContext *avctx); * Returns the next available frame in picture. *got_picture_ptr * will be 0 if none is available. * The return value on success is the size of the consumed packet for - * compatibility with avcodec_decode_video2(). This means the decoder + * compatibility with AVCodec.decode. This means the decoder * has to consume the full packet. * - * Parameters are the same as avcodec_decode_video2(). + * Parameters are the same as AVCodec.decode. */ int ff_thread_decode_frame(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, AVPacket *avpkt); diff --git a/libavcodec/version.h b/libavcodec/version.h index 9e3181e810..75fde1f8c7 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -60,9 +60,6 @@ #ifndef FF_API_UNUSED_CODEC_CAPS #define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_OLD_ENCDEC -#define FF_API_OLD_ENCDEC (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_THREAD_SAFE_CALLBACKS #define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60) #endif diff --git a/libavcodec/x86/w64xmmtest.c b/libavcodec/x86/w64xmmtest.c index d0782b9408..00b1a394d7 100644 --- a/libavcodec/x86/w64xmmtest.c +++ b/libavcodec/x86/w64xmmtest.c @@ -29,41 +29,6 @@ wrap(avcodec_open2(AVCodecContext *avctx, testxmmclobbers(avcodec_open2, avctx, codec, options); } -#if FF_API_OLD_ENCDEC -wrap(avcodec_decode_audio4(AVCodecContext *avctx, - AVFrame *frame, - int *got_frame_ptr, - AVPacket *avpkt)) -{ - testxmmclobbers(avcodec_decode_audio4, avctx, frame, - got_frame_ptr, avpkt); -} - -wrap(avcodec_decode_video2(AVCodecContext *avctx, - AVFrame *picture, - int *got_picture_ptr, - AVPacket *avpkt)) -{ - testxmmclobbers(avcodec_decode_video2, avctx, picture, - got_picture_ptr, avpkt); -} - -wrap(avcodec_encode_audio2(AVCodecContext *avctx, - AVPacket *avpkt, - const AVFrame *frame, - int *got_packet_ptr)) -{ - testxmmclobbers(avcodec_encode_audio2, avctx, avpkt, frame, - got_packet_ptr); -} - -wrap(avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt, - const AVFrame *frame, int *got_packet_ptr)) -{ - testxmmclobbers(avcodec_encode_video2, avctx, avpkt, frame, got_packet_ptr); -} -#endif - wrap(avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, From patchwork Mon Apr 19 14:09:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27053 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp563069iob; Mon, 19 Apr 2021 07:20:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNrBrax8iVECuAux5jMmcU/UFQYGPiEosPhiDJbIQMG+yx0aRAfpCIwXEeD1lRD90yp1W4 X-Received: by 2002:aa7:d046:: with SMTP id n6mr25319202edo.357.1618842024151; Mon, 19 Apr 2021 07:20:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842024; cv=none; d=google.com; s=arc-20160816; b=K+FcI3youwVBenQSk394OZ4oRQdqnz+Rtki+poSJeanhCVfsv20zi/NLe1J/BSbRMG rZElqVc9G8o68ASGpXegZzzu7s8CwhsCYOm08sStHfp8/4FM4cKuVWTU8J2di5XnAZTS /LnUHfijk6UOy4W2906llXZyS0EfS8stmBk90FK6l6O0qaa1pNymgs1IqcFwkUsFJ6kR jSJmzrV6HFVQ/H3D7w0U3iVCzhk1SLSzwTNAbl7WpL7+CIOuicYRWxvPj0GIQkWCJOCh sqoN3HwGcWq5WfJLvTtbg4wAq5Am9xRf3XjtEuZRmm+XkL4gZokblRXj3oGwL0BoSINA J8yQ== 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=CcGp9/n1QwFt8QD0fPlxvfqPW0KKqnh6zlwz6T91j9I=; b=TZAj/REBsKMXkQ6JmwKgelEWP53PNiYm8LVY6ID3aAiSNskE0ScUMP+wxvTNTTmguk IL/ZB1yZSf711Lm50Jtq17L3RUWaoq30hUghAmsB9OqGT+V/hUhy3L8E6nE5JgIfbFwX KSrEFVmf+QkzxP44IhSIRjj7E70k/z3Z6OYDcg+rIy/NkRZ40RgWMPJd1jgdwPfSMj1U W2zAonww578x6ZfE96+3evUwOOcof2Fbg2e9Z+I18xZFc59Bp0NU3S+RwaWrUGn1IU72 lKci6Xs7YdYQgXN9ylgACfu1GLVUJ0+fDYhuKWLHTZ14J6WoySEgwI5brKxgrb77fR6s Fwpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lYes5PU8; 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 h1si8086139ede.545.2021.04.19.07.20.23; Mon, 19 Apr 2021 07:20:24 -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=lYes5PU8; 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 40B9A689B43; Mon, 19 Apr 2021 17:12:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E70F7689A29 for ; Mon, 19 Apr 2021 17:12:16 +0300 (EEST) Received: by mail-qv1-f42.google.com with SMTP id gv2so7618524qvb.8 for ; Mon, 19 Apr 2021 07:12:16 -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=3VWufqTQCisielmGnVWCDiFQ3kI1f9wYte2OFFlgttg=; b=lYes5PU8Uebrt99OKqTzjo+o6u5ZyLI5YidMjd0Iir+Dr4c+7mDbdRaX/0OEjWRgkM sRz3OhNa3I9o2RPfeFkroRcXmCX8HmpIf/kFtn8lITW9M2GrkSefYZF0A+2TOjWfslwk wWVhfs1wrHHdyQIJX8/AmrG7KjOEh/GpQ2HNw0Zv74fO3TnqrBL1/50/XNQRPbpUGcyt gu70A4iTqKdH+QD80KEpOCagFY430/UBzNQiE3RJDi5yceFk5LaaqG0yFwzz4UXO6lOZ eTrPgxDo71pKH5gXw8RRv6CmrWv00E277aM9LNoyjm0KqLZdAeTBgCq//cC+KGhnGkIK ZGVQ== 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=3VWufqTQCisielmGnVWCDiFQ3kI1f9wYte2OFFlgttg=; b=beSaNHgV4orlO3hQ0bAx5BHUmHAPVvGTzwhF5AMXUaMU8vHNVLsxiRGpXrvZsBaEDD hnBfLuAZJ3Dd8HDGq4L3u/l1gMDFAQt0m3nKD6LPM83YN8vCyfh+CU9Ym65Dv7fZ4Eum c7HzOLMKPLk1iMs8fZWGiJkRdJV5JCozT/HAclnqMdMozNPc2e7LAj7uFJ47RkHhq83Q Xh9memVylMyu300Bi6nKyJWivPROHJcemHOy0Ou3EeVWh+BGWjXNjW0AF3g/rnol5efi CesRfqzC4yJPMVfwmRgY2LxLazZCAE0GJE2DOx/frnw4BSC83YjnFAZvwuyrdRUS7L44 5uWA== X-Gm-Message-State: AOAM532OhqZzNKd6BdztC1oY7ksTRHBICNlnd9VeAhCDNI5jlT/DMZDi pTBL0Pcn9nElAK0WskIMbcJhVmAWXdM= X-Received: by 2002:ad4:4ee8:: with SMTP id dv8mr2749022qvb.46.1618841535618; Mon, 19 Apr 2021 07:12:15 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:15 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:59 -0300 Message-Id: <20210419141024.8174-63-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 62/87] avutil/pixfmt: Remove deprecated VAAPI pixel formats 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: LB29u1RqargA From: Andreas Rheinhardt Deprecated in 9f8e57efe4400ca86352277873792792279c3b15. Signed-off-by: Andreas Rheinhardt --- libavutil/pixdesc.c | 25 ------------------------- libavutil/pixfmt.h | 10 ---------- libavutil/version.h | 3 --- 3 files changed, 38 deletions(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 18c7a0efc8..a4ab93c975 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1329,33 +1329,12 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_RGB, }, -#if FF_API_VAAPI - [AV_PIX_FMT_VAAPI_MOCO] = { - .name = "vaapi_moco", - .log2_chroma_w = 1, - .log2_chroma_h = 1, - .flags = AV_PIX_FMT_FLAG_HWACCEL, - }, - [AV_PIX_FMT_VAAPI_IDCT] = { - .name = "vaapi_idct", - .log2_chroma_w = 1, - .log2_chroma_h = 1, - .flags = AV_PIX_FMT_FLAG_HWACCEL, - }, - [AV_PIX_FMT_VAAPI_VLD] = { - .name = "vaapi_vld", - .log2_chroma_w = 1, - .log2_chroma_h = 1, - .flags = AV_PIX_FMT_FLAG_HWACCEL, - }, -#else [AV_PIX_FMT_VAAPI] = { .name = "vaapi", .log2_chroma_w = 1, .log2_chroma_h = 1, .flags = AV_PIX_FMT_FLAG_HWACCEL, }, -#endif [AV_PIX_FMT_YUV420P9LE] = { .name = "yuv420p9le", .nb_components = 3, @@ -2515,10 +2494,6 @@ enum AVPixelFormat av_get_pix_fmt(const char *name) pix_fmt = get_pix_fmt_internal(name2); } -#if FF_API_VAAPI - if (pix_fmt == AV_PIX_FMT_NONE && !strcmp(name, "vaapi")) - pix_fmt = AV_PIX_FMT_VAAPI; -#endif return pix_fmt; } diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 46ef211add..30591133a4 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -112,21 +112,11 @@ enum AVPixelFormat { AV_PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb), big-endian , X=unused/undefined AV_PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1X 5B 5G 5R(lsb), little-endian, X=unused/undefined -#if FF_API_VAAPI - /** @name Deprecated pixel formats */ - /**@{*/ - AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers - AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers - AV_PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a VASurfaceID - /**@}*/ - AV_PIX_FMT_VAAPI = AV_PIX_FMT_VAAPI_VLD, -#else /** * Hardware acceleration through VA-API, data[3] contains a * VASurfaceID. */ AV_PIX_FMT_VAAPI, -#endif AV_PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian AV_PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian diff --git a/libavutil/version.h b/libavutil/version.h index 658bcd402e..628a40d22b 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_VAAPI -#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_FRAME_QP #define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 57) #endif From patchwork Mon Apr 19 14:10:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27061 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp563261iob; Mon, 19 Apr 2021 07:20:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyME4q3am5WvcG3u9JoiGSEDyvyZBc/G7RpzxE16eSQsPYanvyFhkZP1jZbzYFxu3BpFgMT X-Received: by 2002:a17:906:4ed1:: with SMTP id i17mr21830801ejv.424.1618842036540; Mon, 19 Apr 2021 07:20:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842036; cv=none; d=google.com; s=arc-20160816; b=Oq9yMeMiT5DYHSrcMKYO4C6VekJpAcZ5QFIEaByUQan+Dg+T6EasTmtmk/la82J23s aOzmZS/pqc6rkEr6LGGNdZo6E+MBgA5RyCFehkGWr/l2ihHahZs11Oa1LbYptbeyNgtt h1ktSTdcL12vsOM/TfpPJRYCgbwUQHM+/++W2yrFhoFPApXI8sc9WNXohwPiyBTabdwC pALl9/S84bfvkTrldL1cNLsjcw5vUyXLL6euJhf9grBg/UqLDiktte5XBWTvV6ZM9QVd rzlpd3scIxhPgdWxAZJ74BiDCmBv1f5ddw5AN6u/wD4hJ1zxszHN6J/a/fHt0YlrrFfO FalQ== 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=mu9aJavk+gf3/j1fz08/BJUADtLqSx/nLs3LxbTKAKo=; b=JPLghfFRAqoXydS4xWsMM8Ym8r4HT2t0JteSgoT9B3v894yxmJFv5kiJf8J61C44td OIL1qOznsK9D4Z05FIlDKaUoGs15it6IDp2AJP1fPTRh7QPtolOCE9TXS5e9yDR52k1o iqLhSSpRu1paLG6Ps/amFBDWfs9Zp2d244IVPmyOqx/VNojfZyxpPKY9Zb34HUrD1Bwq FEtclmblqRiS8mPSNOaKTmm7h1xn3GMu90qnSqfEG9iM3g+KfQw6iXRZlcCGzRGXPXyW zeh815sP57gubF7tlR53SXVstffHUs2ZrahQ8L5kVcEBfBZCVj/zLesdpUaQNVwdpASy SGJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NFFu77Ge; 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 a4si11648348ejs.331.2021.04.19.07.20.36; Mon, 19 Apr 2021 07:20:36 -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=NFFu77Ge; 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 39DDE689BC2; Mon, 19 Apr 2021 17:12:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56140689ADE for ; Mon, 19 Apr 2021 17:12:18 +0300 (EEST) Received: by mail-qk1-f169.google.com with SMTP id x11so35790338qkp.11 for ; Mon, 19 Apr 2021 07:12: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=/se7bbEisFPqALPEvirL75WOeSdlXxjdUvojdmGVZrI=; b=NFFu77Geerwz5935e/s2Fa8AryCZN9TQDm+tW1jd9zihCFNN6VvZlUOv2FtQHRRykr wU6kDzY9zALfKxKZTnLiBYizLNiwWT2reY8eyDkYqAuOkMluMGh3GMuRUnSEFRytfkx4 gZ8C0yd4RyOtbZypd3jRzDbSJHsvo0Un5v+rNZBtU972IFwaafg3hyn1myU6BeRxh2QB RByKUJjlIp8Vf/3YsEykGfRfB3gxmemp+uQGnh+xEQA00tmF59PkUn6Og/KMb/jXQ+Vb K++QO1uDaGYPEIJmq5pjmfV0fHrID5sliCCTC8FqqygOKdst0TiODPqnK/BL/JogbnLz ybTQ== 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=/se7bbEisFPqALPEvirL75WOeSdlXxjdUvojdmGVZrI=; b=S8mcatF+gsgWK84nEfHoLH2e40r5fLas8ii2eEgm3/PURbo2XWXko6bBG0CxqTzj9A Ocet25DKCuDtefSIZssChlWvZkAvz+byxUODDxjBrBkSdI1KM05A2qnmbmFOWAHP01bK JJ2OaGprp5/b6puWpCBVnFij1LuC/DDuNmgk/JJWhMLCFOwsob8sBqXtq7IwQmQKq7Kx U+0VcgQF+D9JuOoWvRPgUZlxKkJDCYRdOwOjpbz0ikzxyED12qkTYFJoip9gfD6lEAWS jKbhHPH5ATWv7rdRA1jb2WD+DmNwZZNFgkRNenIdNsAfF6cJsCYTfnCDoSJ13/6BrJfR 5idA== X-Gm-Message-State: AOAM533d2cURTngML4zjqG1CoHIjUmRuo8NRMTZrDe68OtbeVyW0VgiY 3J9+Y6xaqa5X6fFsYEQYVxn3qfIIiIU= X-Received: by 2002:a37:2ec4:: with SMTP id u187mr12420464qkh.472.1618841536773; Mon, 19 Apr 2021 07:12:16 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:16 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:10:00 -0300 Message-Id: <20210419141024.8174-64-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 63/87] avutil/frame: Remove AVFrame QP table 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: ZzeOPJAd4nGq From: Andreas Rheinhardt Originally deprecated in 1296b1f6c0631ab79464e22d48a6a1548450b943; scheduled again for removal in a9915268327b097bba84a07f68968d8c07f4b549. Signed-off-by: Andreas Rheinhardt --- libavfilter/f_sidedata.c | 34 -------------- libavutil/frame.c | 97 ---------------------------------------- libavutil/frame.h | 41 ----------------- libavutil/version.h | 3 -- 4 files changed, 175 deletions(-) diff --git a/libavfilter/f_sidedata.c b/libavfilter/f_sidedata.c index 6f25d2b311..0542373ed8 100644 --- a/libavfilter/f_sidedata.c +++ b/libavfilter/f_sidedata.c @@ -43,7 +43,6 @@ typedef struct SideDataContext { } SideDataContext; #define OFFSET(x) offsetof(SideDataContext, x) -#if FF_API_FRAME_QP #define DEFINE_OPTIONS(filt_name, FLAGS) \ static const AVOption filt_name##_options[] = { \ { "mode", "set a mode of operation", OFFSET(mode), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, SIDEDATA_NB-1, FLAGS, "mode" }, \ @@ -66,8 +65,6 @@ static const AVOption filt_name##_options[] = { \ { "SPHERICAL", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_SPHERICAL }, 0, 0, FLAGS, "type" }, \ { "CONTENT_LIGHT_LEVEL", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, 0, 0, FLAGS, "type" }, \ { "ICC_PROFILE", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_ICC_PROFILE }, 0, 0, FLAGS, "type" }, \ - { "QP_TABLE_PROPERTIES", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_QP_TABLE_PROPERTIES }, 0, 0, FLAGS, "type" }, \ - { "QP_TABLE_DATA", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_QP_TABLE_DATA }, 0, 0, FLAGS, "type" }, \ { "S12M_TIMECOD", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_S12M_TIMECODE }, 0, 0, FLAGS, "type" }, \ { "DYNAMIC_HDR_PLUS", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, 0, 0, FLAGS, "type" }, \ { "REGIONS_OF_INTEREST", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_REGIONS_OF_INTEREST }, 0, 0, FLAGS, "type" }, \ @@ -75,37 +72,6 @@ static const AVOption filt_name##_options[] = { \ { "SEI_UNREGISTERED", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_SEI_UNREGISTERED }, 0, 0, FLAGS, "type" }, \ { NULL } \ } -#else -#define DEFINE_OPTIONS(filt_name, FLAGS) \ -static const AVOption filt_name##_options[] = { \ - { "mode", "set a mode of operation", OFFSET(mode), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, SIDEDATA_NB-1, FLAGS, "mode" }, \ - { "select", "select frame", 0, AV_OPT_TYPE_CONST, {.i64 = SIDEDATA_SELECT }, 0, 0, FLAGS, "mode" }, \ - { "delete", "delete side data", 0, AV_OPT_TYPE_CONST, {.i64 = SIDEDATA_DELETE }, 0, 0, FLAGS, "mode" }, \ - { "type", "set side data type", OFFSET(type), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, INT_MAX, FLAGS, "type" }, \ - { "PANSCAN", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_PANSCAN }, 0, 0, FLAGS, "type" }, \ - { "A53_CC", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_A53_CC }, 0, 0, FLAGS, "type" }, \ - { "STEREO3D", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_STEREO3D }, 0, 0, FLAGS, "type" }, \ - { "MATRIXENCODING", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_MATRIXENCODING }, 0, 0, FLAGS, "type" }, \ - { "DOWNMIX_INFO", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_DOWNMIX_INFO }, 0, 0, FLAGS, "type" }, \ - { "REPLAYGAIN", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_REPLAYGAIN }, 0, 0, FLAGS, "type" }, \ - { "DISPLAYMATRIX", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_DISPLAYMATRIX }, 0, 0, FLAGS, "type" }, \ - { "AFD", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_AFD }, 0, 0, FLAGS, "type" }, \ - { "MOTION_VECTORS", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_MOTION_VECTORS }, 0, 0, FLAGS, "type" }, \ - { "SKIP_SAMPLES", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_SKIP_SAMPLES }, 0, 0, FLAGS, "type" }, \ - { "AUDIO_SERVICE_TYPE", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_AUDIO_SERVICE_TYPE }, 0, 0, FLAGS, "type" }, \ - { "MASTERING_DISPLAY_METADATA", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_MASTERING_DISPLAY_METADATA }, 0, 0, FLAGS, "type" }, \ - { "GOP_TIMECODE", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_GOP_TIMECODE }, 0, 0, FLAGS, "type" }, \ - { "SPHERICAL", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_SPHERICAL }, 0, 0, FLAGS, "type" }, \ - { "CONTENT_LIGHT_LEVEL", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, 0, 0, FLAGS, "type" }, \ - { "ICC_PROFILE", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_ICC_PROFILE }, 0, 0, FLAGS, "type" }, \ - { "S12M_TIMECOD", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_S12M_TIMECODE }, 0, 0, FLAGS, "type" }, \ - { "DYNAMIC_HDR_PLUS", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, 0, 0, FLAGS, "type" }, \ - { "REGIONS_OF_INTEREST", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_REGIONS_OF_INTEREST }, 0, 0, FLAGS, "type" }, \ - { "DETECTION_BOUNDING_BOXES", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_DETECTION_BBOXES }, 0, 0, FLAGS, "type" }, \ - { "SEI_UNREGISTERED", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_SEI_UNREGISTERED }, 0, 0, FLAGS, "type" }, \ - { NULL } \ -} -#endif static av_cold int init(AVFilterContext *ctx) { diff --git a/libavutil/frame.c b/libavutil/frame.c index bb77e2d534..df826fbfb7 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -46,80 +46,6 @@ MAKE_ACCESSORS(AVFrame, frame, enum AVColorRange, color_range) (frame)->channels == \ av_get_channel_layout_nb_channels((frame)->channel_layout)) -#if FF_API_FRAME_QP -struct qp_properties { - int stride; - int type; -}; - -int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int qp_type) -{ - struct qp_properties *p; - AVFrameSideData *sd; - AVBufferRef *ref; - -FF_DISABLE_DEPRECATION_WARNINGS - av_buffer_unref(&f->qp_table_buf); - - f->qp_table_buf = buf; - f->qscale_table = buf->data; - f->qstride = stride; - f->qscale_type = qp_type; -FF_ENABLE_DEPRECATION_WARNINGS - - av_frame_remove_side_data(f, AV_FRAME_DATA_QP_TABLE_PROPERTIES); - av_frame_remove_side_data(f, AV_FRAME_DATA_QP_TABLE_DATA); - - ref = av_buffer_ref(buf); - if (!av_frame_new_side_data_from_buf(f, AV_FRAME_DATA_QP_TABLE_DATA, ref)) { - av_buffer_unref(&ref); - return AVERROR(ENOMEM); - } - - sd = av_frame_new_side_data(f, AV_FRAME_DATA_QP_TABLE_PROPERTIES, - sizeof(struct qp_properties)); - if (!sd) - return AVERROR(ENOMEM); - - p = (struct qp_properties *)sd->data; - p->stride = stride; - p->type = qp_type; - - return 0; -} - -int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type) -{ - AVBufferRef *buf = NULL; - - *stride = 0; - *type = 0; - -FF_DISABLE_DEPRECATION_WARNINGS - if (f->qp_table_buf) { - *stride = f->qstride; - *type = f->qscale_type; - buf = f->qp_table_buf; -FF_ENABLE_DEPRECATION_WARNINGS - } else { - AVFrameSideData *sd; - struct qp_properties *p; - sd = av_frame_get_side_data(f, AV_FRAME_DATA_QP_TABLE_PROPERTIES); - if (!sd) - return NULL; - p = (struct qp_properties *)sd->data; - sd = av_frame_get_side_data(f, AV_FRAME_DATA_QP_TABLE_DATA); - if (!sd) - return NULL; - *stride = p->stride; - *type = p->type; - buf = sd->buf; - } - - return buf ? buf->data : NULL; -} -#endif - #if FF_API_COLORSPACE_NAME const char *av_get_colorspace_name(enum AVColorSpace val) { @@ -422,20 +348,6 @@ FF_ENABLE_DEPRECATION_WARNINGS av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); } -#if FF_API_FRAME_QP -FF_DISABLE_DEPRECATION_WARNINGS - dst->qscale_table = NULL; - dst->qstride = 0; - dst->qscale_type = 0; - av_buffer_replace(&dst->qp_table_buf, src->qp_table_buf); - if (dst->qp_table_buf) { - dst->qscale_table = dst->qp_table_buf->data; - dst->qstride = src->qstride; - dst->qscale_type = src->qscale_type; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - ret = av_buffer_replace(&dst->opaque_ref, src->opaque_ref); ret |= av_buffer_replace(&dst->private_ref, src->private_ref); return ret; @@ -566,11 +478,6 @@ void av_frame_unref(AVFrame *frame) av_buffer_unref(&frame->extended_buf[i]); av_freep(&frame->extended_buf); av_dict_free(&frame->metadata); -#if FF_API_FRAME_QP -FF_DISABLE_DEPRECATION_WARNINGS - av_buffer_unref(&frame->qp_table_buf); -FF_ENABLE_DEPRECATION_WARNINGS -#endif av_buffer_unref(&frame->hw_frames_ctx); @@ -844,10 +751,6 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type) case AV_FRAME_DATA_S12M_TIMECODE: return "SMPTE 12-1 timecode"; case AV_FRAME_DATA_SPHERICAL: return "Spherical Mapping"; case AV_FRAME_DATA_ICC_PROFILE: return "ICC profile"; -#if FF_API_FRAME_QP - case AV_FRAME_DATA_QP_TABLE_PROPERTIES: return "QP table properties"; - case AV_FRAME_DATA_QP_TABLE_DATA: return "QP table data"; -#endif case AV_FRAME_DATA_DYNAMIC_HDR_PLUS: return "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)"; case AV_FRAME_DATA_REGIONS_OF_INTEREST: return "Regions Of Interest"; case AV_FRAME_DATA_VIDEO_ENC_PARAMS: return "Video encoding parameters"; diff --git a/libavutil/frame.h b/libavutil/frame.h index 0d7ed29dfc..fbecebbd70 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -142,23 +142,6 @@ enum AVFrameSideDataType { */ AV_FRAME_DATA_ICC_PROFILE, -#if FF_API_FRAME_QP - /** - * Implementation-specific description of the format of AV_FRAME_QP_TABLE_DATA. - * The contents of this side data are undocumented and internal; use - * av_frame_set_qp_table() and av_frame_get_qp_table() to access this in a - * meaningful way instead. - */ - AV_FRAME_DATA_QP_TABLE_PROPERTIES, - - /** - * Raw QP table data. Its format is described by - * AV_FRAME_DATA_QP_TABLE_PROPERTIES. Use av_frame_set_qp_table() and - * av_frame_get_qp_table() to access this instead. - */ - AV_FRAME_DATA_QP_TABLE_DATA, -#endif - /** * Timecode which conforms to SMPTE ST 12-1. The data is an array of 4 uint32_t * where the first uint32_t describes how many (1-3) of the other timecodes are used. @@ -638,24 +621,6 @@ typedef struct AVFrame { */ int pkt_size; -#if FF_API_FRAME_QP - /** - * QP table - */ - attribute_deprecated - int8_t *qscale_table; - /** - * QP store stride - */ - attribute_deprecated - int qstride; - - attribute_deprecated - int qscale_type; - - attribute_deprecated - AVBufferRef *qp_table_buf; -#endif /** * For hwaccel-format frames, this should be a reference to the * AVHWFramesContext describing the frame. @@ -744,12 +709,6 @@ attribute_deprecated int av_frame_get_pkt_size(const AVFrame *frame); attribute_deprecated void av_frame_set_pkt_size(AVFrame *frame, int val); -#if FF_API_FRAME_QP -attribute_deprecated -int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type); -attribute_deprecated -int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int type); -#endif attribute_deprecated enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame); attribute_deprecated diff --git a/libavutil/version.h b/libavutil/version.h index 628a40d22b..2aa67060d2 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_FRAME_QP -#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_PLUS1_MINUS1 #define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 57) #endif From patchwork Mon Apr 19 14:10:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27055 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp563708iob; Mon, 19 Apr 2021 07:21:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAisqhmpfz4GHMMcW7uRcFCLl934EgXENAzcFFZuRgu4CMN0sxWtfB3ZoKOr2x20XPJ6/w X-Received: by 2002:aa7:d14a:: with SMTP id r10mr26156957edo.385.1618842063050; Mon, 19 Apr 2021 07:21:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842063; cv=none; d=google.com; s=arc-20160816; b=WZsELDZoKqVPgms2OAjA0934+7rADF7W1SAIpES+rp7xeO6A4R37xr3QKVECIRLbUd 461F+9pCrMEhp3RziV8wTaA1HyL9hif7ruGbmls0Y7+CNoiy92fByMf4VMk0sG6AGa8Q v2vs2h1HRovlT22Tl491k99ybBEh3n7da7STkJ9PkA1CkvjLO0A0Jg8g6lKNQ6no1/tZ rWDNwKbSb/QPIk+lF513gLSAxaRxazm/pKp3Svz3IBPgIk08jpVwU9cENvJu61wu5d6m kmctmFub0gXBNkUTYEXiZiYggxMcxx/02BHACjd1kI+/NhGH3ttJe68Virqsei07vIhs HiVQ== 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=LwAdql2F76VKIWVEyPHQqLDx8OQPsvRQz812oI0R0gE=; b=i7iK857dSuWPJpqq6WIVewqQn7E0YovP/PxVHCrUtrO2+97ntPEkbFTyvkS5ONzUSy DfxJIpx360xMg7QEqz+eSFILGjwogC0EPwsqgWbdu1aNC92yiVRNVTbTRMT1Ti7iSQbB 193B34MmJ4/ESTobpdkban5tDj9yErtAB/IlVoVDSoAZ8NkzOgQCTTqUe5JQV5I9yFRu SmgqxqKEOzK0brlq8mPXE4Uj5nA4b60pu0hmkdSYGgtB6S8fu5i7K45UFf7P9C5Q/5f1 MAq8xf85BWPl9c4j/OOcHKS/Zjx2CqIEk8axLF4oY+mqotYYD7/WaOlbIezQyZ1E5dBL fcqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="Fz/9EILf"; 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 b6si14195956ejb.398.2021.04.19.07.21.02; Mon, 19 Apr 2021 07:21:03 -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="Fz/9EILf"; 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 0E7B6689C2E; Mon, 19 Apr 2021 17:12:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9FB6689B43 for ; Mon, 19 Apr 2021 17:12:22 +0300 (EEST) Received: by mail-qk1-f175.google.com with SMTP id o5so35882996qkb.0 for ; Mon, 19 Apr 2021 07:12:22 -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=3ddLuRIpS5kof/U5G9+ITqzZCl1YL0rIuG9Gmfprmco=; b=Fz/9EILfJ+pc0usKj4+E80ailqHiegyUCImGa90O4/X+TTcrTYcew9cytSQuja+Gyz Ae5jbml0qy+SshLK7FFFglebaCaz/ikut/OGg3IrAUgBKTJ/h/g4ZkC7qd9+vUf7Xpzc bNz/lTfCeNMl02Rpv2NqXryi0rpynUzszNgf/4pCpoE82eVukXkhxFp90oufzJuzAi4a xytpbsRClKuYde4Dx+K0wHBiq3UVApaDZMyULjRPqm0pM0+UhMsokbAOKPM4zI0RtnIG 5uOyGHUwZD0BGaE7uXj956LlZ4aAqZUj38fJ1RDSmnKyNbuvY2LfXncLFi8K3epfVR+7 ab7Q== 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=3ddLuRIpS5kof/U5G9+ITqzZCl1YL0rIuG9Gmfprmco=; b=HAC3m5KPLOrJhOjbNIXhcfXLHg/IM8fKrRvT0bjGjxuVJF5yjUA3FhreUHhkrrRj/s XOrl0cC+G0Ybf+6OhRvG7OBqSBDvS9bFQ8yHsieoWUS+9aCAM+sTqmKnVol7vQP3KUxh A6+J3otGIpBqsw2knNbQSKNTWa/c7mM9jV9kr7k80rUKM9JOn2DtMIuXFVvWobVMHYW/ XL4YiZNn2OZIjB412G6eSLxdRk2fWi/Fr8kW3TgKnldCm5CbZdZon8SBs7VtSE1WbrkW usAEURWPfsfXg9cag3gdwyUS3V53enpmnXv77V1+u5tkqKEiInaPUfMfasq1fEcoZRUx 1U6g== X-Gm-Message-State: AOAM5334geBjoFDKjeDojgl25Y5WgfWaQnhpO2LhoiH6wu5D8F9j2FCl rLkHTxtdoa5Qj77r0pjn3ofdZKrZVo4= X-Received: by 2002:a37:a794:: with SMTP id q142mr11984517qke.216.1618841539593; Mon, 19 Apr 2021 07:12:19 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:17 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:10:01 -0300 Message-Id: <20210419141024.8174-65-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 64/87] avutil/pixdesc: Remove deprecated off-by-one fields from pix fmt descs 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: DtZqBxXLFKvA From: Andreas Rheinhardt Deprecated in 2268db2cd052674fde55c7d48b7a5098ce89b4ba. Signed-off-by: Andreas Rheinhardt --- libavutil/pixdesc.c | 1056 +++++++++++++++++++++---------------------- libavutil/pixdesc.h | 11 - libavutil/version.h | 3 - 3 files changed, 525 insertions(+), 545 deletions(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index a4ab93c975..e701005bc0 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -167,9 +167,6 @@ void av_write_image_line(const uint16_t *src, av_write_image_line2(src, data, linesize, desc, x, y, c, w, 2); } -#if FF_API_PLUS1_MINUS1 -FF_DISABLE_DEPRECATION_WARNINGS -#endif static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { [AV_PIX_FMT_YUV420P] = { .name = "yuv420p", @@ -177,9 +174,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -189,9 +186,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */ - { 0, 4, 1, 0, 8, 3, 7, 2 }, /* U */ - { 0, 4, 3, 0, 8, 3, 7, 4 }, /* V */ + { 0, 2, 0, 0, 8 }, /* Y */ + { 0, 4, 1, 0, 8 }, /* U */ + { 0, 4, 3, 0, 8 }, /* V */ }, }, [AV_PIX_FMT_YVYU422] = { @@ -200,9 +197,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */ - { 0, 4, 3, 0, 8, 3, 7, 4 }, /* U */ - { 0, 4, 1, 0, 8, 3, 7, 2 }, /* V */ + { 0, 2, 0, 0, 8 }, /* Y */ + { 0, 4, 3, 0, 8 }, /* U */ + { 0, 4, 1, 0, 8 }, /* V */ }, }, [AV_PIX_FMT_Y210LE] = { @@ -211,9 +208,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 4, 0, 6, 10, 3, 9, 1 }, /* Y */ - { 0, 8, 2, 6, 10, 7, 9, 3 }, /* U */ - { 0, 8, 6, 6, 10, 7, 9, 7 }, /* V */ + { 0, 4, 0, 6, 10 }, /* Y */ + { 0, 8, 2, 6, 10 }, /* U */ + { 0, 8, 6, 6, 10 }, /* V */ }, }, [AV_PIX_FMT_Y210BE] = { @@ -222,9 +219,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 4, 0, 6, 10, 3, 9, 1 }, /* Y */ - { 0, 8, 2, 6, 10, 7, 9, 3 }, /* U */ - { 0, 8, 6, 6, 10, 7, 9, 7 }, /* V */ + { 0, 4, 0, 6, 10 }, /* Y */ + { 0, 8, 2, 6, 10 }, /* U */ + { 0, 8, 6, 6, 10 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE, }, @@ -234,9 +231,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 3, 0, 0, 8, 2, 7, 1 }, /* R */ - { 0, 3, 1, 0, 8, 2, 7, 2 }, /* G */ - { 0, 3, 2, 0, 8, 2, 7, 3 }, /* B */ + { 0, 3, 0, 0, 8 }, /* R */ + { 0, 3, 1, 0, 8 }, /* G */ + { 0, 3, 2, 0, 8 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -246,9 +243,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 3, 2, 0, 8, 2, 7, 3 }, /* R */ - { 0, 3, 1, 0, 8, 2, 7, 2 }, /* G */ - { 0, 3, 0, 0, 8, 2, 7, 1 }, /* B */ + { 0, 3, 2, 0, 8 }, /* R */ + { 0, 3, 1, 0, 8 }, /* G */ + { 0, 3, 0, 0, 8 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -258,9 +255,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w= 0, .log2_chroma_h= 0, .comp = { - { 0, 4, 2, 4, 10, 3, 9, 2 }, /* R */ - { 0, 4, 1, 2, 10, 3, 9, 3 }, /* G */ - { 0, 4, 0, 0, 10, 3, 9, 4 }, /* B */ + { 0, 4, 2, 4, 10 }, /* R */ + { 0, 4, 1, 2, 10 }, /* G */ + { 0, 4, 0, 0, 10 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -270,9 +267,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w= 0, .log2_chroma_h= 0, .comp = { - { 0, 4, 0, 4, 10, 3, 9, 2 }, /* R */ - { 0, 4, 1, 2, 10, 3, 9, 3 }, /* G */ - { 0, 4, 2, 0, 10, 3, 9, 4 }, /* B */ + { 0, 4, 0, 4, 10 }, /* R */ + { 0, 4, 1, 2, 10 }, /* G */ + { 0, 4, 2, 0, 10 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_BE, }, @@ -282,9 +279,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -294,9 +291,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -306,9 +303,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 2, .log2_chroma_h = 2, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -318,9 +315,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 2, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -330,9 +327,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 2, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -342,7 +339,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 0, 1, 0, 0, 8 }, /* Y */ }, .flags = FF_PSEUDOPAL, .alias = "gray8,y8", @@ -353,7 +350,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 1, 0, 0, 1 }, /* Y */ + { 0, 1, 0, 0, 1 }, /* Y */ }, .flags = AV_PIX_FMT_FLAG_BITSTREAM, }, @@ -363,7 +360,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 7, 1, 0, 0, 1 }, /* Y */ + { 0, 1, 0, 7, 1 }, /* Y */ }, .flags = AV_PIX_FMT_FLAG_BITSTREAM, }, @@ -373,7 +370,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, + { 0, 1, 0, 0, 8 }, }, .flags = AV_PIX_FMT_FLAG_PAL | AV_PIX_FMT_FLAG_ALPHA, }, @@ -383,9 +380,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -395,9 +392,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -407,9 +404,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -423,9 +420,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 1, 0, 8, 1, 7, 2 }, /* Y */ - { 0, 4, 0, 0, 8, 3, 7, 1 }, /* U */ - { 0, 4, 2, 0, 8, 3, 7, 3 }, /* V */ + { 0, 2, 1, 0, 8 }, /* Y */ + { 0, 4, 0, 0, 8 }, /* U */ + { 0, 4, 2, 0, 8 }, /* V */ }, }, [AV_PIX_FMT_UYYVYY411] = { @@ -434,9 +431,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 2, .log2_chroma_h = 0, .comp = { - { 0, 4, 1, 0, 8, 3, 7, 2 }, /* Y */ - { 0, 6, 0, 0, 8, 5, 7, 1 }, /* U */ - { 0, 6, 3, 0, 8, 5, 7, 4 }, /* V */ + { 0, 4, 1, 0, 8 }, /* Y */ + { 0, 6, 0, 0, 8 }, /* U */ + { 0, 6, 3, 0, 8 }, /* V */ }, }, [AV_PIX_FMT_BGR8] = { @@ -445,9 +442,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 3, 0, 2, 1 }, /* R */ - { 0, 1, 0, 3, 3, 0, 2, 1 }, /* G */ - { 0, 1, 0, 6, 2, 0, 1, 1 }, /* B */ + { 0, 1, 0, 0, 3 }, /* R */ + { 0, 1, 0, 3, 3 }, /* G */ + { 0, 1, 0, 6, 2 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL, }, @@ -457,9 +454,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 4, 3, 0, 1, 3, 0, 4 }, /* R */ - { 0, 4, 1, 0, 2, 3, 1, 2 }, /* G */ - { 0, 4, 0, 0, 1, 3, 0, 1 }, /* B */ + { 0, 4, 3, 0, 1 }, /* R */ + { 0, 4, 1, 0, 2 }, /* G */ + { 0, 4, 0, 0, 1 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB, }, @@ -469,9 +466,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 1, 0, 0, 1 }, /* R */ - { 0, 1, 0, 1, 2, 0, 1, 1 }, /* G */ - { 0, 1, 0, 3, 1, 0, 0, 1 }, /* B */ + { 0, 1, 0, 0, 1 }, /* R */ + { 0, 1, 0, 1, 2 }, /* G */ + { 0, 1, 0, 3, 1 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL, }, @@ -481,9 +478,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 6, 2, 0, 1, 1 }, /* R */ - { 0, 1, 0, 3, 3, 0, 2, 1 }, /* G */ - { 0, 1, 0, 0, 3, 0, 2, 1 }, /* B */ + { 0, 1, 0, 6, 2 }, /* R */ + { 0, 1, 0, 3, 3 }, /* G */ + { 0, 1, 0, 0, 3 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL, }, @@ -493,9 +490,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 4, 0, 0, 1, 3, 0, 1 }, /* R */ - { 0, 4, 1, 0, 2, 3, 1, 2 }, /* G */ - { 0, 4, 3, 0, 1, 3, 0, 4 }, /* B */ + { 0, 4, 0, 0, 1 }, /* R */ + { 0, 4, 1, 0, 2 }, /* G */ + { 0, 4, 3, 0, 1 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB, }, @@ -505,9 +502,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 3, 1, 0, 0, 1 }, /* R */ - { 0, 1, 0, 1, 2, 0, 1, 1 }, /* G */ - { 0, 1, 0, 0, 1, 0, 0, 1 }, /* B */ + { 0, 1, 0, 3, 1 }, /* R */ + { 0, 1, 0, 1, 2 }, /* G */ + { 0, 1, 0, 0, 1 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL, }, @@ -517,9 +514,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */ - { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 2, 0, 0, 8 }, /* U */ + { 1, 2, 1, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -529,9 +526,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 2, 1, 0, 8, 1, 7, 2 }, /* U */ - { 1, 2, 0, 0, 8, 1, 7, 1 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 2, 1, 0, 8 }, /* U */ + { 1, 2, 0, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -541,10 +538,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 4, 1, 0, 8, 3, 7, 2 }, /* R */ - { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */ - { 0, 4, 3, 0, 8, 3, 7, 4 }, /* B */ - { 0, 4, 0, 0, 8, 3, 7, 1 }, /* A */ + { 0, 4, 1, 0, 8 }, /* R */ + { 0, 4, 2, 0, 8 }, /* G */ + { 0, 4, 3, 0, 8 }, /* B */ + { 0, 4, 0, 0, 8 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, @@ -554,10 +551,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 4, 0, 0, 8, 3, 7, 1 }, /* R */ - { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */ - { 0, 4, 2, 0, 8, 3, 7, 3 }, /* B */ - { 0, 4, 3, 0, 8, 3, 7, 4 }, /* A */ + { 0, 4, 0, 0, 8 }, /* R */ + { 0, 4, 1, 0, 8 }, /* G */ + { 0, 4, 2, 0, 8 }, /* B */ + { 0, 4, 3, 0, 8 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, @@ -567,10 +564,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 4, 3, 0, 8, 3, 7, 4 }, /* R */ - { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */ - { 0, 4, 1, 0, 8, 3, 7, 2 }, /* B */ - { 0, 4, 0, 0, 8, 3, 7, 1 }, /* A */ + { 0, 4, 3, 0, 8 }, /* R */ + { 0, 4, 2, 0, 8 }, /* G */ + { 0, 4, 1, 0, 8 }, /* B */ + { 0, 4, 0, 0, 8 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, @@ -580,10 +577,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 4, 2, 0, 8, 3, 7, 3 }, /* R */ - { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */ - { 0, 4, 0, 0, 8, 3, 7, 1 }, /* B */ - { 0, 4, 3, 0, 8, 3, 7, 4 }, /* A */ + { 0, 4, 2, 0, 8 }, /* R */ + { 0, 4, 1, 0, 8 }, /* G */ + { 0, 4, 0, 0, 8 }, /* B */ + { 0, 4, 3, 0, 8 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, @@ -593,9 +590,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w= 0, .log2_chroma_h= 0, .comp = { - { 0, 4, 1, 0, 8, 3, 7, 2 }, /* R */ - { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */ - { 0, 4, 3, 0, 8, 3, 7, 4 }, /* B */ + { 0, 4, 1, 0, 8 }, /* R */ + { 0, 4, 2, 0, 8 }, /* G */ + { 0, 4, 3, 0, 8 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -605,9 +602,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w= 0, .log2_chroma_h= 0, .comp = { - { 0, 4, 0, 0, 8, 3, 7, 1 }, /* R */ - { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */ - { 0, 4, 2, 0, 8, 3, 7, 3 }, /* B */ + { 0, 4, 0, 0, 8 }, /* R */ + { 0, 4, 1, 0, 8 }, /* G */ + { 0, 4, 2, 0, 8 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -617,9 +614,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w= 0, .log2_chroma_h= 0, .comp = { - { 0, 4, 3, 0, 8, 3, 7, 4 }, /* R */ - { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */ - { 0, 4, 1, 0, 8, 3, 7, 2 }, /* B */ + { 0, 4, 3, 0, 8 }, /* R */ + { 0, 4, 2, 0, 8 }, /* G */ + { 0, 4, 1, 0, 8 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -629,9 +626,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w= 0, .log2_chroma_h= 0, .comp = { - { 0, 4, 2, 0, 8, 3, 7, 3 }, /* R */ - { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */ - { 0, 4, 0, 0, 8, 3, 7, 1 }, /* B */ + { 0, 4, 2, 0, 8 }, /* R */ + { 0, 4, 1, 0, 8 }, /* G */ + { 0, 4, 0, 0, 8 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -641,7 +638,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 0, 2, 0, 0, 9 }, /* Y */ }, .flags = AV_PIX_FMT_FLAG_BE, .alias = "y9be", @@ -652,7 +649,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 0, 2, 0, 0, 9 }, /* Y */ }, .alias = "y9le", }, @@ -662,7 +659,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 0, 2, 0, 0, 10 }, /* Y */ }, .flags = AV_PIX_FMT_FLAG_BE, .alias = "y10be", @@ -673,7 +670,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 0, 2, 0, 0, 10 }, /* Y */ }, .alias = "y10le", }, @@ -683,7 +680,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ + { 0, 2, 0, 0, 12 }, /* Y */ }, .flags = AV_PIX_FMT_FLAG_BE, .alias = "y12be", @@ -694,7 +691,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ + { 0, 2, 0, 0, 12 }, /* Y */ }, .alias = "y12le", }, @@ -704,7 +701,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */ + { 0, 2, 0, 0, 14 }, /* Y */ }, .flags = AV_PIX_FMT_FLAG_BE, .alias = "y14be", @@ -715,7 +712,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */ + { 0, 2, 0, 0, 14 }, /* Y */ }, .alias = "y14le", }, @@ -725,7 +722,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 0, 2, 0, 0, 16 }, /* Y */ }, .flags = AV_PIX_FMT_FLAG_BE, .alias = "y16be", @@ -736,7 +733,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 0, 2, 0, 0, 16 }, /* Y */ }, .alias = "y16le", }, @@ -746,9 +743,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 1, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -758,9 +755,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 1, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -770,9 +767,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -782,9 +779,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -794,9 +791,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */ - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */ + { 0, 2, 0, 0, 12 }, /* Y */ + { 1, 2, 0, 0, 12 }, /* U */ + { 2, 2, 0, 0, 12 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -806,9 +803,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */ - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */ + { 0, 2, 0, 0, 12 }, /* Y */ + { 1, 2, 0, 0, 12 }, /* U */ + { 2, 2, 0, 0, 12 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -818,10 +815,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ - { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ + { 3, 1, 0, 0, 8 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -831,10 +828,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ - { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ + { 3, 1, 0, 0, 8 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -844,10 +841,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ - { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 1, 0, 0, 8 }, /* U */ + { 2, 1, 0, 0, 8 }, /* V */ + { 3, 1, 0, 0, 8 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -857,10 +854,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ - { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */ + { 0, 2, 0, 0, 9 }, /* Y */ + { 1, 2, 0, 0, 9 }, /* U */ + { 2, 2, 0, 0, 9 }, /* V */ + { 3, 2, 0, 0, 9 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -870,10 +867,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ - { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */ + { 0, 2, 0, 0, 9 }, /* Y */ + { 1, 2, 0, 0, 9 }, /* U */ + { 2, 2, 0, 0, 9 }, /* V */ + { 3, 2, 0, 0, 9 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -883,10 +880,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ - { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */ + { 0, 2, 0, 0, 9 }, /* Y */ + { 1, 2, 0, 0, 9 }, /* U */ + { 2, 2, 0, 0, 9 }, /* V */ + { 3, 2, 0, 0, 9 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -896,10 +893,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ - { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */ + { 0, 2, 0, 0, 9 }, /* Y */ + { 1, 2, 0, 0, 9 }, /* U */ + { 2, 2, 0, 0, 9 }, /* V */ + { 3, 2, 0, 0, 9 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -909,10 +906,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ - { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */ + { 0, 2, 0, 0, 9 }, /* Y */ + { 1, 2, 0, 0, 9 }, /* U */ + { 2, 2, 0, 0, 9 }, /* V */ + { 3, 2, 0, 0, 9 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -922,10 +919,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ - { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */ + { 0, 2, 0, 0, 9 }, /* Y */ + { 1, 2, 0, 0, 9 }, /* U */ + { 2, 2, 0, 0, 9 }, /* V */ + { 3, 2, 0, 0, 9 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -935,10 +932,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ - { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ + { 3, 2, 0, 0, 10 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -948,10 +945,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ - { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ + { 3, 2, 0, 0, 10 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -961,10 +958,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ - { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ + { 3, 2, 0, 0, 10 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -974,10 +971,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ - { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ + { 3, 2, 0, 0, 10 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -987,10 +984,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ - { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ + { 3, 2, 0, 0, 10 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -1000,10 +997,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ - { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ + { 3, 2, 0, 0, 10 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -1013,10 +1010,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ - { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 2, 0, 0, 16 }, /* U */ + { 2, 2, 0, 0, 16 }, /* V */ + { 3, 2, 0, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -1026,10 +1023,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ - { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 2, 0, 0, 16 }, /* U */ + { 2, 2, 0, 0, 16 }, /* V */ + { 3, 2, 0, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -1039,10 +1036,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ - { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 2, 0, 0, 16 }, /* U */ + { 2, 2, 0, 0, 16 }, /* V */ + { 3, 2, 0, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -1052,10 +1049,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ - { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 2, 0, 0, 16 }, /* U */ + { 2, 2, 0, 0, 16 }, /* V */ + { 3, 2, 0, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -1065,10 +1062,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ - { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 2, 0, 0, 16 }, /* U */ + { 2, 2, 0, 0, 16 }, /* V */ + { 3, 2, 0, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -1078,10 +1075,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ - { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 2, 0, 0, 16 }, /* U */ + { 2, 2, 0, 0, 16 }, /* V */ + { 3, 2, 0, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -1091,9 +1088,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 6, 0, 0, 16, 5, 15, 1 }, /* R */ - { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */ - { 0, 6, 4, 0, 16, 5, 15, 5 }, /* B */ + { 0, 6, 0, 0, 16 }, /* R */ + { 0, 6, 2, 0, 16 }, /* G */ + { 0, 6, 4, 0, 16 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_BE, }, @@ -1103,9 +1100,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 6, 0, 0, 16, 5, 15, 1 }, /* R */ - { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */ - { 0, 6, 4, 0, 16, 5, 15, 5 }, /* B */ + { 0, 6, 0, 0, 16 }, /* R */ + { 0, 6, 2, 0, 16 }, /* G */ + { 0, 6, 4, 0, 16 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -1115,10 +1112,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 8, 0, 0, 16, 7, 15, 1 }, /* R */ - { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */ - { 0, 8, 4, 0, 16, 7, 15, 5 }, /* B */ - { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */ + { 0, 8, 0, 0, 16 }, /* R */ + { 0, 8, 2, 0, 16 }, /* G */ + { 0, 8, 4, 0, 16 }, /* B */ + { 0, 8, 6, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, @@ -1128,10 +1125,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 8, 0, 0, 16, 7, 15, 1 }, /* R */ - { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */ - { 0, 8, 4, 0, 16, 7, 15, 5 }, /* B */ - { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */ + { 0, 8, 0, 0, 16 }, /* R */ + { 0, 8, 2, 0, 16 }, /* G */ + { 0, 8, 4, 0, 16 }, /* B */ + { 0, 8, 6, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, @@ -1141,9 +1138,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, -1, 3, 5, 1, 4, 0 }, /* R */ - { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */ - { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */ + { 0, 2, -1, 3, 5 }, /* R */ + { 0, 2, 0, 5, 6 }, /* G */ + { 0, 2, 0, 0, 5 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, @@ -1153,9 +1150,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 1, 3, 5, 1, 4, 2 }, /* R */ - { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */ - { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */ + { 0, 2, 1, 3, 5 }, /* R */ + { 0, 2, 0, 5, 6 }, /* G */ + { 0, 2, 0, 0, 5 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -1165,9 +1162,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, -1, 2, 5, 1, 4, 0 }, /* R */ - { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */ - { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */ + { 0, 2, -1, 2, 5 }, /* R */ + { 0, 2, 0, 5, 5 }, /* G */ + { 0, 2, 0, 0, 5 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, @@ -1177,9 +1174,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 1, 2, 5, 1, 4, 2 }, /* R */ - { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */ - { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */ + { 0, 2, 1, 2, 5 }, /* R */ + { 0, 2, 0, 5, 5 }, /* G */ + { 0, 2, 0, 0, 5 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -1189,9 +1186,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, -1, 0, 4, 1, 3, 0 }, /* R */ - { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */ - { 0, 2, 0, 0, 4, 1, 3, 1 }, /* B */ + { 0, 2, -1, 0, 4 }, /* R */ + { 0, 2, 0, 4, 4 }, /* G */ + { 0, 2, 0, 0, 4 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, @@ -1201,9 +1198,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 1, 0, 4, 1, 3, 2 }, /* R */ - { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */ - { 0, 2, 0, 0, 4, 1, 3, 1 }, /* B */ + { 0, 2, 1, 0, 4 }, /* R */ + { 0, 2, 0, 4, 4 }, /* G */ + { 0, 2, 0, 0, 4 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -1213,9 +1210,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */ - { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */ - { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */ + { 0, 6, 4, 0, 16 }, /* R */ + { 0, 6, 2, 0, 16 }, /* G */ + { 0, 6, 0, 0, 16 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, @@ -1225,9 +1222,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */ - { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */ - { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */ + { 0, 6, 4, 0, 16 }, /* R */ + { 0, 6, 2, 0, 16 }, /* G */ + { 0, 6, 0, 0, 16 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -1237,10 +1234,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 8, 4, 0, 16, 7, 15, 5 }, /* R */ - { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */ - { 0, 8, 0, 0, 16, 7, 15, 1 }, /* B */ - { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */ + { 0, 8, 4, 0, 16 }, /* R */ + { 0, 8, 2, 0, 16 }, /* G */ + { 0, 8, 0, 0, 16 }, /* B */ + { 0, 8, 6, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, @@ -1250,10 +1247,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 8, 4, 0, 16, 7, 15, 5 }, /* R */ - { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */ - { 0, 8, 0, 0, 16, 7, 15, 1 }, /* B */ - { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */ + { 0, 8, 4, 0, 16 }, /* R */ + { 0, 8, 2, 0, 16 }, /* G */ + { 0, 8, 0, 0, 16 }, /* B */ + { 0, 8, 6, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, @@ -1263,9 +1260,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */ - { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */ - { 0, 2, -1, 3, 5, 1, 4, 0 }, /* B */ + { 0, 2, 0, 0, 5 }, /* R */ + { 0, 2, 0, 5, 6 }, /* G */ + { 0, 2, -1, 3, 5 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, @@ -1275,9 +1272,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */ - { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */ - { 0, 2, 1, 3, 5, 1, 4, 2 }, /* B */ + { 0, 2, 0, 0, 5 }, /* R */ + { 0, 2, 0, 5, 6 }, /* G */ + { 0, 2, 1, 3, 5 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -1287,9 +1284,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */ - { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */ - { 0, 2, -1, 2, 5, 1, 4, 0 }, /* B */ + { 0, 2, 0, 0, 5 }, /* R */ + { 0, 2, 0, 5, 5 }, /* G */ + { 0, 2, -1, 2, 5 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, @@ -1299,9 +1296,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */ - { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */ - { 0, 2, 1, 2, 5, 1, 4, 2 }, /* B */ + { 0, 2, 0, 0, 5 }, /* R */ + { 0, 2, 0, 5, 5 }, /* G */ + { 0, 2, 1, 2, 5 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -1311,9 +1308,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 4, 1, 3, 1 }, /* R */ - { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */ - { 0, 2, -1, 0, 4, 1, 3, 0 }, /* B */ + { 0, 2, 0, 0, 4 }, /* R */ + { 0, 2, 0, 4, 4 }, /* G */ + { 0, 2, -1, 0, 4 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, @@ -1323,9 +1320,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 4, 1, 3, 1 }, /* R */ - { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */ - { 0, 2, 1, 0, 4, 1, 3, 2 }, /* B */ + { 0, 2, 0, 0, 4 }, /* R */ + { 0, 2, 0, 4, 4 }, /* G */ + { 0, 2, 1, 0, 4 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_RGB, }, @@ -1341,9 +1338,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ + { 0, 2, 0, 0, 9 }, /* Y */ + { 1, 2, 0, 0, 9 }, /* U */ + { 2, 2, 0, 0, 9 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1353,9 +1350,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ + { 0, 2, 0, 0, 9 }, /* Y */ + { 1, 2, 0, 0, 9 }, /* U */ + { 2, 2, 0, 0, 9 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1365,9 +1362,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1377,9 +1374,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1389,9 +1386,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */ - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */ + { 0, 2, 0, 0, 12 }, /* Y */ + { 1, 2, 0, 0, 12 }, /* U */ + { 2, 2, 0, 0, 12 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1401,9 +1398,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */ - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */ + { 0, 2, 0, 0, 12 }, /* Y */ + { 1, 2, 0, 0, 12 }, /* U */ + { 2, 2, 0, 0, 12 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1413,9 +1410,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */ - { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */ - { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */ + { 0, 2, 0, 0, 14 }, /* Y */ + { 1, 2, 0, 0, 14 }, /* U */ + { 2, 2, 0, 0, 14 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1425,9 +1422,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */ - { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */ - { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */ + { 0, 2, 0, 0, 14 }, /* Y */ + { 1, 2, 0, 0, 14 }, /* U */ + { 2, 2, 0, 0, 14 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1437,9 +1434,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 2, 0, 0, 16 }, /* U */ + { 2, 2, 0, 0, 16 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1449,9 +1446,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 2, 0, 0, 16 }, /* U */ + { 2, 2, 0, 0, 16 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1461,9 +1458,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ + { 0, 2, 0, 0, 9 }, /* Y */ + { 1, 2, 0, 0, 9 }, /* U */ + { 2, 2, 0, 0, 9 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1473,9 +1470,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ + { 0, 2, 0, 0, 9 }, /* Y */ + { 1, 2, 0, 0, 9 }, /* U */ + { 2, 2, 0, 0, 9 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1485,9 +1482,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1497,9 +1494,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1509,9 +1506,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */ - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */ + { 0, 2, 0, 0, 12 }, /* Y */ + { 1, 2, 0, 0, 12 }, /* U */ + { 2, 2, 0, 0, 12 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1521,9 +1518,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */ - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */ + { 0, 2, 0, 0, 12 }, /* Y */ + { 1, 2, 0, 0, 12 }, /* U */ + { 2, 2, 0, 0, 12 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1533,9 +1530,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */ - { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */ - { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */ + { 0, 2, 0, 0, 14 }, /* Y */ + { 1, 2, 0, 0, 14 }, /* U */ + { 2, 2, 0, 0, 14 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1545,9 +1542,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */ - { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */ - { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */ + { 0, 2, 0, 0, 14 }, /* Y */ + { 1, 2, 0, 0, 14 }, /* U */ + { 2, 2, 0, 0, 14 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1557,9 +1554,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 2, 0, 0, 16 }, /* U */ + { 2, 2, 0, 0, 16 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1569,9 +1566,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 2, 0, 0, 16 }, /* U */ + { 2, 2, 0, 0, 16 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1581,9 +1578,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 2, 0, 0, 16 }, /* U */ + { 2, 2, 0, 0, 16 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1593,9 +1590,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 2, 0, 0, 16 }, /* U */ + { 2, 2, 0, 0, 16 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1605,9 +1602,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1617,9 +1614,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 2, 0, 0, 10 }, /* U */ + { 2, 2, 0, 0, 10 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1629,9 +1626,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ + { 0, 2, 0, 0, 9 }, /* Y */ + { 1, 2, 0, 0, 9 }, /* U */ + { 2, 2, 0, 0, 9 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1641,9 +1638,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ + { 0, 2, 0, 0, 9 }, /* Y */ + { 1, 2, 0, 0, 9 }, /* U */ + { 2, 2, 0, 0, 9 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1653,9 +1650,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */ - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */ + { 0, 2, 0, 0, 12 }, /* Y */ + { 1, 2, 0, 0, 12 }, /* U */ + { 2, 2, 0, 0, 12 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1665,9 +1662,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */ - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */ + { 0, 2, 0, 0, 12 }, /* Y */ + { 1, 2, 0, 0, 12 }, /* U */ + { 2, 2, 0, 0, 12 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1677,9 +1674,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */ - { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */ - { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */ + { 0, 2, 0, 0, 14 }, /* Y */ + { 1, 2, 0, 0, 14 }, /* U */ + { 2, 2, 0, 0, 14 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -1689,9 +1686,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */ - { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */ - { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */ + { 0, 2, 0, 0, 14 }, /* Y */ + { 1, 2, 0, 0, 14 }, /* U */ + { 2, 2, 0, 0, 14 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, @@ -1711,8 +1708,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .name = "ya8", .nb_components = 2, .comp = { - { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */ - { 0, 2, 1, 0, 8, 1, 7, 2 }, /* A */ + { 0, 2, 0, 0, 8 }, /* Y */ + { 0, 2, 1, 0, 8 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_ALPHA, .alias = "gray8a", @@ -1721,8 +1718,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .name = "ya16le", .nb_components = 2, .comp = { - { 0, 4, 0, 0, 16, 3, 15, 1 }, /* Y */ - { 0, 4, 2, 0, 16, 3, 15, 3 }, /* A */ + { 0, 4, 0, 0, 16 }, /* Y */ + { 0, 4, 2, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_ALPHA, }, @@ -1730,8 +1727,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .name = "ya16be", .nb_components = 2, .comp = { - { 0, 4, 0, 0, 16, 3, 15, 1 }, /* Y */ - { 0, 4, 2, 0, 16, 3, 15, 3 }, /* A */ + { 0, 4, 0, 0, 16 }, /* Y */ + { 0, 4, 2, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_ALPHA, }, @@ -1745,9 +1742,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* R */ - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* G */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* B */ + { 2, 1, 0, 0, 8 }, /* R */ + { 0, 1, 0, 0, 8 }, /* G */ + { 1, 1, 0, 0, 8 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, @@ -1757,9 +1754,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* R */ - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* G */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* B */ + { 2, 2, 0, 0, 9 }, /* R */ + { 0, 2, 0, 0, 9 }, /* G */ + { 1, 2, 0, 0, 9 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, @@ -1769,9 +1766,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 9, 1, 8, 1 }, /* R */ - { 0, 2, 0, 0, 9, 1, 8, 1 }, /* G */ - { 1, 2, 0, 0, 9, 1, 8, 1 }, /* B */ + { 2, 2, 0, 0, 9 }, /* R */ + { 0, 2, 0, 0, 9 }, /* G */ + { 1, 2, 0, 0, 9 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, @@ -1781,9 +1778,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */ - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */ + { 2, 2, 0, 0, 10 }, /* R */ + { 0, 2, 0, 0, 10 }, /* G */ + { 1, 2, 0, 0, 10 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, @@ -1793,9 +1790,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */ - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */ + { 2, 2, 0, 0, 10 }, /* R */ + { 0, 2, 0, 0, 10 }, /* G */ + { 1, 2, 0, 0, 10 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, @@ -1805,9 +1802,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */ - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */ + { 2, 2, 0, 0, 12 }, /* R */ + { 0, 2, 0, 0, 12 }, /* G */ + { 1, 2, 0, 0, 12 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, @@ -1817,9 +1814,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */ - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */ + { 2, 2, 0, 0, 12 }, /* R */ + { 0, 2, 0, 0, 12 }, /* G */ + { 1, 2, 0, 0, 12 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, @@ -1829,9 +1826,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 14, 1, 13, 1 }, /* R */ - { 0, 2, 0, 0, 14, 1, 13, 1 }, /* G */ - { 1, 2, 0, 0, 14, 1, 13, 1 }, /* B */ + { 2, 2, 0, 0, 14 }, /* R */ + { 0, 2, 0, 0, 14 }, /* G */ + { 1, 2, 0, 0, 14 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, @@ -1841,9 +1838,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 14, 1, 13, 1 }, /* R */ - { 0, 2, 0, 0, 14, 1, 13, 1 }, /* G */ - { 1, 2, 0, 0, 14, 1, 13, 1 }, /* B */ + { 2, 2, 0, 0, 14 }, /* R */ + { 0, 2, 0, 0, 14 }, /* G */ + { 1, 2, 0, 0, 14 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, @@ -1853,9 +1850,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */ - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */ + { 2, 2, 0, 0, 16 }, /* R */ + { 0, 2, 0, 0, 16 }, /* G */ + { 1, 2, 0, 0, 16 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, @@ -1865,9 +1862,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */ - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */ + { 2, 2, 0, 0, 16 }, /* R */ + { 0, 2, 0, 0, 16 }, /* G */ + { 1, 2, 0, 0, 16 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, @@ -1877,10 +1874,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 1, 0, 0, 8, 0, 7, 1 }, /* R */ - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* G */ - { 1, 1, 0, 0, 8, 0, 7, 1 }, /* B */ - { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */ + { 2, 1, 0, 0, 8 }, /* R */ + { 0, 1, 0, 0, 8 }, /* G */ + { 1, 1, 0, 0, 8 }, /* B */ + { 3, 1, 0, 0, 8 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, @@ -1891,10 +1888,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */ - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */ - { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ + { 2, 2, 0, 0, 16 }, /* R */ + { 0, 2, 0, 0, 16 }, /* G */ + { 1, 2, 0, 0, 16 }, /* B */ + { 3, 2, 0, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, @@ -1905,10 +1902,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */ - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */ - { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */ - { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ + { 2, 2, 0, 0, 16 }, /* R */ + { 0, 2, 0, 0, 16 }, /* G */ + { 1, 2, 0, 0, 16 }, /* B */ + { 3, 2, 0, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, @@ -1925,9 +1922,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 6, 0, 4, 12, 5, 11, 1 }, /* X */ - { 0, 6, 2, 4, 12, 5, 11, 3 }, /* Y */ - { 0, 6, 4, 4, 12, 5, 11, 5 }, /* Z */ + { 0, 6, 0, 4, 12 }, /* X */ + { 0, 6, 2, 4, 12 }, /* Y */ + { 0, 6, 4, 4, 12 }, /* Z */ }, /*.flags = -- not used*/ }, @@ -1937,9 +1934,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 6, 0, 4, 12, 5, 11, 1 }, /* X */ - { 0, 6, 2, 4, 12, 5, 11, 3 }, /* Y */ - { 0, 6, 4, 4, 12, 5, 11, 5 }, /* Z */ + { 0, 6, 0, 4, 12 }, /* X */ + { 0, 6, 2, 4, 12 }, /* Y */ + { 0, 6, 4, 4, 12 }, /* Z */ }, .flags = AV_PIX_FMT_FLAG_BE, }, @@ -1949,9 +1946,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w= 0, \ .log2_chroma_h= 0, \ .comp = { \ - {0,1,0,0,2,0,1,1},\ - {0,1,0,0,4,0,3,1},\ - {0,1,0,0,2,0,1,1},\ + { 0, 1, 0, 0, 2 }, \ + { 0, 1, 0, 0, 4 }, \ + { 0, 1, 0, 0, 2 }, \ }, \ #define BAYER16_DESC_COMMON \ @@ -1959,9 +1956,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w= 0, \ .log2_chroma_h= 0, \ .comp = { \ - {0,2,0,0,4,1,3,1},\ - {0,2,0,0,8,1,7,1},\ - {0,2,0,0,4,1,3,1},\ + { 0, 2, 0, 0, 4 }, \ + { 0, 2, 0, 0, 8 }, \ + { 0, 2, 0, 0, 4 }, \ }, \ [AV_PIX_FMT_BAYER_BGGR8] = { @@ -2030,9 +2027,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */ - { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 2, 0, 0, 8 }, /* U */ + { 1, 2, 1, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -2042,9 +2039,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 4, 0, 0, 10, 3, 9, 1 }, /* U */ - { 1, 4, 2, 0, 10, 3, 9, 3 }, /* V */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 4, 0, 0, 10 }, /* U */ + { 1, 4, 2, 0, 10 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -2054,9 +2051,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ - { 1, 4, 0, 0, 10, 3, 9, 1 }, /* U */ - { 1, 4, 2, 0, 10, 3, 9, 3 }, /* V */ + { 0, 2, 0, 0, 10 }, /* Y */ + { 1, 4, 0, 0, 10 }, /* U */ + { 1, 4, 2, 0, 10 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE, }, @@ -2082,10 +2079,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 8, 2, 0, 16, 7, 15, 3 }, /* Y */ - { 0, 8, 4, 0, 16, 7, 15, 5 }, /* U */ - { 0, 8, 6, 0, 16, 7, 15, 7 }, /* V */ - { 0, 8, 0, 0, 16, 7, 15, 1 }, /* A */ + { 0, 8, 2, 0, 16 }, /* Y */ + { 0, 8, 4, 0, 16 }, /* U */ + { 0, 8, 6, 0, 16 }, /* V */ + { 0, 8, 0, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_ALPHA, }, @@ -2095,10 +2092,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 8, 2, 0, 16, 7, 15, 3 }, /* Y */ - { 0, 8, 4, 0, 16, 7, 15, 5 }, /* U */ - { 0, 8, 6, 0, 16, 7, 15, 7 }, /* V */ - { 0, 8, 0, 0, 16, 7, 15, 1 }, /* A */ + { 0, 8, 2, 0, 16 }, /* Y */ + { 0, 8, 4, 0, 16 }, /* U */ + { 0, 8, 6, 0, 16 }, /* V */ + { 0, 8, 0, 0, 16 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_ALPHA, }, @@ -2108,9 +2105,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 6, 10, 1, 9, 1 }, /* Y */ - { 1, 4, 0, 6, 10, 3, 9, 1 }, /* U */ - { 1, 4, 2, 6, 10, 3, 9, 3 }, /* V */ + { 0, 2, 0, 6, 10 }, /* Y */ + { 1, 4, 0, 6, 10 }, /* U */ + { 1, 4, 2, 6, 10 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -2120,9 +2117,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 6, 10, 1, 9, 1 }, /* Y */ - { 1, 4, 0, 6, 10, 3, 9, 1 }, /* U */ - { 1, 4, 2, 6, 10, 3, 9, 3 }, /* V */ + { 0, 2, 0, 6, 10 }, /* Y */ + { 1, 4, 0, 6, 10 }, /* U */ + { 1, 4, 2, 6, 10 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE, }, @@ -2132,9 +2129,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 4, 0, 0, 16, 3, 15, 1 }, /* U */ - { 1, 4, 2, 0, 16, 3, 15, 3 }, /* V */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 4, 0, 0, 16 }, /* U */ + { 1, 4, 2, 0, 16 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -2144,9 +2141,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ - { 1, 4, 0, 0, 16, 3, 15, 1 }, /* U */ - { 1, 4, 2, 0, 16, 3, 15, 3 }, /* V */ + { 0, 2, 0, 0, 16 }, /* Y */ + { 1, 4, 0, 0, 16 }, /* U */ + { 1, 4, 2, 0, 16 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE, }, @@ -2156,10 +2153,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */ - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */ - { 3, 2, 0, 0, 12, 1, 11, 1 }, /* A */ + { 2, 2, 0, 0, 12 }, /* R */ + { 0, 2, 0, 0, 12 }, /* G */ + { 1, 2, 0, 0, 12 }, /* B */ + { 3, 2, 0, 0, 12 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, @@ -2170,10 +2167,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */ - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */ - { 3, 2, 0, 0, 12, 1, 11, 1 }, /* A */ + { 2, 2, 0, 0, 12 }, /* R */ + { 0, 2, 0, 0, 12 }, /* G */ + { 1, 2, 0, 0, 12 }, /* B */ + { 3, 2, 0, 0, 12 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, @@ -2184,10 +2181,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */ - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */ - { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ + { 2, 2, 0, 0, 10 }, /* R */ + { 0, 2, 0, 0, 10 }, /* G */ + { 1, 2, 0, 0, 10 }, /* B */ + { 3, 2, 0, 0, 10 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, @@ -2198,10 +2195,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */ - { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */ - { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */ - { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ + { 2, 2, 0, 0, 10 }, /* R */ + { 0, 2, 0, 0, 10 }, /* G */ + { 1, 2, 0, 0, 10 }, /* B */ + { 3, 2, 0, 0, 10 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, @@ -2216,9 +2213,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 4, 0, 0, 32, 3, 31, 1 }, /* R */ - { 0, 4, 0, 0, 32, 3, 31, 1 }, /* G */ - { 1, 4, 0, 0, 32, 3, 31, 1 }, /* B */ + { 2, 4, 0, 0, 32 }, /* R */ + { 0, 4, 0, 0, 32 }, /* G */ + { 1, 4, 0, 0, 32 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_FLOAT, @@ -2229,9 +2226,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 4, 0, 0, 32, 3, 31, 1 }, /* R */ - { 0, 4, 0, 0, 32, 3, 31, 1 }, /* G */ - { 1, 4, 0, 0, 32, 3, 31, 1 }, /* B */ + { 2, 4, 0, 0, 32 }, /* R */ + { 0, 4, 0, 0, 32 }, /* G */ + { 1, 4, 0, 0, 32 }, /* B */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_FLOAT | AV_PIX_FMT_FLAG_RGB, }, @@ -2241,10 +2238,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 4, 0, 0, 32, 3, 31, 1 }, /* R */ - { 0, 4, 0, 0, 32, 3, 31, 1 }, /* G */ - { 1, 4, 0, 0, 32, 3, 31, 1 }, /* B */ - { 3, 4, 0, 0, 32, 3, 31, 1 }, /* A */ + { 2, 4, 0, 0, 32 }, /* R */ + { 0, 4, 0, 0, 32 }, /* G */ + { 1, 4, 0, 0, 32 }, /* B */ + { 3, 4, 0, 0, 32 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA | AV_PIX_FMT_FLAG_RGB | @@ -2256,10 +2253,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 2, 4, 0, 0, 32, 3, 31, 1 }, /* R */ - { 0, 4, 0, 0, 32, 3, 31, 1 }, /* G */ - { 1, 4, 0, 0, 32, 3, 31, 1 }, /* B */ - { 3, 4, 0, 0, 32, 3, 31, 1 }, /* A */ + { 2, 4, 0, 0, 32 }, /* R */ + { 0, 4, 0, 0, 32 }, /* G */ + { 1, 4, 0, 0, 32 }, /* B */ + { 3, 4, 0, 0, 32 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_FLOAT, @@ -2278,7 +2275,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 4, 0, 0, 32, 3, 31, 1 }, /* Y */ + { 0, 4, 0, 0, 32 }, /* Y */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_FLOAT, .alias = "yf32be", @@ -2289,7 +2286,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 4, 0, 0, 32, 3, 31, 1 }, /* Y */ + { 0, 4, 0, 0, 32 }, /* Y */ }, .flags = AV_PIX_FMT_FLAG_FLOAT, .alias = "yf32le", @@ -2300,10 +2297,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */ - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */ - { 3, 2, 0, 0, 12, 1, 11, 1 }, /* A */ + { 0, 2, 0, 0, 12 }, /* Y */ + { 1, 2, 0, 0, 12 }, /* U */ + { 2, 2, 0, 0, 12 }, /* V */ + { 3, 2, 0, 0, 12 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -2313,10 +2310,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */ - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */ - { 3, 2, 0, 0, 12, 1, 11, 1 }, /* A */ + { 0, 2, 0, 0, 12 }, /* Y */ + { 1, 2, 0, 0, 12 }, /* U */ + { 2, 2, 0, 0, 12 }, /* V */ + { 3, 2, 0, 0, 12 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -2326,10 +2323,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */ - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */ - { 3, 2, 0, 0, 12, 1, 11, 1 }, /* A */ + { 0, 2, 0, 0, 12 }, /* Y */ + { 1, 2, 0, 0, 12 }, /* U */ + { 2, 2, 0, 0, 12 }, /* V */ + { 3, 2, 0, 0, 12 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -2339,10 +2336,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */ - { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */ - { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */ - { 3, 2, 0, 0, 12, 1, 11, 1 }, /* A */ + { 0, 2, 0, 0, 12 }, /* Y */ + { 1, 2, 0, 0, 12 }, /* U */ + { 2, 2, 0, 0, 12 }, /* V */ + { 3, 2, 0, 0, 12 }, /* A */ }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, @@ -2352,9 +2349,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */ - { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 2, 0, 0, 8 }, /* U */ + { 1, 2, 1, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -2364,9 +2361,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ - { 1, 2, 1, 0, 8, 1, 7, 2 }, /* U */ - { 1, 2, 0, 0, 8, 1, 7, 1 }, /* V */ + { 0, 1, 0, 0, 8 }, /* Y */ + { 1, 2, 1, 0, 8 }, /* U */ + { 1, 2, 0, 0, 8 }, /* V */ }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, @@ -2375,9 +2372,6 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .flags = AV_PIX_FMT_FLAG_HWACCEL, }, }; -#if FF_API_PLUS1_MINUS1 -FF_ENABLE_DEPRECATION_WARNINGS -#endif static const char * const color_range_names[] = { [AVCOL_RANGE_UNSPECIFIED] = "unknown", diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index 9b9d386ae9..81b51b767f 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -56,17 +56,6 @@ typedef struct AVComponentDescriptor { * Number of bits in the component. */ int depth; - -#if FF_API_PLUS1_MINUS1 - /** deprecated, use step instead */ - attribute_deprecated int step_minus1; - - /** deprecated, use depth instead */ - attribute_deprecated int depth_minus1; - - /** deprecated, use offset instead */ - attribute_deprecated int offset_plus1; -#endif } AVComponentDescriptor; /** diff --git a/libavutil/version.h b/libavutil/version.h index 2aa67060d2..2eb3d3c756 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_PLUS1_MINUS1 -#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_ERROR_FRAME #define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57) #endif From patchwork Mon Apr 19 14:10:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27062 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp563449iob; Mon, 19 Apr 2021 07:20:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMpIpaz+ijGTSlv1QE/zs0h4f0qOIxmczIpjDTifDOdWnA64z7lE7OjyXLaJjIDcpCVn8m X-Received: by 2002:a17:906:f42:: with SMTP id h2mr22896917ejj.317.1618842048518; Mon, 19 Apr 2021 07:20:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842048; cv=none; d=google.com; s=arc-20160816; b=Jj3nvZQpvVU6/BGbimw4wkN4HwxNIlnpwLxnbw4Yf1rt8qALUh98Blmcv9EGPOl+L9 AK+ZCxkdlUfXwl3AP1Ye+H2DzhynpDsHUYgs44y9DA11JnAQ4c2yGfNmazbSHsVujOE+ ZDzr29smOxX4U6BRZN/KnO0Pn+ErJ7g7U8Z9n2Fk5B4bx4Tqm9YzI/r9vcp/CK+kWpkc 3sfvp6IQQ0fMbtnOwUwN9/kNMO+Z/beoBH5D9tTMr5vZxsruaWowqfqGT0+ndYIA40Js JchuA5idWs7tNDwvHMd6vVIrGOX9gObn8cBYyJuz8ycUgkW2IvBEtR4EA33AZzf8r3cE KCOw== 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=bWUgjp3awO/JReDbjzeKugFwe1zoQqzYmmOdQThTl1g=; b=wkSsmpyY/U2c2lbV3Z6/plE6FZbbEN/VY4R/DfSAcO+w1uSUx8/3vjC4cjL3Sy63T8 /jujAAk27EtNXP83rTOCFwPzd02OvB38I2KWk2zDm7s3gRDz/aL8rp7Otvtvda38BgCG +QlO5UYUR4muwWY5YSiWQjMmQyAZAoV0qJI43RJ32a6weyT3AOkzUmn0tGIPKTC1uVdM OGTE5QvrGL1mbCaCku0NLBne2E2JWjz0tZD4vxTWL4yaUmPmGEoigIxo4Yz5oW3svxAn ryHEvaLIT3pGBOyYxqUYoSOjzXSIW0Z3xkr+d3OLTk9ebpglQUEjDlR9v3M/PDYlzw+t fffA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="t//NW4uG"; 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 y25si9439391ejb.256.2021.04.19.07.20.48; Mon, 19 Apr 2021 07:20:48 -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="t//NW4uG"; 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 1DEE2689BD5; Mon, 19 Apr 2021 17:12:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F98E689AFD for ; Mon, 19 Apr 2021 17:12:22 +0300 (EEST) Received: by mail-qk1-f176.google.com with SMTP id t17so7382660qkg.4 for ; Mon, 19 Apr 2021 07:12:21 -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=dggSBS0HyjE6URkknUZU2/n8BRTT+UEAtdnWQrFmL5Y=; b=t//NW4uGggCNGOJF2hi22CLiAeomzkXpGbo7NRSBkCsO/VeQqAZ5X+tZa25fygx7oS wgq3G/0R/ok1LoYke6mIaqn/NOZy6O8MBa1WucAxJudZsIhTD9k3Wu+di9MVN94sRUtP gBuxY5VM2jfWWRYISOBKp3MRCbML6zVTaxYAb1xLI4J20JRKsIuVvANbEBAJdpn7JB7j POlAMOotr1lbrG2YdRoMN8SU7zCh1C2s3RclgqLgqfbTyXohBbR5/cP08WK9B2CuinbF aDY0nprFqvULQYjuszTsBViatwf7GsxJ9LnD16t+6p0y8+kN+W4D9vhKnITvI3KmjISq XV3g== 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=dggSBS0HyjE6URkknUZU2/n8BRTT+UEAtdnWQrFmL5Y=; b=fwi1SHtNr0jQlFWs2DUthPTcCXpsyAZ7Vfq2a20Arn6xbv+UkBPPyEQc5yBxjH3J4X qrC0ZhCUuz8KYtZSTVqyRD9gIqvMNAgqxY64fxqKRStNFygzfPoICnPxlya5pvBsKHfQ tDAV/6CsFu5sy+LDWZeJiPpJ88EEs8oY8sVs3rjGbvz93xS4KfxsoC1FduT5obAKq79p 0W6zPQb232YT2gfs21SM6Ww6AmAEI0Oc4ESjaHJJQILoths4KmNTez2IkL2qV1iQqhuR 0PJSRExqzi6IKRk4RjRJgiBEci6m7hRb8Adv/p52iDUC7N2IG5vU605SPSYNKp51mEc+ DcnQ== X-Gm-Message-State: AOAM531BaDSFb/aWdymQHH7Xhx1HxqZoHeTNnN35+vpc2Zdgdo2QGntZ erIkRW8+RT3ZnZOn2T6C6NWNtXy9MvQ= X-Received: by 2002:a37:a98e:: with SMTP id s136mr3484054qke.16.1618841540694; Mon, 19 Apr 2021 07:12:20 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:20 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:10:02 -0300 Message-Id: <20210419141024.8174-66-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 65/87] avutil/frame: Remove deprecated AVFrame.error 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: pBtWcm9Q3uxZ From: Andreas Rheinhardt Deprecated in 1aa24df74c052a73175c43e57d35b4835e537ec8. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 7 ------- libavcodec/snowenc.c | 6 ------ libavfilter/vf_swapuv.c | 6 ------ libavutil/frame.c | 6 ------ libavutil/frame.h | 8 -------- libavutil/version.h | 3 --- 6 files changed, 36 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 0aa94dc7d8..f50f6cdeff 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1604,13 +1604,6 @@ static void frame_end(MpegEncContext *s) s->last_lambda_for [s->pict_type] = s->current_picture_ptr->f->quality; if (s->pict_type!= AV_PICTURE_TYPE_B) s->last_non_b_pict_type = s->pict_type; - -#if FF_API_ERROR_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - memcpy(s->current_picture.f->error, s->current_picture.encoding_error, - sizeof(s->current_picture.encoding_error)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif } static void update_noise_reduction(MpegEncContext *s) diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 255968341a..e694d51a67 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1865,12 +1865,6 @@ redo_frame: (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? 4 : 0, s->current_picture->pict_type); -#if FF_API_ERROR_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - memcpy(s->current_picture->error, s->encoding_error, sizeof(s->encoding_error)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - pkt->size = ff_rac_terminate(c, 0); if (s->current_picture->key_frame) pkt->flags |= AV_PKT_FLAG_KEY; diff --git a/libavfilter/vf_swapuv.c b/libavfilter/vf_swapuv.c index 8d62c48c4f..720e699c4a 100644 --- a/libavfilter/vf_swapuv.c +++ b/libavfilter/vf_swapuv.c @@ -46,12 +46,6 @@ static void do_swap(AVFrame *frame) FFSWAP(uint8_t*, frame->data[1], frame->data[2]); FFSWAP(int, frame->linesize[1], frame->linesize[2]); FFSWAP(AVBufferRef*, frame->buf[1], frame->buf[2]); - -#if FF_API_ERROR_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - FFSWAP(uint64_t, frame->error[1], frame->error[2]); -FF_ENABLE_DEPRECATION_WARNINGS -#endif } static AVFrame *get_video_buffer(AVFilterLink *link, int w, int h) diff --git a/libavutil/frame.c b/libavutil/frame.c index df826fbfb7..d69dd38dc4 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -316,12 +316,6 @@ FF_ENABLE_DEPRECATION_WARNINGS av_dict_copy(&dst->metadata, src->metadata, 0); -#if FF_API_ERROR_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - memcpy(dst->error, src->error, sizeof(dst->error)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - for (i = 0; i < src->nb_side_data; i++) { const AVFrameSideData *sd_src = src->side_data[i]; AVFrameSideData *sd_dst; diff --git a/libavutil/frame.h b/libavutil/frame.h index fbecebbd70..23396189d9 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -434,14 +434,6 @@ typedef struct AVFrame { */ void *opaque; -#if FF_API_ERROR_FRAME - /** - * @deprecated unused - */ - attribute_deprecated - uint64_t error[AV_NUM_DATA_POINTERS]; -#endif - /** * When decoding, this signals how much the picture must be delayed. * extra_delay = repeat_pict / (2*fps) diff --git a/libavutil/version.h b/libavutil/version.h index 2eb3d3c756..a72788d8e4 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_ERROR_FRAME -#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_PKT_PTS #define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57) #endif From patchwork Mon Apr 19 14:10: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: 27065 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp563938iob; Mon, 19 Apr 2021 07:21:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIygdLuuHHCH2UCkvzfPvDvBuY6q1fk2FyeF6OhDCEmjZ9uSkUCIDZtFipnuqYapWsw1H/ X-Received: by 2002:a17:906:6544:: with SMTP id u4mr3855138ejn.455.1618842079012; Mon, 19 Apr 2021 07:21:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842079; cv=none; d=google.com; s=arc-20160816; b=iGofV1AMakbUOddtdBsQzcWji4fHWdJXQdw0ZJZEwGwsjnetXWaI2M87qmasyau2vj XQh9+VEM0YlJGP6gD6CCiQjzazMSEPHIg3iK6D9oZ36WRze1a4eFyKa9PYA6USQWH8pA kZ0LLhWy0ajVJgQkHE0y3E15m+X411HTzYA3j8wkP1XVxTJlP+lcE4iNW9l074mulszJ HY/wxrLsHG65CDoi/42EAsBk4L1UZ9nPo3ePJC/HPAH/hqbVLJM1uLLHc6W08dpyy5CW tgEO5kuaXFGuCuxPmPnaFdGrDLq2DeuC239/tXP51brqhfoLBQGBM1CW1fEfZFUCnPhr 6jiw== 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=QoGVT6iGLPRA/xOVCxHLNZ5RkHtEOzBwL2+En9OKuxc=; b=DSFwvyFO/hUAtftxr7KyZbWVOd9v3QoCsG3ljlKBlCB9Ed6RmV2jP6Pqb+5wW5I2FF OGRxALIf+Sr6zIEuPRI68IxZm1vM7cyJfw/r1IfB8Pi7KGYNYFI+uw93ZJTh9JJq9a0N VS/KPvjTN6yeYMRrm6naC2cDWTqewmgbNkNrc7hifqi4+h72qYYFlJzgNkisJYGpYXcU tdXBB/qbOMg7nFoYPZw8g8zNtpnnqc0I3n1yMSwqlPlHjKQ6x9OIl7kjYLXdSoDx54iV uW8BDiueWkFvOeOTz47DZJYEP5xxFI23zwEY/mWbGjSFDJ70lvZ44MmaRRfeWPHSIrKg za6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mD4bkmBV; 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 kq15si12404434ejb.556.2021.04.19.07.21.18; Mon, 19 Apr 2021 07:21:19 -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=mD4bkmBV; 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 0BDCA689C28; Mon, 19 Apr 2021 17:12:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A05D689AF5 for ; Mon, 19 Apr 2021 17:12:23 +0300 (EEST) Received: by mail-qk1-f175.google.com with SMTP id 8so2103905qkv.8 for ; Mon, 19 Apr 2021 07:12:23 -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=jildpsJWtFW523L3zU4UAXEbNtzMNJBjSdlkvDgeufA=; b=mD4bkmBVtvncR3c58Dx8nyMBeKsdhf+/vC37jERJ688MxGnlzSYgZscULKMODOttdj 9S0qeyLP4kICiDaRp0OsCqC0X8mJm16BNzJ8FzknP1oWlw7adheRFBpeQ0htG6YC1A1c wfr7gouihIYSt9wmp+SqGgcH8f9Y0hFUulgfN9cqiwywPHkLw1XfHYWFP8NoDOkHxqry BYdBqzmrKDgnt7TzHHIQ3dbOF0FbUQlKGLAqdSjIHIzyNNpblYU4qXAQQhPowdLqPTta 3ywEP+NwpMoHh7ipBfelaIGHBPERfESYFi5GOYb9kuxQfK6SM2ti9o+1yq+HsOt7pPFD jj/Q== 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=jildpsJWtFW523L3zU4UAXEbNtzMNJBjSdlkvDgeufA=; b=ghyxs8koT/NMp9mmEiHSio0AuVbgcZWSyqyVCKxnigJj84zJMa4ba/BKLF5Yc1Y0Lr 9Q1il0LGRfcz9cwumWDm/U4x3JTtBe13s7jaMM8osfiOzKprqRuehGJ+NSinSNUXxLnI a49mk58+XdLFwyw0kw3zhse3xbYfLpevg8GPXQvpaDsI2b5MrodpPaohUlATcp8ww4C+ DZRbFNujjPtm51dt3XCHjiemj13/WR1EGUNOvhH+NO2t0+gPDb+pGzBjTioYo7/IhlS8 03saRgfQxcw6E6EpDAjIRe4+vw3q4TCmicQF4jmpP8R7aP23D4/NucSi450HuYcZ15ma IlWQ== X-Gm-Message-State: AOAM531VzEANx5PULP7wUoupO/tXpQNSXeCQPhCt3FYnYdde7Vs7Kzea VMhOox8if6uDCwrboLFjWlhsqpNZnpA= X-Received: by 2002:a37:e412:: with SMTP id y18mr6055817qkf.40.1618841541944; Mon, 19 Apr 2021 07:12:21 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:10:03 -0300 Message-Id: <20210419141024.8174-67-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 66/87] avutil/frame: Remove deprecated AVFrame.pkt_pts field 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: dIF7223qyWbl From: Andreas Rheinhardt Deprecated in 32c8359093d1ff4f45ed19518b449b3ac3769d27. Signed-off-by: Andreas Rheinhardt --- libavcodec/audiotoolboxdec.c | 5 ----- libavcodec/crystalhd.c | 5 ----- libavcodec/cuviddec.c | 5 ----- libavcodec/decode.c | 11 ----------- libavcodec/gifdec.c | 5 ----- libavcodec/libdav1d.c | 5 ----- libavcodec/libopenh264dec.c | 5 ----- libavcodec/mediacodecdec_common.c | 10 ---------- libavcodec/mmaldec.c | 5 ----- libavcodec/qsvdec.c | 5 ----- libavcodec/vp9.c | 5 ----- libavutil/frame.c | 10 ---------- libavutil/frame.h | 9 --------- libavutil/version.h | 3 --- 14 files changed, 88 deletions(-) diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index bf3e00959f..fa55f58988 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -540,11 +540,6 @@ static int ffat_decode(AVCodecContext *avctx, void *data, *got_frame_ptr = 1; if (at->last_pts != AV_NOPTS_VALUE) { frame->pts = at->last_pts; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_pts = at->last_pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif at->last_pts = avpkt->pts; } } else if (ret && ret != 1) { diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index 228803183a..fbfe5e8f62 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -537,11 +537,6 @@ static inline CopyRet copy_frame(AVCodecContext *avctx, frame->top_field_first = !bottom_first; frame->pts = pkt_pts; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_pts = pkt_pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->pkt_pos = -1; frame->pkt_duration = 0; diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index ec57afdefe..1e5e3ea9a6 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -614,11 +614,6 @@ static int cuvid_output_frame(AVCodecContext *avctx, AVFrame *frame) /* CUVIDs opaque reordering breaks the internal pkt logic. * So set pkt_pts and clear all the other pkt_ fields. */ -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_pts = frame->pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->pkt_pos = -1; frame->pkt_duration = 0; frame->pkt_size = -1; diff --git a/libavcodec/decode.c b/libavcodec/decode.c index dbc3f0110b..1a7c37043e 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -394,12 +394,6 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, avctx->pkt_timebase); if(frame->pts!=AV_NOPTS_VALUE) frame->pts += diff_ts; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - if(frame->pkt_pts!=AV_NOPTS_VALUE) - frame->pkt_pts += diff_ts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif if(frame->pkt_dts!=AV_NOPTS_VALUE) frame->pkt_dts += diff_ts; if (frame->pkt_duration >= diff_ts) @@ -1504,11 +1498,6 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) pkt, sizeof(*pkt), NULL); frame->pts = pkt->pts; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_pts = pkt->pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->pkt_pos = pkt->pos; frame->pkt_duration = pkt->duration; frame->pkt_size = pkt->size; diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 1906a4c738..dffc860bbc 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -472,11 +472,6 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, A bytestream2_init(&s->gb, avpkt->data, avpkt->size); s->frame->pts = avpkt->pts; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - s->frame->pkt_pts = avpkt->pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->frame->pkt_dts = avpkt->dts; s->frame->pkt_duration = avpkt->duration; diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 3c2a68b7e0..90c531fb91 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -314,11 +314,6 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) // match timestamps and packet size frame->pts = p->m.timestamp; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_pts = p->m.timestamp; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->pkt_dts = p->m.timestamp; frame->pkt_pos = p->m.offset; frame->pkt_size = p->m.size; diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c index c7aa7fa19c..832bfc49ef 100644 --- a/libavcodec/libopenh264dec.c +++ b/libavcodec/libopenh264dec.c @@ -144,11 +144,6 @@ static int svc_decode_frame(AVCodecContext *avctx, void *data, avframe->pts = info.uiOutYuvTimeStamp; avframe->pkt_dts = AV_NOPTS_VALUE; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - avframe->pkt_pts = avpkt->pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif #if OPENH264_VER_AT_LEAST(1, 7) (*s->decoder)->GetOption(s->decoder, DECODER_OPTION_PROFILE, &opt); avctx->profile = opt; diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c index 404ed28227..cb18aed401 100644 --- a/libavcodec/mediacodecdec_common.c +++ b/libavcodec/mediacodecdec_common.c @@ -293,11 +293,6 @@ static int mediacodec_wrap_hw_buffer(AVCodecContext *avctx, } else { frame->pts = info->presentationTimeUs; } -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_pts = frame->pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->pkt_dts = AV_NOPTS_VALUE; frame->color_range = avctx->color_range; frame->color_primaries = avctx->color_primaries; @@ -386,11 +381,6 @@ static int mediacodec_wrap_sw_buffer(AVCodecContext *avctx, } else { frame->pts = info->presentationTimeUs; } -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_pts = frame->pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->pkt_dts = AV_NOPTS_VALUE; av_log(avctx, AV_LOG_TRACE, diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index cb15ac072a..db9e4f9589 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -656,11 +656,6 @@ static int ffmal_copy_frame(AVCodecContext *avctx, AVFrame *frame, } frame->pts = buffer->pts == MMAL_TIME_UNKNOWN ? AV_NOPTS_VALUE : buffer->pts; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_pts = frame->pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->pkt_dts = AV_NOPTS_VALUE; done: diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 5f2e641373..bf843c8ca2 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -544,11 +544,6 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, outsurf = &out_frame->surface; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_pts = outsurf->Data.TimeStamp; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->pts = outsurf->Data.TimeStamp; frame->repeat_pict = diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 4659f94ee8..b4b644d509 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1572,11 +1572,6 @@ static int vp9_decode_frame(AVCodecContext *avctx, void *frame, if ((ret = av_frame_ref(frame, s->s.refs[ref].f)) < 0) return ret; ((AVFrame *)frame)->pts = pkt->pts; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - ((AVFrame *)frame)->pkt_pts = pkt->pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif ((AVFrame *)frame)->pkt_dts = pkt->dts; for (i = 0; i < 8; i++) { if (s->next_refs[i].f->buf[0]) diff --git a/libavutil/frame.c b/libavutil/frame.c index d69dd38dc4..e29008752c 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -72,11 +72,6 @@ static void get_frame_defaults(AVFrame *frame) frame->pts = frame->pkt_dts = AV_NOPTS_VALUE; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_pts = AV_NOPTS_VALUE; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->best_effort_timestamp = AV_NOPTS_VALUE; frame->pkt_duration = 0; frame->pkt_pos = -1; @@ -292,11 +287,6 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) dst->palette_has_changed = src->palette_has_changed; dst->sample_rate = src->sample_rate; dst->opaque = src->opaque; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - dst->pkt_pts = src->pkt_pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif dst->pkt_dts = src->pkt_dts; dst->pkt_pos = src->pkt_pos; dst->pkt_size = src->pkt_size; diff --git a/libavutil/frame.h b/libavutil/frame.h index 23396189d9..43345bcdee 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -399,15 +399,6 @@ typedef struct AVFrame { */ int64_t pts; -#if FF_API_PKT_PTS - /** - * PTS copied from the AVPacket that was decoded to produce this frame. - * @deprecated use the pts field instead - */ - attribute_deprecated - int64_t pkt_pts; -#endif - /** * DTS copied from the AVPacket that triggered returning this frame. (if frame threading isn't used) * This is also the Presentation time of this AVFrame calculated from diff --git a/libavutil/version.h b/libavutil/version.h index a72788d8e4..dbeb7ffe23 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_PKT_PTS -#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_CRYPTO_SIZE_T #define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 57) #endif From patchwork Mon Apr 19 14:10:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27056 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp564116iob; Mon, 19 Apr 2021 07:21:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0y4fJbwPP2w3SeE/ceznK1Wk7pfJaJMBJ9F6MIb1CaSJuQOYYyT5KfdtQjgwiZ1vqWABG X-Received: by 2002:a50:82e5:: with SMTP id 92mr26003352edg.141.1618842093360; Mon, 19 Apr 2021 07:21:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842093; cv=none; d=google.com; s=arc-20160816; b=wFy+qpId0cQ79NwkwZ0eYtc9+FUzI+J7s5OH4IwAE0k9+GREJz1XL3m2dNbbP6DhQF 5t79xhCbi3h/Zfh5f2ZTBO6C97UpsjbMw4be1EPxho1J6fw9341k8iOUvsvvz0icuSkU cDqkA/zBtCjtcJdduT1aTkDxWiLqs7whXmAvVYqxQE2wI3K6qUnbICDLoIS+MZKFrgtp sy1X0dmDfhspVmXnGOnbODuBCMoTBnVTx1CYD6o4m8m3cQ7qSeNVUJavAwb2JALRPj/a 3SpRgdcAC3fiYu6q93i8FjW7aFUIiRqarzhTYuqmeekaGslOEUMZH8zwzSW7ez9e8mSS z1VA== 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=RmbQl3Ucgf/485fz4OJeJNnx8/h7/Wtghal2KkFQ0ww=; b=rUVAWuOFfaXSkWmyYgjrCKAXAr2p1HFBbSLurDaS8bQVE56vYpXGVODLpxzrdso5fh g6/RGyLqQT3DRxlmUoFTwAE7+QZmgaNaTRoYh1+bHm91AXErRkmi26hXm2YvaTX9Zb+/ buNvf2TSeW6q7uy6A1nKWAMBNnVdOHwjY6UBOW4EPP+Y0Pvgfg+Z0pxUXcpgRwfyqE2B PFLzuD2Y/33wm6b8ey//0PwbTaEtBvKhDPieTVRoqNbfU9Zu3ud38MqmJ1zt/lIsJryc pmBXOSFoLEui80N4q30tBN8L/z1XumJJVHvBAv4hONoGVM7NthcAOAxNrnaooL3C6Oge 45ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qnGSO9hI; 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 o9si12581134edc.429.2021.04.19.07.21.32; Mon, 19 Apr 2021 07:21:33 -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=qnGSO9hI; 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 09D39689CDB; Mon, 19 Apr 2021 17:12:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 576DA689BFF for ; Mon, 19 Apr 2021 17:12:25 +0300 (EEST) Received: by mail-qv1-f43.google.com with SMTP id i3so11376447qvj.7 for ; Mon, 19 Apr 2021 07:12:24 -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=LZiBx3Wb/0VVRdX7al6ij+lvcs328ZxA2rCF0G40uVk=; b=qnGSO9hIAsVN0oGzB78/QwJl2RUFqhtGTvhlO8PvRDlYnzk4t2+Qn1eeiN8XEcoE6m YXfVVhpMES6V7qutbRwvvQUsH3dA6xAMIr95OmRs07Iu3+qIyATm6TjBg7FjifbvffG0 6kK1B2qtodYeWcV2rDm1fz6SSMChX2JIWZ6jonnNbvvfRH5b92184NdNEuS8utA8HeJa /PWZZjMsAKx7DK19lNWRKh54b45NqGXLDfOS1eq42ACD9Hgil2vlOUU7t3sLKGobRndE ropidK4T+GCfRUNjsJRYtMIOJWW1IbWy7OymmzIHYGhXkTKs8HaK/jz/P7ZKQKK0qI9b sK7A== 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=LZiBx3Wb/0VVRdX7al6ij+lvcs328ZxA2rCF0G40uVk=; b=cAru7d4HcktDFgTRwJ/uJGLSBkiKYb95GsE1Ka+m7hPV6Y1V+lUKKEz2as3/3/quPK g1XrxaEPCUDEc1YETUEzfEHiTF4H6KlaSkp7cVKUNgTpzF6IX/QzLRzs6H6QM0toxz6x cZYESWZMQglOgyrCOBrfkOvvk/GjdOlvXDFsge2ursMUK2GbBDg5AD5cCXFDgTI0fvYy yZ/CMpv7N4IFlJ8EPNMAnre8fH76kt2yH4u/Mht0NBpHwRxTqD+wqTAQ2EI08bRsPoov x5cpQxb/9cr1HF7N8vURfc61Iahs4CIol9kCnEjxlBWnw2ieUeNb0kNUrFAIFEoc8TAm vA1Q== X-Gm-Message-State: AOAM5309KEvLY4tgmCiFTMKR56g5ekVQM+uJmy81SJkSSTrs18UAfs+S cKFfTwtq8py8P4SPjV2LWQ64qro6GV0= X-Received: by 2002:ad4:576e:: with SMTP id r14mr21942593qvx.13.1618841543516; Mon, 19 Apr 2021 07:12:23 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:22 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:10:04 -0300 Message-Id: <20210419141024.8174-68-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 67/87] avutil: Switch crypto APIs to size_t 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: Yzi0QPkPu7UE From: Andreas Rheinhardt Announced in e435beb1ea5380a90774dbf51fdc8c941e486551. Signed-off-by: Andreas Rheinhardt --- libavutil/adler32.c | 5 ----- libavutil/adler32.h | 9 --------- libavutil/hash.c | 4 ---- libavutil/hash.h | 4 ---- libavutil/hmac.c | 4 ---- libavutil/md5.c | 15 +++------------ libavutil/md5.h | 8 -------- libavutil/murmur3.c | 4 ---- libavutil/murmur3.h | 4 ---- libavutil/ripemd.c | 23 ++++++++++++----------- libavutil/ripemd.h | 4 ---- libavutil/sha.c | 23 ++++++++++++----------- libavutil/sha.h | 4 ---- libavutil/sha512.c | 23 ++++++++++++----------- libavutil/sha512.h | 4 ---- libavutil/version.h | 3 --- 16 files changed, 39 insertions(+), 102 deletions(-) diff --git a/libavutil/adler32.c b/libavutil/adler32.c index 5ed5ff55a3..f7d3062265 100644 --- a/libavutil/adler32.c +++ b/libavutil/adler32.c @@ -41,12 +41,7 @@ #define DO4(buf) DO1(buf); DO1(buf); DO1(buf); DO1(buf); #define DO16(buf) DO4(buf); DO4(buf); DO4(buf); DO4(buf); -#if FF_API_CRYPTO_SIZE_T -unsigned long av_adler32_update(unsigned long adler, const uint8_t * buf, - unsigned int len) -#else AVAdler av_adler32_update(AVAdler adler, const uint8_t *buf, size_t len) -#endif { unsigned long s1 = adler & 0xffff; unsigned long s2 = adler >> 16; diff --git a/libavutil/adler32.h b/libavutil/adler32.h index e7a8f83729..232d07f5fe 100644 --- a/libavutil/adler32.h +++ b/libavutil/adler32.h @@ -30,7 +30,6 @@ #include #include #include "attributes.h" -#include "version.h" /** * @defgroup lavu_adler32 Adler-32 @@ -40,11 +39,7 @@ * @{ */ -#if FF_API_CRYPTO_SIZE_T -typedef unsigned long AVAdler; -#else typedef uint32_t AVAdler; -#endif /** * Calculate the Adler32 checksum of a buffer. @@ -59,11 +54,7 @@ typedef uint32_t AVAdler; * @return updated checksum */ AVAdler av_adler32_update(AVAdler adler, const uint8_t *buf, -#if FF_API_CRYPTO_SIZE_T - unsigned int len) av_pure; -#else size_t len) av_pure; -#endif /** * @} diff --git a/libavutil/hash.c b/libavutil/hash.c index d626c31181..9a49748189 100644 --- a/libavutil/hash.c +++ b/libavutil/hash.c @@ -157,11 +157,7 @@ void av_hash_init(AVHashContext *ctx) } } -#if FF_API_CRYPTO_SIZE_T -void av_hash_update(AVHashContext *ctx, const uint8_t *src, int len) -#else void av_hash_update(AVHashContext *ctx, const uint8_t *src, size_t len) -#endif { switch (ctx->type) { case MD5: av_md5_update(ctx->ctx, src, len); break; diff --git a/libavutil/hash.h b/libavutil/hash.h index af4719e423..930d2d6cde 100644 --- a/libavutil/hash.h +++ b/libavutil/hash.h @@ -182,11 +182,7 @@ void av_hash_init(struct AVHashContext *ctx); * @param[in] src Data to be added to the hash context * @param[in] len Size of the additional data */ -#if FF_API_CRYPTO_SIZE_T -void av_hash_update(struct AVHashContext *ctx, const uint8_t *src, int len); -#else void av_hash_update(struct AVHashContext *ctx, const uint8_t *src, size_t len); -#endif /** * Finalize a hash context and compute the actual hash value. diff --git a/libavutil/hmac.c b/libavutil/hmac.c index d064a105f4..e277fd7701 100644 --- a/libavutil/hmac.c +++ b/libavutil/hmac.c @@ -34,11 +34,7 @@ #define MAX_BLOCKLEN 128 typedef void (*hmac_final)(void *ctx, uint8_t *dst); -#if FF_API_CRYPTO_SIZE_T -typedef void (*hmac_update)(void *ctx, const uint8_t *src, int len); -#else typedef void (*hmac_update)(void *ctx, const uint8_t *src, size_t len); -#endif typedef void (*hmac_init)(void *ctx); struct AVHMAC { diff --git a/libavutil/md5.c b/libavutil/md5.c index 31e69925ae..88596203c1 100644 --- a/libavutil/md5.c +++ b/libavutil/md5.c @@ -98,14 +98,13 @@ static const uint32_t T[64] = { // T[i]= fabs(sin(i+1)<<32) a = b + (a << t | a >> (32 - t)); \ } while (0) -static void body(uint32_t ABCD[4], const uint8_t *src, int nblocks) +static void body(uint32_t ABCD[4], const uint8_t *src, size_t nblocks) { int i av_unused; - int n; const uint32_t *X; uint32_t a, b, c, d, t; - for (n = 0; n < nblocks; n++) { + for (size_t n = 0; n < nblocks; n++) { a = ABCD[3]; b = ABCD[2]; c = ABCD[1]; @@ -150,11 +149,7 @@ void av_md5_init(AVMD5 *ctx) ctx->ABCD[3] = 0x67452301; } -#if FF_API_CRYPTO_SIZE_T -void av_md5_update(AVMD5 *ctx, const uint8_t *src, int len) -#else void av_md5_update(AVMD5 *ctx, const uint8_t *src, size_t len) -#endif { const uint8_t *end; int j; @@ -180,7 +175,7 @@ void av_md5_update(AVMD5 *ctx, const uint8_t *src, size_t len) src += 64; } } else { - int nblocks = len / 64; + size_t nblocks = len / 64; body(ctx->ABCD, src, nblocks); src = end; } @@ -204,11 +199,7 @@ void av_md5_final(AVMD5 *ctx, uint8_t *dst) AV_WL32(dst + 4 * i, ctx->ABCD[3 - i]); } -#if FF_API_CRYPTO_SIZE_T -void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len) -#else void av_md5_sum(uint8_t *dst, const uint8_t *src, size_t len) -#endif { AVMD5 ctx; diff --git a/libavutil/md5.h b/libavutil/md5.h index ca72ccbf83..eee6af44df 100644 --- a/libavutil/md5.h +++ b/libavutil/md5.h @@ -64,11 +64,7 @@ void av_md5_init(struct AVMD5 *ctx); * @param src input data to update hash with * @param len input data length */ -#if FF_API_CRYPTO_SIZE_T -void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, int len); -#else void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, size_t len); -#endif /** * Finish hashing and output digest value. @@ -85,11 +81,7 @@ void av_md5_final(struct AVMD5 *ctx, uint8_t *dst); * @param src The data to hash * @param len The length of the data, in bytes */ -#if FF_API_CRYPTO_SIZE_T -void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len); -#else void av_md5_sum(uint8_t *dst, const uint8_t *src, size_t len); -#endif /** * @} diff --git a/libavutil/murmur3.c b/libavutil/murmur3.c index 3e85c3c94f..f2e2a9ea6c 100644 --- a/libavutil/murmur3.c +++ b/libavutil/murmur3.c @@ -91,11 +91,7 @@ static inline uint64_t update_h2(uint64_t k, uint64_t h1, uint64_t h2) return k; } -#if FF_API_CRYPTO_SIZE_T -void av_murmur3_update(AVMurMur3 *c, const uint8_t *src, int len) -#else void av_murmur3_update(AVMurMur3 *c, const uint8_t *src, size_t len) -#endif { const uint8_t *end; uint64_t h1 = c->h1, h2 = c->h2; diff --git a/libavutil/murmur3.h b/libavutil/murmur3.h index b3b3a07de2..c5cd7e49e0 100644 --- a/libavutil/murmur3.h +++ b/libavutil/murmur3.h @@ -100,11 +100,7 @@ void av_murmur3_init(struct AVMurMur3 *c); * @param[in] src Input data to update hash with * @param[in] len Number of bytes to read from `src` */ -#if FF_API_CRYPTO_SIZE_T -void av_murmur3_update(struct AVMurMur3 *c, const uint8_t *src, int len); -#else void av_murmur3_update(struct AVMurMur3 *c, const uint8_t *src, size_t len); -#endif /** * Finish hashing and output digest value. diff --git a/libavutil/ripemd.c b/libavutil/ripemd.c index 89d69cc23d..b8e9761a24 100644 --- a/libavutil/ripemd.c +++ b/libavutil/ripemd.c @@ -511,13 +511,10 @@ av_cold int av_ripemd_init(AVRIPEMD *ctx, int bits) return 0; } -#if FF_API_CRYPTO_SIZE_T -void av_ripemd_update(AVRIPEMD* ctx, const uint8_t* data, unsigned int len) -#else void av_ripemd_update(AVRIPEMD* ctx, const uint8_t* data, size_t len) -#endif { - unsigned int i, j; + unsigned int j; + size_t i; j = ctx->count & 63; ctx->count += len; @@ -530,15 +527,19 @@ void av_ripemd_update(AVRIPEMD* ctx, const uint8_t* data, size_t len) } } #else - if ((j + len) > 63) { + if (len >= 64 - j) { + const uint8_t *end; memcpy(&ctx->buffer[j], data, (i = 64 - j)); ctx->transform(ctx->state, ctx->buffer); - for (; i + 63 < len; i += 64) - ctx->transform(ctx->state, &data[i]); + data += i; + len -= i; + end = data + (len & ~63); + len = len % 64; + for (; data < end; data += 64) + ctx->transform(ctx->state, data); j = 0; - } else - i = 0; - memcpy(&ctx->buffer[j], &data[i], len - i); + } + memcpy(&ctx->buffer[j], data, len); #endif } diff --git a/libavutil/ripemd.h b/libavutil/ripemd.h index 921aa66684..8c24b72855 100644 --- a/libavutil/ripemd.h +++ b/libavutil/ripemd.h @@ -67,11 +67,7 @@ int av_ripemd_init(struct AVRIPEMD* context, int bits); * @param data input data to update hash with * @param len input data length */ -#if FF_API_CRYPTO_SIZE_T -void av_ripemd_update(struct AVRIPEMD* context, const uint8_t* data, unsigned int len); -#else void av_ripemd_update(struct AVRIPEMD* context, const uint8_t* data, size_t len); -#endif /** * Finish hashing and output digest value. diff --git a/libavutil/sha.c b/libavutil/sha.c index ef6fa44227..ab42869c7b 100644 --- a/libavutil/sha.c +++ b/libavutil/sha.c @@ -311,13 +311,10 @@ av_cold int av_sha_init(AVSHA *ctx, int bits) return 0; } -#if FF_API_CRYPTO_SIZE_T -void av_sha_update(struct AVSHA *ctx, const uint8_t *data, unsigned int len) -#else void av_sha_update(struct AVSHA *ctx, const uint8_t *data, size_t len) -#endif { - unsigned int i, j; + unsigned int j; + size_t i; j = ctx->count & 63; ctx->count += len; @@ -330,15 +327,19 @@ void av_sha_update(struct AVSHA *ctx, const uint8_t *data, size_t len) } } #else - if ((j + len) > 63) { + if (len >= 64 - j) { + const uint8_t *end; memcpy(&ctx->buffer[j], data, (i = 64 - j)); ctx->transform(ctx->state, ctx->buffer); - for (; i + 63 < len; i += 64) - ctx->transform(ctx->state, &data[i]); + data += i; + len -= i; + end = data + (len & ~63); + len = len % 64; + for (; data < end; data += 64) + ctx->transform(ctx->state, data); j = 0; - } else - i = 0; - memcpy(&ctx->buffer[j], &data[i], len - i); + } + memcpy(&ctx->buffer[j], data, len); #endif } diff --git a/libavutil/sha.h b/libavutil/sha.h index c0180e5729..85356218b9 100644 --- a/libavutil/sha.h +++ b/libavutil/sha.h @@ -74,11 +74,7 @@ int av_sha_init(struct AVSHA* context, int bits); * @param data input data to update hash with * @param len input data length */ -#if FF_API_CRYPTO_SIZE_T -void av_sha_update(struct AVSHA *ctx, const uint8_t *data, unsigned int len); -#else void av_sha_update(struct AVSHA *ctx, const uint8_t *data, size_t len); -#endif /** * Finish hashing and output digest value. diff --git a/libavutil/sha512.c b/libavutil/sha512.c index 6d092a7c5c..97aaaa865c 100644 --- a/libavutil/sha512.c +++ b/libavutil/sha512.c @@ -239,13 +239,10 @@ av_cold int av_sha512_init(AVSHA512 *ctx, int bits) return 0; } -#if FF_API_CRYPTO_SIZE_T -void av_sha512_update(AVSHA512* ctx, const uint8_t* data, unsigned int len) -#else void av_sha512_update(AVSHA512* ctx, const uint8_t* data, size_t len) -#endif { - unsigned int i, j; + unsigned int j; + size_t i; j = ctx->count & 127; ctx->count += len; @@ -258,15 +255,19 @@ void av_sha512_update(AVSHA512* ctx, const uint8_t* data, size_t len) } } #else - if ((j + len) > 127) { + if (len >= 128 - j) { + const uint8_t *end; memcpy(&ctx->buffer[j], data, (i = 128 - j)); sha512_transform(ctx->state, ctx->buffer); - for (; i + 127 < len; i += 128) - sha512_transform(ctx->state, &data[i]); + data += i; + len -= i; + end = data + (len & ~127); + len = len % 128; + for (; data < end; data += 128) + sha512_transform(ctx->state, data); j = 0; - } else - i = 0; - memcpy(&ctx->buffer[j], &data[i], len - i); + } + memcpy(&ctx->buffer[j], data, len); #endif } diff --git a/libavutil/sha512.h b/libavutil/sha512.h index bef714b41c..30dd8744f8 100644 --- a/libavutil/sha512.h +++ b/libavutil/sha512.h @@ -76,11 +76,7 @@ int av_sha512_init(struct AVSHA512* context, int bits); * @param data input data to update hash with * @param len input data length */ -#if FF_API_CRYPTO_SIZE_T -void av_sha512_update(struct AVSHA512* context, const uint8_t* data, unsigned int len); -#else void av_sha512_update(struct AVSHA512* context, const uint8_t* data, size_t len); -#endif /** * Finish hashing and output digest value. diff --git a/libavutil/version.h b/libavutil/version.h index dbeb7ffe23..54b09534a2 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_CRYPTO_SIZE_T -#define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_FRAME_GET_SET #define FF_API_FRAME_GET_SET (LIBAVUTIL_VERSION_MAJOR < 57) #endif From patchwork Mon Apr 19 14:10:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27066 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp564307iob; Mon, 19 Apr 2021 07:21:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzo6OLnldWPF5czzxtq4ruhgVgTzmDkScDkcMnhNUxjFEdRapp69o24psT2BAyUmvwAwWtJ X-Received: by 2002:a17:906:944c:: with SMTP id z12mr21890533ejx.398.1618842107087; Mon, 19 Apr 2021 07:21:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842107; cv=none; d=google.com; s=arc-20160816; b=c+gq5RcmbDSLapVNA2ITRhuPiXx4RV40GC02gFpC2PGSHA1tDv2ZTReEpw9QKkwq60 2yYmI+XQbdxNS9kD+CUMyhN6aZcksmHzM6SmgbYO97wODqwIZBIBSMYjNiFYGexaAc+D 2F0u09VY5WBzHMeLvdjGIrJOOnHGifP+grSN9nReBxFaZWh+RzKwgbndyQGoEDru1S2B BYMzjjLDrI/5Pp6J/1vyIjY6WM9zOkplmrd0e3idWIRCgBgRkIrffpF5oO/hgdMPV/EW /Ka/Sp9F5tjHTQ/saCG5c1mOMvC802ZZrA04FjQISP0cn8vLBjPKEDshP2fhXjw/u+n1 AAlQ== 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=j+p756jPEJO5k+21m9hDuEBuzP9mzqI3SCwIR2QYDr4=; b=bUVDCtp408vwgVcdT67/MCSA+I+2UIJfN0h5ZalTpoytPo/7cVTC9nhQhRa93alrgL cLzBPzdhIDCRpdqEoi70SQrUv5+Seej6nsLc6yHrGVan6BnbkM4UfUI4q50EjI7KU4nI RiAl6x8GgtBH0UXgPTS5xhb29TETbsvExV17TT2o/T15qqUcc1km3aAw0ogistNn4O2Q +PYA9LOvCR1jpDHcNMZQg53T3vawMEEQ0oog7/9lMVw85byo++AhGnxh+aqKcLf6XulO 0iPk4BcAD6XL9lQ4yDPYoCYCy+K0GwfInC3DCd0569BZrJ5PrLEYH+LdjaKU253MQjZ2 4Slg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ln0q6LYF; 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 b13si8203946ede.310.2021.04.19.07.21.46; Mon, 19 Apr 2021 07:21:47 -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=ln0q6LYF; 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 D2167689CC5; Mon, 19 Apr 2021 17:12:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3B90689C28 for ; Mon, 19 Apr 2021 17:12:25 +0300 (EEST) Received: by mail-qv1-f50.google.com with SMTP id 30so16899477qva.9 for ; Mon, 19 Apr 2021 07:12:25 -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=2eUhbDEPJPvxfpsMWhFFFC+VhOO+xBjvZHhxYOYaGJI=; b=ln0q6LYFzld3zCcix/kjsuGQ1he9pc+02fbaAbIWGWewE2mN6zFTpSMPgUUMkTcCHz POkT5jlwl6qbxGzJFDnn2cQkbZeeK+6AJAoStzOUrTqtwFNgteUta7wbwQNac8MSsDww 1s0Fx8jPQu9r4m0pT93NQs3qvxISu2+neufj9NubveD3IIRS0V9I7ZB8TRjbdtsZ2PnY XoPWq3BUt8XpXHTwj2f/oDxAQwAxviD9HnxQePhvaHeKYwuTRVRWSDHSFyB1JLPXNQ/y EmUZafaLcMUIMZGQR6zdDYXVwV6LicOqfviNkA7WgVPxy+qIFI/S1ZM5s0773ZUKN03f gdfg== 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=2eUhbDEPJPvxfpsMWhFFFC+VhOO+xBjvZHhxYOYaGJI=; b=TqaM+Y99eMd5C5UhK5z6d+Uef2agwHAKGzDKpyqbMX0jTc9kpCxo8rgmPvRvCWAIXS Ert52flKHzmsP6phvaz7QRB4dJO9CEUzGHhxUxv4WqfS4vEGSG//9DXS8feXEbXPNi2P 9NMPt7k5xmUpTl3Vu6deVwI6V03SCFFv2FNLjOISFpil/CoTpgeO6Wc184xEZXvac/js nd9I8gmclt3wjfP1j2JttZXLZiLKMPcYUQb+9dTJx04l+NUxkQriF6HMZ6zxdU2uBYVr DrhaXe1xolEP30asFbg1AYpiSDBfna66Vj6/nvPLNX0bsy1uSiZN8LzyZ4aB8GHbnJZ9 DrmA== X-Gm-Message-State: AOAM532cSrFFhFpL+CiLqjNjmwMhwk8K6mmVYzE6IttR43SAXGqubSdM pLBJBB5ld9O9LcUNTPh3a4tTo7y60Ik= X-Received: by 2002:ad4:458b:: with SMTP id x11mr21505943qvu.36.1618841544603; Mon, 19 Apr 2021 07:12:24 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:24 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:10:05 -0300 Message-Id: <20210419141024.8174-69-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 68/87] avutil/frame: Remove deprecated getters and setters 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: Zh5o6E0UyOow From: Andreas Rheinhardt Deprecated in 7df37dd319f2d9d3e1becd5d433884e3ccfa1ee2. Signed-off-by: Andreas Rheinhardt --- libavutil/frame.c | 14 ------------- libavutil/frame.h | 50 --------------------------------------------- libavutil/version.h | 3 --- 3 files changed, 67 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index e29008752c..7d5a36b2f1 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -27,20 +27,6 @@ #include "samplefmt.h" #include "hwcontext.h" -#if FF_API_FRAME_GET_SET -MAKE_ACCESSORS(AVFrame, frame, int64_t, best_effort_timestamp) -MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_duration) -MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_pos) -MAKE_ACCESSORS(AVFrame, frame, int64_t, channel_layout) -MAKE_ACCESSORS(AVFrame, frame, int, channels) -MAKE_ACCESSORS(AVFrame, frame, int, sample_rate) -MAKE_ACCESSORS(AVFrame, frame, AVDictionary *, metadata) -MAKE_ACCESSORS(AVFrame, frame, int, decode_error_flags) -MAKE_ACCESSORS(AVFrame, frame, int, pkt_size) -MAKE_ACCESSORS(AVFrame, frame, enum AVColorSpace, colorspace) -MAKE_ACCESSORS(AVFrame, frame, enum AVColorRange, color_range) -#endif - #define CHECK_CHANNELS_CONSISTENCY(frame) \ av_assert2(!(frame)->channel_layout || \ (frame)->channels == \ diff --git a/libavutil/frame.h b/libavutil/frame.h index 43345bcdee..853d4cabec 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -651,56 +651,6 @@ typedef struct AVFrame { AVBufferRef *private_ref; } AVFrame; -#if FF_API_FRAME_GET_SET -/** - * Accessors for some AVFrame fields. These used to be provided for ABI - * compatibility, and do not need to be used anymore. - */ -attribute_deprecated -int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame); -attribute_deprecated -void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val); -attribute_deprecated -int64_t av_frame_get_pkt_duration (const AVFrame *frame); -attribute_deprecated -void av_frame_set_pkt_duration (AVFrame *frame, int64_t val); -attribute_deprecated -int64_t av_frame_get_pkt_pos (const AVFrame *frame); -attribute_deprecated -void av_frame_set_pkt_pos (AVFrame *frame, int64_t val); -attribute_deprecated -int64_t av_frame_get_channel_layout (const AVFrame *frame); -attribute_deprecated -void av_frame_set_channel_layout (AVFrame *frame, int64_t val); -attribute_deprecated -int av_frame_get_channels (const AVFrame *frame); -attribute_deprecated -void av_frame_set_channels (AVFrame *frame, int val); -attribute_deprecated -int av_frame_get_sample_rate (const AVFrame *frame); -attribute_deprecated -void av_frame_set_sample_rate (AVFrame *frame, int val); -attribute_deprecated -AVDictionary *av_frame_get_metadata (const AVFrame *frame); -attribute_deprecated -void av_frame_set_metadata (AVFrame *frame, AVDictionary *val); -attribute_deprecated -int av_frame_get_decode_error_flags (const AVFrame *frame); -attribute_deprecated -void av_frame_set_decode_error_flags (AVFrame *frame, int val); -attribute_deprecated -int av_frame_get_pkt_size(const AVFrame *frame); -attribute_deprecated -void av_frame_set_pkt_size(AVFrame *frame, int val); -attribute_deprecated -enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame); -attribute_deprecated -void av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val); -attribute_deprecated -enum AVColorRange av_frame_get_color_range(const AVFrame *frame); -attribute_deprecated -void av_frame_set_color_range(AVFrame *frame, enum AVColorRange val); -#endif #if FF_API_COLORSPACE_NAME /** diff --git a/libavutil/version.h b/libavutil/version.h index 54b09534a2..81f8690e01 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_FRAME_GET_SET -#define FF_API_FRAME_GET_SET (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_PSEUDOPAL #define FF_API_PSEUDOPAL (LIBAVUTIL_VERSION_MAJOR < 57) #endif From patchwork Mon Apr 19 14:10: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: 27054 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp564474iob; Mon, 19 Apr 2021 07:21:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1XgKAn7N1DzcBD81Fpw+BYKE4haOEt5y1TuM0qFMI0jgUTRjm5ZCGFEz2dQBIFwxWcttc X-Received: by 2002:a50:fd07:: with SMTP id i7mr14824915eds.92.1618842119608; Mon, 19 Apr 2021 07:21:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842119; cv=none; d=google.com; s=arc-20160816; b=CvBXLM/Twf4HQ648Y/H8W6HLMnunIE/InHLBMedX5LWDIackNoodTNBBAMIFH+EbaD u6NOEEpJBgVn/tlVIQUwzzvV3rBUURukNTVcolAX44f1iWrU0il0zZb+k9r6ZmGPqVGH d/cdtBwIxrGaSZtPj8MHgpzsCYecjhhL7wx7ZnsbRl/1rHWjyn3fshyIS6iquDJS29rC uXQLGmdHfQAv36F5R3scDuXZ7kYKJIyGNtCPJpfcjvk25ol5ztmxPG5mmsx5MFsCFdoK e25R2nsWHSnYo+Tk+lVrRVmdEzOadBWjTGmLEBN+m/5MBXlgZOHMzUETMr+h4N9rPS5S Z9/Q== 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=AfGbvW6EC+pMUUQlOsxVSf/NC5wUHMN5o80yqqWAi5I=; b=bJpuwKuIsbTB1EzQFyx8vOJe6mSkaPdSl5v4vmaYRbMRtgbmTS7dY1g/Ap/yxr3Ne9 9GhjgueBxiyLYaBQ4Gs/F/2RFOpuI8c4WiWhmYKY72N55X9ORvvoCmeI02mFiJcr3iqr Aw1BaI/hdTzUqmUutCW7RiNv8c2RVVTh2l1F1d184/rPeIkzNMr/A3LQgmYz/ftBQrKk CDh3/3Doqx3ztz4JKWu1pA32fkGDFwsMUGge4hUP2E19SiLUiDrWWNAf+uWfXhG/3QMG 1uWWGYZ1sXRrK10Hx9CuE/p4EwLqMbJeWxLzW9TBSiRQ2moS7DJR7l24ZW/lF2D615wC Nz6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HpO6ywjD; 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 pj1si11950443ejb.586.2021.04.19.07.21.59; Mon, 19 Apr 2021 07:21:59 -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=HpO6ywjD; 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 A7CF8689D24; Mon, 19 Apr 2021 17:12:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57E60689CB4 for ; Mon, 19 Apr 2021 17:12:27 +0300 (EEST) Received: by mail-qk1-f178.google.com with SMTP id v7so7773591qkj.13 for ; Mon, 19 Apr 2021 07:12:27 -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=hruFEyjUp1d/3BmV4iZxQF/2ibdJNmuM8Ih35TUCM3I=; b=HpO6ywjDbTy8XIIijLhTomk6fg2Z3cuFwIqjwY40gZq5osQvepj75WucUixQQSOzmI duG3+qVL3IC4hEPNl8gQsXH37er/WD3AAXRZJ5NRXsDDsavTHUcODjBbvMS+41UJx3AA 4UKpVNaVfztxdKEBXp8UULrvHysePpcilkKV9Iem1MJP2cVLHm9CyoCzOu/QX1wHxA1F uh3quqpXXhOXbERdAN1wof+AiZJP/8QTZC7rKYZOYFoPKxfyqP7oOvBTxXP2KMXBDOFz UofQ40y3yoJdqmqjpvcq2CuKbpNMysV0BFxPKle2ITj89hUdsx3XItT7NYfKeEkLxvHS waJw== 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=hruFEyjUp1d/3BmV4iZxQF/2ibdJNmuM8Ih35TUCM3I=; b=ZqYfUaCSA51PhmRJhNOWo0wFMsNpkVtlIK1D72zUJtQGXDNajbEPp9w7xo2mckp7o8 WczSt8WBeDE5atWCZPY4Z8YQ599wvLLDgzoI9IjYz7IHUGVh3xnt8YxUAGsJQhiC5q9L BIrEZ2/3GIOwncPz1gvMWkl2Tby+QGXIYErVqogmylF6O58ZauOw6VkH/wKqEMPttyao 8FnA7nOuVSc6tIjqawcCvA1wtq2GJJD43Pj2ZPABG5bTIVwEXPOj7LqwqyeiND33VvkJ OUcs9vnMeUcYRE8AhVpY0wZXKU8VoN60K5ErlsBblyXyU7upU2WiXNLhVY0Z2LrkKh7j kOqw== X-Gm-Message-State: AOAM533JxHw5PpAMS4/DXhxI4Os23L5N2IH7nf/xi+TkB9iN/aeZ2j93 N/tC/yuGKuFkcVOJif6iDESR9hJMZs8= X-Received: by 2002:a37:b103:: with SMTP id a3mr12616166qkf.261.1618841545717; Mon, 19 Apr 2021 07:12:25 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:25 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:10:06 -0300 Message-Id: <20210419141024.8174-70-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 69/87] avutil/pixdesc: Remove deprecated AV_PIX_FMT_FLAG_PSEUDOPAL 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: 1AjbY7CubTIx From: Andreas Rheinhardt Deprecated in d6fc031caf64eed921bbdef86d79d56bfc2633b0. Signed-off-by: Andreas Rheinhardt --- libavcodec/decode.c | 5 +---- libavcodec/ffv1dec.c | 3 +-- libavcodec/rawdec.c | 17 +++++------------ libavfilter/drawutils.c | 2 +- libavfilter/framepool.c | 6 ++---- libavfilter/vf_crop.c | 2 +- libavfilter/vf_pixdesctest.c | 3 +-- libavfilter/vf_scale.c | 3 +-- libavfilter/vf_untile.c | 2 +- libavutil/frame.c | 2 +- libavutil/imgutils.c | 15 ++++----------- libavutil/internal.h | 9 --------- libavutil/pixdesc.c | 9 ++++----- libavutil/pixdesc.h | 20 -------------------- libavutil/version.h | 3 --- tests/ref/fate/imgutils | 10 +++++----- 16 files changed, 28 insertions(+), 83 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 1a7c37043e..9e5230ae1d 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1425,8 +1425,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) pic->data[i] = NULL; pic->linesize[i] = 0; } - if (desc->flags & AV_PIX_FMT_FLAG_PAL || - ((desc->flags & FF_PSEUDOPAL) && pic->data[1])) + if (desc->flags & AV_PIX_FMT_FLAG_PAL) avpriv_set_systematic_pal2((uint32_t *)pic->data[1], pic->format); if (s->debug & FF_DEBUG_BUFFERS) @@ -1589,8 +1588,6 @@ static void validate_avframe_allocation(AVCodecContext *avctx, AVFrame *frame) int flags = desc ? desc->flags : 0; if (num_planes == 1 && (flags & AV_PIX_FMT_FLAG_PAL)) num_planes = 2; - if ((flags & FF_PSEUDOPAL) && frame->data[1]) - num_planes = 2; for (i = 0; i < num_planes; i++) { av_assert0(frame->data[i]); } diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 8516fef5d7..14879779fa 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -952,8 +952,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac (fs->slice_y >> sv) + ((fs->slice_x >> sh) << pixshift); } - if (desc->flags & AV_PIX_FMT_FLAG_PAL || - desc->flags & FF_PSEUDOPAL) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL) { dst[1] = p->data[1]; src[1] = f->last_picture.f->data[1]; } diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index d3756328ba..a13f88b148 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -93,19 +93,13 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (desc->flags & (AV_PIX_FMT_FLAG_PAL | FF_PSEUDOPAL)) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL) { context->palette = av_buffer_alloc(AVPALETTE_SIZE); if (!context->palette) return AVERROR(ENOMEM); -#if FF_API_PSEUDOPAL - if (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) - avpriv_set_systematic_pal2((uint32_t*)context->palette->data, avctx->pix_fmt); -#endif - else { - memset(context->palette->data, 0, AVPALETTE_SIZE); - if (avctx->bits_per_coded_sample == 1) - memset(context->palette->data, 0xff, 4); - } + memset(context->palette->data, 0, AVPALETTE_SIZE); + if (avctx->bits_per_coded_sample == 1) + memset(context->palette->data, 0xff, 4); } if ((avctx->extradata_size >= 9 && @@ -416,8 +410,7 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, frame->linesize[1] = FFALIGN(frame->linesize[1], linesize_align); } - if ((avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->frame_size) || - (desc->flags & FF_PSEUDOPAL)) { + if (avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->frame_size) { frame->buf[1] = av_buffer_ref(context->palette); if (!frame->buf[1]) { av_buffer_unref(&frame->buf[0]); diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index 0a59ff9987..f95e12091b 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -91,7 +91,7 @@ int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags) if (!desc || !desc->name) return AVERROR(EINVAL); - if (desc->flags & ~(AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL | AV_PIX_FMT_FLAG_ALPHA)) + if (desc->flags & ~(AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA)) return AVERROR(ENOSYS); if (format == AV_PIX_FMT_P010LE || format == AV_PIX_FMT_P010BE || format == AV_PIX_FMT_P016LE || format == AV_PIX_FMT_P016BE) return AVERROR(ENOSYS); diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c index dab8891524..5f67fa170a 100644 --- a/libavfilter/framepool.c +++ b/libavfilter/framepool.c @@ -102,8 +102,7 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(buffer_size_t size), goto fail; } - if (desc->flags & AV_PIX_FMT_FLAG_PAL || - desc->flags & FF_PSEUDOPAL) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL) { pool->pools[1] = av_buffer_pool_init(AVPALETTE_SIZE, alloc); if (!pool->pools[1]) goto fail; @@ -226,8 +225,7 @@ AVFrame *ff_frame_pool_get(FFFramePool *pool) frame->data[i] = frame->buf[i]->data; } - if (desc->flags & AV_PIX_FMT_FLAG_PAL || - desc->flags & FF_PSEUDOPAL) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL) { enum AVPixelFormat format = pool->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : pool->format; diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 3d5cb95f78..dffb6dab5e 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -300,7 +300,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) frame->data[0] += s->y * frame->linesize[0]; frame->data[0] += s->x * s->max_step[0]; - if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & FF_PSEUDOPAL)) { + if (!(desc->flags & AV_PIX_FMT_FLAG_PAL)) { for (i = 1; i < 3; i ++) { if (frame->data[i]) { frame->data[i] += (s->y >> s->vsub) * frame->linesize[i]; diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c index 680d1a772a..066b8a0290 100644 --- a/libavfilter/vf_pixdesctest.c +++ b/libavfilter/vf_pixdesctest.c @@ -80,8 +80,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } /* copy palette */ - if (priv->pix_desc->flags & AV_PIX_FMT_FLAG_PAL || - ((priv->pix_desc->flags & FF_PSEUDOPAL) && out->data[1] && in->data[1])) + if (priv->pix_desc->flags & AV_PIX_FMT_FLAG_PAL) memcpy(out->data[1], in->data[1], AVPALETTE_SIZE); for (c = 0; c < priv->pix_desc->nb_components; c++) { diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 5ad9334d02..3add31bace 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -510,8 +510,7 @@ static int config_props(AVFilterLink *outlink) scale->input_is_pal = desc->flags & AV_PIX_FMT_FLAG_PAL; if (outfmt == AV_PIX_FMT_PAL8) outfmt = AV_PIX_FMT_BGR8; - scale->output_is_pal = av_pix_fmt_desc_get(outfmt)->flags & AV_PIX_FMT_FLAG_PAL || - av_pix_fmt_desc_get(outfmt)->flags & FF_PSEUDOPAL; + scale->output_is_pal = av_pix_fmt_desc_get(outfmt)->flags & AV_PIX_FMT_FLAG_PAL; if (scale->sws) sws_freeContext(scale->sws); diff --git a/libavfilter/vf_untile.c b/libavfilter/vf_untile.c index 9a2eb24901..154b92d08c 100644 --- a/libavfilter/vf_untile.c +++ b/libavfilter/vf_untile.c @@ -136,7 +136,7 @@ static int activate(AVFilterContext *ctx) out->height = outlink->h; out->data[0] += y * out->linesize[0]; out->data[0] += x * s->max_step[0]; - if (!(s->desc->flags & AV_PIX_FMT_FLAG_PAL || s->desc->flags & FF_PSEUDOPAL)) { + if (!(s->desc->flags & AV_PIX_FMT_FLAG_PAL)) { for (i = 1; i < 3; i ++) { if (out->data[i]) { out->data[i] += (y >> s->desc->log2_chroma_w) * out->linesize[i]; diff --git a/libavutil/frame.c b/libavutil/frame.c index 7d5a36b2f1..5bc8ab36df 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -741,7 +741,7 @@ static int calc_cropping_offsets(size_t offsets[4], const AVFrame *frame, int shift_x = (i == 1 || i == 2) ? desc->log2_chroma_w : 0; int shift_y = (i == 1 || i == 2) ? desc->log2_chroma_h : 0; - if (desc->flags & (AV_PIX_FMT_FLAG_PAL | FF_PSEUDOPAL) && i == 1) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL && i == 1) { offsets[i] = 0; break; } diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index bd1333170a..53faad889a 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -123,8 +123,7 @@ int av_image_fill_plane_sizes(size_t sizes[4], enum AVPixelFormat pix_fmt, return AVERROR(EINVAL); sizes[0] = linesizes[0] * (size_t)height; - if (desc->flags & AV_PIX_FMT_FLAG_PAL || - desc->flags & FF_PSEUDOPAL) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL) { sizes[1] = 256 * 4; /* palette is stored here as 256 32 bits words */ return 0; } @@ -250,7 +249,7 @@ int av_image_alloc(uint8_t *pointers[4], int linesizes[4], av_free(buf); return ret; } - if (desc->flags & AV_PIX_FMT_FLAG_PAL || (desc->flags & FF_PSEUDOPAL && pointers[1])) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL) { avpriv_set_systematic_pal2((uint32_t*)pointers[1], pix_fmt); if (align < 4) { av_log(NULL, AV_LOG_ERROR, "Formats with a palette require a minimum alignment of 4\n"); @@ -259,8 +258,7 @@ int av_image_alloc(uint8_t *pointers[4], int linesizes[4], } } - if ((desc->flags & AV_PIX_FMT_FLAG_PAL || - desc->flags & FF_PSEUDOPAL) && pointers[1] && + if (desc->flags & AV_PIX_FMT_FLAG_PAL && pointers[1] && pointers[1] - pointers[0] > linesizes[0] * h) { /* zero-initialize the padding before the palette */ memset(pointers[0] + linesizes[0] * h, 0, @@ -388,8 +386,7 @@ static void image_copy(uint8_t *dst_data[4], const ptrdiff_t dst_linesizes[4], if (!desc || desc->flags & AV_PIX_FMT_FLAG_HWACCEL) return; - if (desc->flags & AV_PIX_FMT_FLAG_PAL || - desc->flags & FF_PSEUDOPAL) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL) { copy_plane(dst_data[0], dst_linesizes[0], src_data[0], src_linesizes[0], width, height); @@ -478,10 +475,6 @@ int av_image_get_buffer_size(enum AVPixelFormat pix_fmt, if (ret < 0) return ret; - // do not include palette for these pseudo-paletted formats - if (desc->flags & FF_PSEUDOPAL) - return FFALIGN(width, align) * height; - ret = av_image_fill_linesizes(linesize, pix_fmt, width); if (ret < 0) return ret; diff --git a/libavutil/internal.h b/libavutil/internal.h index 2ed1c2abb1..854e9cbed2 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -292,15 +292,6 @@ void ff_check_pixfmt_descriptors(void); */ int avpriv_dict_set_timestamp(AVDictionary **dict, const char *key, int64_t timestamp); -// Helper macro for AV_PIX_FMT_FLAG_PSEUDOPAL deprecation. Code inside FFmpeg -// should always use FF_PSEUDOPAL. Once the public API flag gets removed, all -// code using it is dead code. -#if FF_API_PSEUDOPAL -#define FF_PSEUDOPAL AV_PIX_FMT_FLAG_PSEUDOPAL -#else -#define FF_PSEUDOPAL 0 -#endif - // Temporary typedef to simplify porting all AVBufferRef users to size_t #if FF_API_BUFFER_SIZE_T typedef int buffer_size_t; diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index e701005bc0..751843e991 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -341,7 +341,6 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .comp = { { 0, 1, 0, 0, 8 }, /* Y */ }, - .flags = FF_PSEUDOPAL, .alias = "gray8,y8", }, [AV_PIX_FMT_MONOWHITE] = { @@ -446,7 +445,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 0, 3, 3 }, /* G */ { 0, 1, 0, 6, 2 }, /* B */ }, - .flags = AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR4] = { .name = "bgr4", @@ -470,7 +469,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 0, 1, 2 }, /* G */ { 0, 1, 0, 3, 1 }, /* B */ }, - .flags = AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB8] = { .name = "rgb8", @@ -482,7 +481,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 0, 3, 3 }, /* G */ { 0, 1, 0, 0, 3 }, /* B */ }, - .flags = AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB4] = { .name = "rgb4", @@ -506,7 +505,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { { 0, 1, 0, 1, 2 }, /* G */ { 0, 1, 0, 0, 1 }, /* B */ }, - .flags = AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_NV12] = { .name = "nv12", diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index 81b51b767f..9e7cfad983 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -136,26 +136,6 @@ typedef struct AVPixFmtDescriptor { */ #define AV_PIX_FMT_FLAG_RGB (1 << 5) -#if FF_API_PSEUDOPAL -/** - * The pixel format is "pseudo-paletted". This means that it contains a - * fixed palette in the 2nd plane but the palette is fixed/constant for each - * PIX_FMT. This allows interpreting the data as if it was PAL8, which can - * in some cases be simpler. Or the data can be interpreted purely based on - * the pixel format without using the palette. - * An example of a pseudo-paletted format is AV_PIX_FMT_GRAY8 - * - * @deprecated This flag is deprecated, and will be removed. When it is removed, - * the extra palette allocation in AVFrame.data[1] is removed as well. Only - * actual paletted formats (as indicated by AV_PIX_FMT_FLAG_PAL) will have a - * palette. Starting with FFmpeg versions which have this flag deprecated, the - * extra "pseudo" palette is already ignored, and API users are not required to - * allocate a palette for AV_PIX_FMT_FLAG_PSEUDOPAL formats (it was required - * before the deprecation, though). - */ -#define AV_PIX_FMT_FLAG_PSEUDOPAL (1 << 6) -#endif - /** * The pixel format has an alpha channel. This is set on all formats that * support alpha in some way, including AV_PIX_FMT_PAL8. The alpha is always diff --git a/libavutil/version.h b/libavutil/version.h index 81f8690e01..0d015335c3 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_PSEUDOPAL -#define FF_API_PSEUDOPAL (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_CHILD_CLASS_NEXT #define FF_API_CHILD_CLASS_NEXT (LIBAVUTIL_VERSION_MAJOR < 57) #endif diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index c968ea0e85..f510150ea1 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -62,7 +62,7 @@ yuv422p planes: 3, linesizes: 64 32 32 0, plane_sizes: 3072 1536 yuv444p planes: 3, linesizes: 64 64 64 0, plane_sizes: 3072 3072 3072 0, plane_offsets: 3072 3072 0, total_size: 9216 yuv410p planes: 3, linesizes: 64 16 16 0, plane_sizes: 3072 192 192 0, plane_offsets: 3072 192 0, total_size: 3456 yuv411p planes: 3, linesizes: 64 16 16 0, plane_sizes: 3072 768 768 0, plane_offsets: 3072 768 0, total_size: 4608 -gray planes: 2, linesizes: 64 0 0 0, plane_sizes: 3072 1024 0 0, plane_offsets: 3072 0 0, total_size: 4096 +gray planes: 1, linesizes: 64 0 0 0, plane_sizes: 3072 0 0 0, plane_offsets: 0 0 0, total_size: 3072 monow planes: 1, linesizes: 8 0 0 0, plane_sizes: 384 0 0 0, plane_offsets: 0 0 0, total_size: 384 monob planes: 1, linesizes: 8 0 0 0, plane_sizes: 384 0 0 0, plane_offsets: 0 0 0, total_size: 384 pal8 planes: 2, linesizes: 64 0 0 0, plane_sizes: 3072 1024 0 0, plane_offsets: 3072 0 0, total_size: 4096 @@ -71,12 +71,12 @@ yuvj422p planes: 3, linesizes: 64 32 32 0, plane_sizes: 3072 1536 yuvj444p planes: 3, linesizes: 64 64 64 0, plane_sizes: 3072 3072 3072 0, plane_offsets: 3072 3072 0, total_size: 9216 uyvy422 planes: 1, linesizes: 128 0 0 0, plane_sizes: 6144 0 0 0, plane_offsets: 0 0 0, total_size: 6144 uyyvyy411 planes: 1, linesizes: 96 0 0 0, plane_sizes: 4608 0 0 0, plane_offsets: 0 0 0, total_size: 4608 -bgr8 planes: 2, linesizes: 64 0 0 0, plane_sizes: 3072 1024 0 0, plane_offsets: 3072 0 0, total_size: 4096 +bgr8 planes: 1, linesizes: 64 0 0 0, plane_sizes: 3072 0 0 0, plane_offsets: 0 0 0, total_size: 3072 bgr4 planes: 1, linesizes: 32 0 0 0, plane_sizes: 1536 0 0 0, plane_offsets: 0 0 0, total_size: 1536 -bgr4_byte planes: 2, linesizes: 64 0 0 0, plane_sizes: 3072 1024 0 0, plane_offsets: 3072 0 0, total_size: 4096 -rgb8 planes: 2, linesizes: 64 0 0 0, plane_sizes: 3072 1024 0 0, plane_offsets: 3072 0 0, total_size: 4096 +bgr4_byte planes: 1, linesizes: 64 0 0 0, plane_sizes: 3072 0 0 0, plane_offsets: 0 0 0, total_size: 3072 +rgb8 planes: 1, linesizes: 64 0 0 0, plane_sizes: 3072 0 0 0, plane_offsets: 0 0 0, total_size: 3072 rgb4 planes: 1, linesizes: 32 0 0 0, plane_sizes: 1536 0 0 0, plane_offsets: 0 0 0, total_size: 1536 -rgb4_byte planes: 2, linesizes: 64 0 0 0, plane_sizes: 3072 1024 0 0, plane_offsets: 3072 0 0, total_size: 4096 +rgb4_byte planes: 1, linesizes: 64 0 0 0, plane_sizes: 3072 0 0 0, plane_offsets: 0 0 0, total_size: 3072 nv12 planes: 2, linesizes: 64 64 0 0, plane_sizes: 3072 1536 0 0, plane_offsets: 3072 0 0, total_size: 4608 nv21 planes: 2, linesizes: 64 64 0 0, plane_sizes: 3072 1536 0 0, plane_offsets: 3072 0 0, total_size: 4608 argb planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 From patchwork Mon Apr 19 14:10:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27060 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp564810iob; Mon, 19 Apr 2021 07:22:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcVs8LFeXTOeVk0FcEsRlfUJudOhunhQZo20HbxhOQF/T/TFzmIlehneNTu9/ETZiPkh2t X-Received: by 2002:a17:906:6a49:: with SMTP id n9mr22313424ejs.397.1618842145288; Mon, 19 Apr 2021 07:22:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618842145; cv=none; d=google.com; s=arc-20160816; b=zxeazsF3tNYoZ+QDtyZWcW4CqfV289hrPbtEqEMOgAhSnySGSxkt6bVBXNGTnLyz0p yc3q36GjmnnUKmtbYTnb9G25F20NX+k/w+7+xHuhvYq3LmawUe3lQwRQuaaeN5gGha5H Me82XxnMVuk7cKIK5I5N6Np9Q9jSDDmTit9smiUVERAM7cjdo9GpE9+GZ8JvjRMtFllp jha7Nm4l86uxZLFLbkxr4taxoFCfHKQIh431kzyA+B6EnawvmYlXNTT39yqyeXsx0M/R kN6vbbaX5dHPf1Utf/32vatgRAsHSi5w+Rn9fVV5UtoX3loA9FOOUDcSUC/XW/HAqlaE p25g== 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=eapDdpKyzrVHAr9G055m4+IEHITyxVzbKoSzZc5ZR5A=; b=hqPhWLYmM5fMduuZqX3ZXJzXhHIpUZb1Q5RlIqFjovmKkX7fabdc3vobNkX6kWpuM3 lhsZE9obnn08SrtKZhjrBLqt1wpq7dILnLx7E3eBkHlqqkIMvJQfXsJzG73U8X3vo4sB dSCyjCfZx/WJBR2lrHBQA8q8sFu4YGXp50rDfHlrdmPrzFEhXys5Gy+M+qp9dg5k4jcn kU06q84MjHMNtWewDTmBPf30lBwl0Zj9PVrg4ar59NgdvWYjsRpkKbfi3pkIQ2uTXpLP LNpCUMz9jWsYboyFjaIg2yh3vPYTcsBaqyRgpHFclrThv7xMV2c/2n1MAksMnQdY7XYB AFQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qIgz7dDO; 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 ce20si11176897ejc.328.2021.04.19.07.22.24; Mon, 19 Apr 2021 07:22:25 -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=qIgz7dDO; 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 524B8689D21; Mon, 19 Apr 2021 17:12:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E4F0689D21 for ; Mon, 19 Apr 2021 17:12:29 +0300 (EEST) Received: by mail-qt1-f176.google.com with SMTP id a18so2372327qtj.10 for ; Mon, 19 Apr 2021 07:12:29 -0700 (PDT) DKIM-Signature: v=1;