From patchwork Mon Jan 16 13:38:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40029 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp1037041pzb; Mon, 16 Jan 2023 05:39:30 -0800 (PST) X-Google-Smtp-Source: AMrXdXuP3cfv2RzWYYjO84WmoYOKetLXgEOBaNynnTUx43vARn/CFK1n28PZDfLsTiecbpKkRC0b X-Received: by 2002:a17:907:4d6:b0:84d:3a95:cdf5 with SMTP id vz22-20020a17090704d600b0084d3a95cdf5mr23804745ejb.10.1673876370099; Mon, 16 Jan 2023 05:39:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673876370; cv=none; d=google.com; s=arc-20160816; b=y1tuwaJbaJOtF79OY2ezC8chJ3ls2j0pZQpg512oCtSV+Huf6808kOu/nFPcvg4trc j2KaWKJ8J1D5c9APBu53HmZG8jdu2bZ72qolKKUvdNQREXT742+4HQVxh+ljKSd3c8AG b4mB6x2xn9qf2j+Wc+FibbfVLGUJUDH+5K97r5JhIu+Cmi2ocP+asONURXFpgx0V7dHO MiKZuE+5qGkJaiy9KSfp5UrQM53F8+qfxFY1sHOEOizDmtc1FeppHeRzggstfllixTdu GHRKAn8juimkas6qleFHLqrMVTIropgxiBpEeN8k2o9ijklIAS+v0QfXToZd4mapeTIZ ahzg== 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=UiFx1cgIQsAgAHfmp9rS+neabmB0z0l/A43/jBd5kek=; b=xRpXvF/48mUGex1YLP71TdL1RD+DxwXE3JcONuIB56M2NX6es88GyxxR0wG+R3TtQP Ui+9LS6fVwLPYAoxdbirui/SPcheZGV0tJ72klKzOXm+Lrm0v6u21JIizF66akS3Ha+7 yuPDwcHTxrM2ybfpZwV4MccXU7IsHqIG9BmGs5dLjori+duGg7/7RhBDRfH2RikVp+p1 5/2A/vA0a9Ng415iVtxoPyibC9d0lznUCgzOCWE1QDksuVcb+10zfbuDG5QF8dM//cWz zGySs6BLezI2j3Gag3++mRd6STE/jjj6gVbE3EbDMpA81/MBahR0hUK6ViQhqLs3cb3U 9EFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=petNJrdL; 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 cr19-20020a170906d55300b008366ae33ec2si34394305ejc.595.2023.01.16.05.39.29; Mon, 16 Jan 2023 05:39:30 -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=petNJrdL; 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 8869568BDA5; Mon, 16 Jan 2023 15:39:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DDAA68BD85 for ; Mon, 16 Jan 2023 15:39:10 +0200 (EET) Received: by mail-oi1-f178.google.com with SMTP id j130so23369783oif.4 for ; Mon, 16 Jan 2023 05:39:09 -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=XaJz+XiehrDlDKmjcZlgoJBLQORV0skz6tbGabsiht8=; b=petNJrdLZYY0/CNN1r2rgL7Dwxwo/ypjrkFq9Njhz+lddwZ4vWFQyFJMkVlC0luqjw FxBRdrX4yTragrml0/vLXvLT5+U4I8E8Wl7hvdlokz+EAP4kNX3uShckQQiDgndYIP4f AN5stUxuLbbic9exrskvVi0OuWyrqIV326cfo8ijsV2heZvjvUd04Gs5rE8kfyx2bvLx rAF0FQOz4lLfQXSrD6+Qdym3hrObt79NxrZO5jBMG+NVlnLOtmen+bu9ZZkpNqtO6sUp 7r/ZVxsPRIvEt1twPujDWQMihvYmIqdM1nDPAEQERYj7nGBoCb6ZsN6h6EwTIxMv/hPz Em7A== 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=XaJz+XiehrDlDKmjcZlgoJBLQORV0skz6tbGabsiht8=; b=xURW1AFvYyDcfZ8Ed3Yt79p8OWSnm6w4SCPqckZfogcPULTYPQsMj3uNkLZfllkwyI /PI/X2HppsVck4PTQGxeFYn1LkXkth5xj5OXfXqXAHCnwSdYPzCnA5/xDhcQHox+vZhD DQCFpm+A0d67Uw2vbtngzcUVhMdB0XeaRJ57Zul7ojByF5pC7nlJfWnYeLKm2I9OtPlP yUj06dSQ4GNK0zVtH2fThdcW5gsPP3bunGOqFjHUwzXPVdi/rxKWjbDexUUI5Np6U9GR Jj6YflBqqVPgWMShkWBBYpWCzzAV+W65y1nYn/60psq7E4OdJt2GCBvoIKeuhIv6YfEi Fk3w== X-Gm-Message-State: AFqh2kphXwcNbUXGVqHtdkes5HoVCPmi8E7vsXDx2qq+rH6kXnR+smAS 2stSsyCu/V3RLle8Dfk0Cc9EV6dgW2k= X-Received: by 2002:a05:6808:4347:b0:364:9062:ac62 with SMTP id dx7-20020a056808434700b003649062ac62mr7355362oib.25.1673876348113; Mon, 16 Jan 2023 05:39:08 -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.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 05:39:07 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jan 2023 10:38:15 -0300 Message-Id: <20230116133840.512-2-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 01/26] avcodec: remove FF_API_OPENH264_SLICE_MODE 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: lQiV1rlhbV38 Signed-off-by: James Almer --- libavcodec/libopenh264enc.c | 16 ---------------- libavcodec/version_major.h | 1 - 2 files changed, 17 deletions(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index bbd6969568..99d1c67154 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -63,22 +63,6 @@ typedef struct SVCContext { #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM #define DEPRECATED AV_OPT_FLAG_DEPRECATED static const AVOption options[] = { -#if FF_API_OPENH264_SLICE_MODE -#if OPENH264_VER_AT_LEAST(1, 6) - { "slice_mode", "set slice mode, use slices/max_nal_size", OFFSET(slice_mode), AV_OPT_TYPE_INT, { .i64 = SM_FIXEDSLCNUM_SLICE }, SM_SINGLE_SLICE, SM_RESERVED, VE|DEPRECATED, "slice_mode" }, -#else - { "slice_mode", "set slice mode, use slices/max_nal_size", OFFSET(slice_mode), AV_OPT_TYPE_INT, { .i64 = SM_AUTO_SLICE }, SM_SINGLE_SLICE, SM_RESERVED, VE|DEPRECATED, "slice_mode" }, -#endif - { "fixed", "a fixed number of slices", 0, AV_OPT_TYPE_CONST, { .i64 = SM_FIXEDSLCNUM_SLICE }, 0, 0, VE, "slice_mode" }, -#if OPENH264_VER_AT_LEAST(1, 6) - { "dyn", "Size limited (compatibility name)", 0, AV_OPT_TYPE_CONST, { .i64 = SM_SIZELIMITED_SLICE }, 0, 0, VE, "slice_mode" }, - { "sizelimited", "Size limited", 0, AV_OPT_TYPE_CONST, { .i64 = SM_SIZELIMITED_SLICE }, 0, 0, VE, "slice_mode" }, -#else - { "rowmb", "one slice per row of macroblocks", 0, AV_OPT_TYPE_CONST, { .i64 = SM_ROWMB_SLICE }, 0, 0, VE, "slice_mode" }, - { "auto", "automatic number of slices according to number of threads", 0, AV_OPT_TYPE_CONST, { .i64 = SM_AUTO_SLICE }, 0, 0, VE, "slice_mode" }, - { "dyn", "Dynamic slicing", 0, AV_OPT_TYPE_CONST, { .i64 = SM_DYN_SLICE }, 0, 0, VE, "slice_mode" }, -#endif -#endif { "loopfilter", "enable loop filter", OFFSET(loopfilter), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE }, { "profile", "set profile restrictions", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = FF_PROFILE_UNKNOWN }, FF_PROFILE_UNKNOWN, 0xffff, VE, "profile" }, #define PROFILE(name, value) name, NULL, 0, AV_OPT_TYPE_CONST, { .i64 = value }, 0, 0, VE, "profile" diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 12f863deb7..dbd5f9adba 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_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 60) #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)