From patchwork Thu Feb 25 14:05:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25986 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 4AC0D441455 for ; Thu, 25 Feb 2021 16:05:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 337DC68A42C; Thu, 25 Feb 2021 16:05:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F147F68A32C for ; Thu, 25 Feb 2021 16:05:33 +0200 (EET) Received: by mail-wr1-f43.google.com with SMTP id d11so5354399wrj.7 for ; Thu, 25 Feb 2021 06:05:33 -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=/H3BYKpeh+wk5+TAiPCaYUN5EBS6dmBEAVQReoaUTYg=; b=stl7OG3NQ790AfN3GXzXOL0aHaaJIlBBlyI4PQw7+NH4Z1xUFHVQWN5spxc4HT1DtT dhqjviIXHArjcQhA4BIadPnO9OVRNjllDl24EJqu1DdbJAGRVMY+KtQKQw3KPFLeHCFS YFAfTz+1Y8BqNV6HycKzKbVfwwbVg8BrTxhcsgqSCYMzs+kr3G9VTKFlbAe7sVeKJcfK cnyJpShjqPebE4o89Wb43ID2RgMXMQoaC5hRGyf/G2sQrRAN/bFJb4dgNNffL6zW42hV 3440PpxhYabt4/3N6NrPlJBZHmb+rMMsB9wI/v659I6ipM075K5JQ4q6lZVE1SeiloJU ft4Q== 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=/H3BYKpeh+wk5+TAiPCaYUN5EBS6dmBEAVQReoaUTYg=; b=eYXCJ4n16mYcu3UiFgucOIxl2U1pVPO17chTEF+4lloo37clLdJA4gz0Uewn7jkgLp lqjvpiPMAJZgQCr7VE07cOO//U4pfsvOxi3PJRgtPnuiS5vJqkH3bgtsIRbnDL6iY8tH fSjImShv+WHr5NBtY+7KSLVMyFFB4IwnTrauTdKP4h0nqFsNAGsOmQNx9ep1azsUwKzv Um0IsvfZINx4BEMehNhfGYhELfJ/GZaFIsVd4Vza/DZweoC13lEOH/ydcC+xahBUbfjC K/0N/8kJHRsWGZ6BimueXJeEkxJ2gUWKqzr8MNbWN02D7QCKEdd8kkwRgwNKeKHi5UX/ /Q2g== X-Gm-Message-State: AOAM530aWOHNBlj6/USQIIQKTm1ZwbFnarz89O3dLPreQSr4oRIJd+IN liqZECp/KRPgdpgJiJSznP2bhkxeUK0= X-Google-Smtp-Source: ABdhPJwGsOsvLN4DaDfDV5JbEHuZUVcaIlLK4plY7xNP1XS3ASX6pY8G6VuIK653ks4NO12rWQXPxA== X-Received: by 2002:adf:d84d:: with SMTP id k13mr3824033wrl.164.1614261933239; Thu, 25 Feb 2021 06:05:33 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id j11sm7952229wrm.13.2021.02.25.06.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Feb 2021 06:05:32 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Feb 2021 15:05:03 +0100 Message-Id: <20210225140505.1249855-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210225140505.1249855-1-andreas.rheinhardt@gmail.com> References: <20210225140505.1249855-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/libx264: Don't use init_static_data for newer versions 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" x264 versions >= 153 can support multiple bitdepths; they also don't export x264_bit_depth any more. The actual check whether a bitdepth is supported is therefore performed at runtime in x264_encoder_open. Ergo it is unnecessary to use init_static_data for these versions: One can already set ff_libx264_encoder.pix_fmts to the value that X264_init_static always sets it to. Signed-off-by: Andreas Rheinhardt --- The actual aim is of course to enable to make ff_libx264_encoder const after the next major bump if a new libx264 version is used. I am currently working on this. libavcodec/libx264.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index ca7cc3a540..212ed7d015 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -1051,19 +1051,17 @@ static const enum AVPixelFormat pix_fmts_8bit_rgb[] = { }; #endif +#if X264_BUILD < 153 static av_cold void X264_init_static(AVCodec *codec) { -#if X264_BUILD < 153 if (x264_bit_depth == 8) codec->pix_fmts = pix_fmts_8bit; else if (x264_bit_depth == 9) codec->pix_fmts = pix_fmts_9bit; else if (x264_bit_depth == 10) codec->pix_fmts = pix_fmts_10bit; -#else - codec->pix_fmts = pix_fmts_all; -#endif } +#endif #define OFFSET(x) offsetof(X264Context, x) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM @@ -1208,7 +1206,11 @@ AVCodec ff_libx264_encoder = { AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, .priv_class = &x264_class, .defaults = x264_defaults, +#if X264_BUILD < 153 .init_static_data = X264_init_static, +#else + .pix_fmts = pix_fmts_all, +#endif #if X264_BUILD >= 158 .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, #else