From patchwork Thu Jan 25 13:43:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45820 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8888:b0:199:de12:6fa6 with SMTP id d8csp81425pzf; Thu, 25 Jan 2024 05:46:23 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVSSSiIe6hLmQcT9d3Uh4cfIE5/yAHQka+5APXfMhhWc35e1Qi3x7YzcHIkqgN5pkITmNtpwX0TTTpCJOS2aW11AUEFFrrtOfCsLA== X-Google-Smtp-Source: AGHT+IF8as60BTr6cXBjmV143lA/ePN8e88Zvt9GTHr4eCRnkxzC/SBR6nTbfDYAB/zejgSgxdg8 X-Received: by 2002:a17:906:3712:b0:a30:91c6:424a with SMTP id d18-20020a170906371200b00a3091c6424amr1193526ejc.5.1706190383453; Thu, 25 Jan 2024 05:46:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706190383; cv=none; d=google.com; s=arc-20160816; b=gSqumwlqC5xMAmq3DD3BsZwgOQq2m9qYwIylnhtJUIH90aNurwIFurzNYiYN8mzhjB v2Q5h3ZcgW5ABMMEvmrqY3C0f56jIuQ5UALBUox76wPhGJzx2mf63MMif2GJX4U8fq+v dl+8VZ2be37paZ/cb7Aiq6xBUFb6XkdwhaUsXChbz6osLrNydkReb2JoBPQ3qH+C31SA nm4yJEb/ET4JIkH6orvDh9GjOaNBEjoX2C/xlo0LDY2w/5mj+Vcsezj/cocJCyftRDqL jPgFHj36Uw9OWnqE3/ZYXG+rubV9OqiGJzs3W3SX44toiVnDwQGUaBNeoJUjTFRhQc9Q W+UQ== 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=CIsfEHuJBzG5e9uHGgfIN9o5TnylMY9a4J3dF5nCqyA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Kky1fuh+LGzLCUYCtr+4jZtetfnopeIYnqSER/InZYCkQaDWxj6zzetxrdE1OELq4v e2LjDlJno13Z5GIcIBpUANcHpt/DwsSQw+r9zVQ1eeOvbyv/aSUN0ln4w7zJV7dlK1Gl 76Q86ENqTz0QjImgfoU5XvFyyU5kzsKOJHOYaa3nTeoZtdEPOyD2CB63qibcqiDf8gsd rIfGtzLoGcQD6nT6orkgyKSYOpQ0gFCqe0o9TSssdgpj2hCOWbNM7mIObX8IwC9t1y6n oyZhmVGWd1iYbyWUf+mIND2BPU2ZIQu9qlo2WWCiWqvZ72ZzVY6QCJBboNnOBKie/RNx 4qmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=gzBdw5w9; 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 lg26-20020a170906f89a00b00a313e699460si940392ejb.222.2024.01.25.05.46.22; Thu, 25 Jan 2024 05:46:23 -0800 (PST) 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=20230601 header.b=gzBdw5w9; 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 57FE768D173; Thu, 25 Jan 2024 15:44:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4DB7D68D129 for ; Thu, 25 Jan 2024 15:44:42 +0200 (EET) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1d7859efea5so10838615ad.0 for ; Thu, 25 Jan 2024 05:44:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706190280; x=1706795080; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FbVPiuAH6400B0VKYlSPomW1GmprLnQw9Z60SM0WAS4=; b=gzBdw5w9dSxRzOYK75oP8ppv9HdaN8FxDebAGa7ocB4P9mNsfLG7sqk8NlX9c02UsW 8oE1i1cyNw+ahb0gxtl6PkNWfLKxjy80iFIDArjtf/viGdE1xEYaUPt6mM7Io+Aovo7d +kZAC/I8JIwCjW4AEYcIMNxCsbAZrlrl1AC2+GIj3ch6+qxvEyLGdda84ME0baKr6eDm fdODi9csn4mMNB6IXtlR+ABQwn7hQ7jsbeMWoShk7hXkWF5afTGuL/gWUTO6X3y1rFPX Be88SUDeWfuSdAsyAo5CGxgx7WCcDB3lj7kjxETTaJ7yFLN+EjdiZR1ksw2w07sqXMfU 9BmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706190280; x=1706795080; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FbVPiuAH6400B0VKYlSPomW1GmprLnQw9Z60SM0WAS4=; b=mnzYm3HybRY8trAf/+3wvwuKUqj6UEA8d5PQPlqgz5um6ZwxE2XZ6FXfuBZ6iFLV3V azZcwa3+IqmBsnRB7PaEQbNcI98tBUmZJbramsKR7JBUrBNJxop0UXSsdfh+/SSjBKd/ Pviy/B7Z86VOakDErgtxeupAbMzOoCuZhGc4VbLEr6uWm8JgTEo3MVz0WFmgfFdF5wHw +v+4OyZtGN780IyVvCiLZRn6NZ9SI/ZgJhviNP/MWfQm7wryaaiupTK/msAavq+KOlVF zmW4jLB1MMvim4eoSnE5pyDfZCFCU+gli2gxmT85fqRhkHxu7QQSwFX8050aQ2mL/mMg T2Qg== X-Gm-Message-State: AOJu0YzNeCebn4cMs4UAAESH/hI4iCsAXuXQIOT2rgqSxEbUDG1R0NiB 8ARgMSP/ZeXhEMlAPqd/ioUDPFnR1FXNj005P1mAQ+UGXuQAioAEGseMfOrL X-Received: by 2002:a17:902:e812:b0:1d7:7c0c:45be with SMTP id u18-20020a170902e81200b001d77c0c45bemr864843plg.32.1706190279748; Thu, 25 Jan 2024 05:44:39 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id k17-20020a170902f29100b001d707a14316sm11785146plc.75.2024.01.25.05.44.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 05:44:39 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jan 2024 10:43:30 -0300 Message-ID: <20240125134425.374-8-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240125134425.374-1-jamrial@gmail.com> References: <20240125134425.374-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/24] avcodec: remove deprecated FF_API_AVCTX_FRAME_NUMBER 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: yzVU8IEIhb5l Signed-off-by: James Almer --- libavcodec/avcodec.c | 5 ----- libavcodec/avcodec.h | 15 --------------- libavcodec/decode.c | 10 ---------- libavcodec/encode.c | 10 ---------- libavcodec/pthread_frame.c | 5 ----- libavcodec/version_major.h | 1 - 6 files changed, 46 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index a6c8629f6c..692d4c35b4 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -282,11 +282,6 @@ FF_ENABLE_DEPRECATION_WARNINGS } avctx->frame_num = 0; -#if FF_API_AVCTX_FRAME_NUMBER -FF_DISABLE_DEPRECATION_WARNINGS - avctx->frame_number = avctx->frame_num; -FF_ENABLE_DEPRECATION_WARNINGS -#endif avctx->codec_descriptor = avcodec_descriptor_get(avctx->codec_id); if ((avctx->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2dd9c5c82b..3c2b0159a9 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1091,21 +1091,6 @@ typedef struct AVCodecContext { */ int frame_size; -#if FF_API_AVCTX_FRAME_NUMBER - /** - * Frame counter, set by libavcodec. - * - * - decoding: total number of frames returned from the decoder so far. - * - encoding: total number of frames passed to the encoder so far. - * - * @note the counter is not incremented if encoding/decoding resulted in - * an error. - * @deprecated use frame_num instead - */ - attribute_deprecated - int frame_number; -#endif - /** * number of bytes per packet if constant and known or 0 * Used by some WAV based audio codecs. diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 2cfb3fcf97..4cd37807db 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -820,11 +820,6 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame) } avctx->frame_num++; -#if FF_API_AVCTX_FRAME_NUMBER -FF_DISABLE_DEPRECATION_WARNINGS - avctx->frame_number = avctx->frame_num; -FF_ENABLE_DEPRECATION_WARNINGS -#endif #if FF_API_DROPCHANGED if (avctx->flags & AV_CODEC_FLAG_DROPCHANGED) { @@ -1032,11 +1027,6 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, if (*got_sub_ptr) avctx->frame_num++; -#if FF_API_AVCTX_FRAME_NUMBER -FF_DISABLE_DEPRECATION_WARNINGS - avctx->frame_number = avctx->frame_num; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } return ret; diff --git a/libavcodec/encode.c b/libavcodec/encode.c index a436be2657..6b0a16fc0b 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -198,11 +198,6 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, ret = ffcodec(avctx->codec)->cb.encode_sub(avctx, buf, buf_size, sub); avctx->frame_num++; -#if FF_API_AVCTX_FRAME_NUMBER -FF_DISABLE_DEPRECATION_WARNINGS - avctx->frame_number = avctx->frame_num; -FF_ENABLE_DEPRECATION_WARNINGS -#endif return ret; } @@ -544,11 +539,6 @@ int attribute_align_arg avcodec_send_frame(AVCodecContext *avctx, const AVFrame } avctx->frame_num++; -#if FF_API_AVCTX_FRAME_NUMBER -FF_DISABLE_DEPRECATION_WARNINGS - avctx->frame_number = avctx->frame_num; -FF_ENABLE_DEPRECATION_WARNINGS -#endif return 0; } diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 71e99a5728..ec6ae8a7fe 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -418,11 +418,6 @@ static int update_context_from_user(AVCodecContext *dst, const AVCodecContext *s dst->skip_frame = src->skip_frame; dst->frame_num = src->frame_num; -#if FF_API_AVCTX_FRAME_NUMBER -FF_DISABLE_DEPRECATION_WARNINGS - dst->frame_number = src->frame_number; -FF_ENABLE_DEPRECATION_WARNINGS -#endif #if FF_API_REORDERED_OPAQUE FF_DISABLE_DEPRECATION_WARNINGS dst->reordered_opaque = src->reordered_opaque; diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 79c6f6dd05..7e8f5bace3 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -38,7 +38,6 @@ */ #define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 61) -#define FF_API_AVCTX_FRAME_NUMBER (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_SLICE_OFFSET (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_SUBFRAMES (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_TICKS_PER_FRAME (LIBAVCODEC_VERSION_MAJOR < 61)