From patchwork Fri Jan 29 05:22:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25257 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 989F744B195 for ; Fri, 29 Jan 2021 07:55:21 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C344689AB4; Fri, 29 Jan 2021 07:55:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A42A1680C9A for ; Fri, 29 Jan 2021 07:55:14 +0200 (EET) Received: by mail-wr1-f47.google.com with SMTP id g10so7648051wrx.1 for ; Thu, 28 Jan 2021 21:55:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4KN7Ai6DX9twZX5d8bYHcgylXq7Q03c82YMlDgoznsc=; b=UmuPv7JVuvAkHuK6c5ngbj1A0M1bSiu+3l5WrTTrvrJHrcX3pYz/vmPUaUBZrViod5 2roz3LYpIhJmEC7dp2aLEkbISKJ9v3Cu+Isy58RYeqdnBnplsRo7DhmJzpuaxZeGpZ6D A1LEznVyaY9mUsd7IffsBtMY8yaxgvQQuHDmXHR5S+hAN/0yCTa3fA47V+neJEV8X1kp q1G0v8NGw2Bwpyb9jpY7OundrhvF4zGE+T9I2TZKRClo7cHqN2DIjJaG+1m2LXEtOn+P dh1V5puKwYwzT1tp7dPj4w90z+31/uC79XGYBiFPHUZSR5EIQc0XrAJia2CDWrZRs3Hf nBnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4KN7Ai6DX9twZX5d8bYHcgylXq7Q03c82YMlDgoznsc=; b=YQmmqYFVIBjo04nWEgXX6K4tgTD0RUBSRk5OMDKERUXk03tCeTy73eDB1ZZQCIk7hg Xaw8RjLJ40csZ1hLDJG6kmM1mHvafiLGiwCesSTDsbn8+EruYosi4vOwxTZkwWdXAlDW XRr/r+OR/AMug2WtJfvtDuzII0jd1hWm8RRN2QeduL7IyxpPCGE36U4xoRnE9/QqevX1 drXwKkbq8iOhNeV9ampry11Lo78pvFOSWLdEIrGBXGLm9LjR61EZqxSBYOmOeLFCthlr 4hxRY0yynvyfzMAtEgNZPHbhdmV9BbaizooSFhuDFv0j2iCgjjQnKyTFC51sFvEqKHMc Cimw== X-Gm-Message-State: AOAM530Lziayl8gOlRqXO922/ceZxVs4dKgRRWohjIL5qEkQtH/uSAUz aHlR+kvN6JsAFyRPp2nOSOPYOBDz9Ns= X-Google-Smtp-Source: ABdhPJzAyNB0+uAj7QCWU2aSWRyS5FeMM1K80LKNpoe31zT+BBAd+U82x5Foxz8aa430U5nvdpEVZA== X-Received: by 2002:a5d:47a2:: with SMTP id 2mr2424732wrb.393.1611897983420; Thu, 28 Jan 2021 21:26:23 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id d13sm10068611wrx.93.2021.01.28.21.26.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 21:26:22 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Jan 2021 06:22:59 +0100 Message-Id: <20210129052302.3124447-10-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210129052302.3124447-1-andreas.rheinhardt@gmail.com> References: <20210129052302.3124447-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/13] avcodec/h264_levels, h265_profile_level: Remove ff_h26[45]_get_level X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Unused. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_levels.c | 12 ------------ libavcodec/h264_levels.h | 3 --- libavcodec/h265_profile_level.c | 12 ------------ libavcodec/h265_profile_level.h | 2 -- 4 files changed, 29 deletions(-) diff --git a/libavcodec/h264_levels.c b/libavcodec/h264_levels.c index dd517f1005..801b27fdd9 100644 --- a/libavcodec/h264_levels.c +++ b/libavcodec/h264_levels.c @@ -75,18 +75,6 @@ static int h264_get_br_factor(int profile_idc) return 1200; } -const H264LevelDescriptor *ff_h264_get_level(int level_idc, - int constraint_set3_flag) -{ - int i; - for (i = 0; i < FF_ARRAY_ELEMS(h264_levels); i++) { - if (h264_levels[i].level_idc == level_idc && - h264_levels[i].constraint_set3_flag == constraint_set3_flag) - return &h264_levels[i]; - } - return NULL; -} - const H264LevelDescriptor *ff_h264_guess_level(int profile_idc, int64_t bitrate, int framerate, diff --git a/libavcodec/h264_levels.h b/libavcodec/h264_levels.h index 0a0f410329..6bba2e8624 100644 --- a/libavcodec/h264_levels.h +++ b/libavcodec/h264_levels.h @@ -36,9 +36,6 @@ typedef struct H264LevelDescriptor { uint8_t max_mvs_per_2mb; } H264LevelDescriptor; -const H264LevelDescriptor *ff_h264_get_level(int level_idc, - int constraint_set3_flag); - /** * Guess the level of a stream from some parameters. * diff --git a/libavcodec/h265_profile_level.c b/libavcodec/h265_profile_level.c index d79c1ab204..7ff9681f65 100644 --- a/libavcodec/h265_profile_level.c +++ b/libavcodec/h265_profile_level.c @@ -120,18 +120,6 @@ static const H265ProfileDescriptor h265_profiles[] = { }; -const H265LevelDescriptor *ff_h265_get_level(int level_idc) -{ - int i; - - for (i = 0; i < FF_ARRAY_ELEMS(h265_levels); i++) { - if (h265_levels[i].level_idc == level_idc) - return &h265_levels[i]; - } - - return NULL; -} - const H265ProfileDescriptor *ff_h265_get_profile(const H265RawProfileTierLevel *ptl) { int i; diff --git a/libavcodec/h265_profile_level.h b/libavcodec/h265_profile_level.h index 2d5bebaecd..f1a11f51dc 100644 --- a/libavcodec/h265_profile_level.h +++ b/libavcodec/h265_profile_level.h @@ -70,8 +70,6 @@ typedef struct H265ProfileDescriptor { } H265ProfileDescriptor; -const H265LevelDescriptor *ff_h265_get_level(int level_idc); - const H265ProfileDescriptor *ff_h265_get_profile(const H265RawProfileTierLevel *ptl);