From patchwork Mon Jan 16 13:38:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40030 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp1037140pzb; Mon, 16 Jan 2023 05:39:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXvKm1eFB0mtvVWAH4whaLJlqhCynskzDML7J85k+pHs9ZYypK5rg0ZYWP/NnJG90lPfUrpU X-Received: by 2002:a17:906:3850:b0:867:f167:43be with SMTP id w16-20020a170906385000b00867f16743bemr13671996ejc.77.1673876379456; Mon, 16 Jan 2023 05:39:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673876379; cv=none; d=google.com; s=arc-20160816; b=yWgCq+kR3Jf2aBdFgqiaeRjGeyXRTKlFfUv47+BoOrmHb6+G+84A1ahCFFxSRjEJXl bv/hrRvehMfj2fOzAz8V1AhR8PTcU+z6s3ukqBvTN0lIZK0bjD55VVdkgt0hX4UdGEYt Np9DwGKlfO7EOVQ38zqBuILUcE98pGAno/bfruq0GXCytPs0lOr9EkzRw3IbFUkylFk0 XH/jIsttz9WKvGE7swDub8K0w2GglXkm8I/pUZ1EQeTGNmeKnTXmMSfgpf3DdfZghzep qAIVqPaXu+WnUZ52pKb1JBG6lMsXaY4hAz7dyVwpJjk2VJt37pVCLzjxAjRJiniwkJR/ OZVQ== 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=qDoOKWC1SjM+nLcXW/Q7PAlL07WvG7WyOj9HYdwZIWw=; b=lvW6EfIy/xLzXqNLlIRw5PFiRViaWisEbd/a9CkUUUoC5uAuUJ86VKemhe/3tsMjRg AdBacy+UdkRT4TsooyQl93eEUbQTNINumXKfEXquuPF4QYAjYDFdE1lzuxTn6CbQvGx+ lT48tgA5LhVMEW8qH8Ek/8uNZ9aTJFRUEsLReJwxbHMzFuHgiXPGpww132KA10dMZl7L FfHjddl9k+kgrpUjwlSyhpOqeYDBzKw3lJeEZezr1nhSordvDyZh3EACcTEekTU+7Sqf cOPQ1JigHTdmwq9WwK4PXpk1kFZUMKRqGpBg5lNj3fVRjNP4xpsiqBv9MDfGQAqDtjD8 ezqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ftH9pPwF; 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 e6-20020a17090658c600b007a953d421bbsi32805227ejs.322.2023.01.16.05.39.39; Mon, 16 Jan 2023 05:39:39 -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=20210112 header.b=ftH9pPwF; 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 9499F68BDB0; Mon, 16 Jan 2023 15:39:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1668F68B9AC for ; Mon, 16 Jan 2023 15:39:11 +0200 (EET) Received: by mail-oi1-f177.google.com with SMTP id d188so12220098oia.3 for ; Mon, 16 Jan 2023 05:39:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=F8K4Dbizb5WUvoASnTzA2cokDRvHfhTkEte6skDXOrg=; b=ftH9pPwFzJK6pLu9TYNaDiOwTmuGitv25BhWc9eluaVD4T+a8aSex2u3phzWDZM7k4 Z68b8QblYGs/851X/7l7ubQwmyetFqSiEmLtit08X873+sGkyXr8xL1L3CDrNLIO5Fws 4xsZMb5Gn4WpUTcIVthg/FlK5hX+f7/Rqj6cq+ibL5/2wD/8rM4v6I1YpCPlCpiabFnL b2HVWgwzZ8JpZSeFNm83ArvtFQV+NQE50ILh8581fz0eaPV7nuwz4tPLfjkmg1LWC2I9 wN2Cy3pm39rJNNpmotgJPqS82gnKxFtVHHRH30aIVIfApgBeLaa48FvZ2K0pUOnyLJGO XtKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=F8K4Dbizb5WUvoASnTzA2cokDRvHfhTkEte6skDXOrg=; b=w9CeBmWQ/TfrZXrNhu+rBb6qMbqIggsWL1JWOIxEdfAcmrM3de0nGcsAqb/aJcAsxW 3DVQDe5erjktd00r7UMRdd/5YNDEIpHUwIeOFoGDVetxkM9XSv7QE54MAwrJeAA5Rhnv UWtoS0j4SQKkvdIaizZwjDZ0y9Q59a7ZnmCSTwcoZEEfXnOAyscvZB0I+SUVtW+NEoA1 INgQMUb3eNV79SAh6FojrligXuwLxFI64XjsnBrILu+xunjxRMVoKo1sHW00d9l6DLkv Nn3l1q/M2HUuFZ43H5Kr4w7b0skIJdW4mfbJE00asD86fWqUdLEupQjHlLEpLYgFZwS0 r7eg== X-Gm-Message-State: AFqh2kpz0XFNjtKRpOyP5acFFvEU0aQPl9rMVtczYJoUEMXPI6BKIaRB i5U1jMuaHExft5lz7uIKb+difkQ54tQ= X-Received: by 2002:aca:a9c1:0:b0:364:862d:29c5 with SMTP id s184-20020acaa9c1000000b00364862d29c5mr9467388oie.26.1673876349289; Mon, 16 Jan 2023 05:39:09 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id 3-20020a9d0303000000b0066ca9001e68sm388524otv.5.2023.01.16.05.39.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 05:39:08 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jan 2023 10:38:16 -0300 Message-Id: <20230116133840.512-3-jamrial@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116133840.512-1-jamrial@gmail.com> References: <20230116133840.512-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/26] avcodec: remove FF_API_OPENH264_CABAC 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: 3o9reFjTewOU Signed-off-by: James Almer --- libavcodec/libopenh264enc.c | 6 ------ libavcodec/version_major.h | 1 - 2 files changed, 7 deletions(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 99d1c67154..84c1d8b59c 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -50,9 +50,6 @@ typedef struct SVCContext { int max_nal_size; int skip_frames; int skipped; -#if FF_API_OPENH264_CABAC - int cabac; // deprecated -#endif int coder; // rate control mode @@ -72,9 +69,6 @@ static const AVOption options[] = { #undef PROFILE { "max_nal_size", "set maximum NAL size in bytes", OFFSET(max_nal_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "allow_skip_frames", "allow skipping frames to hit the target bitrate", OFFSET(skip_frames), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, -#if FF_API_OPENH264_CABAC - { "cabac", "Enable cabac(deprecated, use coder)", OFFSET(cabac), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE|DEPRECATED }, -#endif { "coder", "Coder type", OFFSET(coder), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE, "coder" }, { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, INT_MIN, INT_MAX, VE, "coder" }, { "cavlc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "coder" }, diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index dbd5f9adba..5199d644ca 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -37,7 +37,6 @@ * at once through the bump. This improves the git bisect-ability of the change. */ -#define FF_API_OPENH264_CABAC (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 60)