From patchwork Tue Dec 26 00:44:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 6968 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp6269657jad; Mon, 25 Dec 2017 16:45:13 -0800 (PST) X-Google-Smtp-Source: ACJfBosQG9f6BwEsJMP2ki73hpTvPBMgjR11w6cGL7bv5l6zNEnhzzI5mq4PNDLbas35j0AlRkV9 X-Received: by 10.28.222.132 with SMTP id v126mr19012465wmg.127.1514249113372; Mon, 25 Dec 2017 16:45:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514249113; cv=none; d=google.com; s=arc-20160816; b=tJSGV32nenNZbvBu2OOEbYR+FZPcJAspE5FiNeDeipq+htHQcQb08dt13egBROodeI NxIIFpVWfxTZXQBl8wQFjMpIqR0Vq9w9KM8RXVeCBnYN0v9ubg8rIp5bxySFeMbjx+lc 8UcgYjXhuhnF1ow5RWViNtCoqfl3agC35IHieBYk7B9thvnYM0WXeysCoYcsa3fx9hGg cdFjXQs5X/VJdWN4A9Ix+oonCjV3+vVL8C+Kb66RMkXu8pe9MLzI0lLnz9w4MherMI4F lhT/jNJkhOaT+8kCQHguI7liBJZ3D1LXTN01BU/Qt1ytsUMEoIzlQ+FEzequ3YpD5FMp Qm8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=IZzy2EYRTxF5vZmYib1fa8LKeL9gxjtLpKKQH1OaVRk=; b=zegrLxMTucJzYGrvBK1rNR2sfAkQ+6CBbEgwjwAUQdToS8W+pFe4SHSrAvxDh2l2WN tHsQXR6IxL68JzrMJRBg7xPuchX09VIdNsfu8pNDLPL9R67TuE2ScfOjHCyBYdDaQJWC e4YwwuJYID3muLALNbPQsH781334hRH7+1C0A9Tnkt0fIP54tlAB/6i7z1HieRG4Qlm0 JKSrwgst4aoQEnNFwxcEvTH/Fs0Polb9+Ap2FCECk+Eo7HUuDhDcKyOFbGu/I7LwM34v /wVP3WTV2xY/LwJS0oiy/1FPoX8Ymyz62FUnqZHyJK5hwwz4135vKes7W6ncQTMIUJMj AUvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eb/aOwy3; 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=NONE 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 f30si16940944wra.190.2017.12.25.16.45.13; Mon, 25 Dec 2017 16:45:13 -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=20161025 header.b=eb/aOwy3; 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=NONE 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 DA44C680983; Tue, 26 Dec 2017 02:44:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57A7668065E for ; Tue, 26 Dec 2017 02:44:52 +0200 (EET) Received: by mail-qk0-f193.google.com with SMTP id d202so17688655qkc.9 for ; Mon, 25 Dec 2017 16:45:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=4E78M/O1JOvwtIFcVoXxdE97dQbUhbWXsANr1KenFjw=; b=eb/aOwy3bSObAzO1FlZD7iReQn7kWUVszScDG7hIFF+J9NC1bdtvh+OGOPUAJLRkb6 su5O0McPhrWuwVfsEUpeY8/1Ee6OdCH7fpwruYm0QaOf35GtX0LaWB1cMHXOp4CRqSVP XXfsBKeoViRG51EBhlfN4y9ebU26ufjr5imGiRNWi8UjH+ke5KAzcdUfVdJEE3hYgWjC qNJiNuaPV9F40MHh1rZTepW2svCy37k6syWYfWfSSepbVsWbuw/kNl6pqJsWD0t4wtHm i5k6zTV+7UgGXrgHWjOZFCqoUQw663Z8t3UdodI6tQlYZIrTjT7V3aAbt1Mo9wtMG5oC lfdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=4E78M/O1JOvwtIFcVoXxdE97dQbUhbWXsANr1KenFjw=; b=NEbozeFFDHASzNsCgKIsVfFxQOn8fqrywmlNuZkMaNVsuGzpjMrO/z+rtCGFkiaAl/ kb7fNLSwF9P0vXRhIjuvpH+AW6oh77aEp4NTRNBJ9SYoTLkks7aL4aKaOLWM/KUQ4Jgv JepLLBQv2ur8XyV2M9wr/0gT3Q/YOPprvzjW9mVVvC7uI1SC7dGz/GaZ/pKseXQaAnOr 90GtKeXeR7KM4upBMqdea7Ktt1TJmuj8QLHTLDkzyX6BQVGIFjLp/O1b/FavRu7fZVRE womV3DKwGaKuLZDtHcLu3DkMI+MEVp+uyuKgKZKiGFIhyWl9NSYDSwqvfb+bYdVal8VA czBQ== X-Gm-Message-State: AKGB3mK5hDP2fOGX654rc0E6o0MMAUVC8VRSla2aYZnmga1l265E9lrZ ut/ZzIcNgbgULrUhig2IAOYvzQ== X-Received: by 10.55.160.1 with SMTP id j1mr5151877qke.24.1514249104378; Mon, 25 Dec 2017 16:45:04 -0800 (PST) Received: from localhost.localdomain ([181.229.225.176]) by smtp.gmail.com with ESMTPSA id m6sm12266109qkd.62.2017.12.25.16.45.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Dec 2017 16:45:03 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Dec 2017 21:44:48 -0300 Message-Id: <20171226004448.11024-1-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171226005317.52f6ae4f@debian> References: <20171226005317.52f6ae4f@debian> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/libx264: fix compilation with x264 builds >= 153 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" x264 now supports multibitdepth builds, with a slightly changed API to request bitdepth during initialization. Signed-off-by: James Almer --- libx264 can still be compiled with only 8 or 10 bit format support even after the multibitdepth change, so take that into consideration. libavcodec/libx264.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 2d36c5e566..20ed59fbc4 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -454,6 +454,7 @@ static av_cold int X264_init(AVCodecContext *avctx) { X264Context *x4 = avctx->priv_data; AVCPBProperties *cpb_props; + const av_unused AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); int sw,sh; if (avctx->global_quality > 0) @@ -724,6 +725,9 @@ FF_ENABLE_DEPRECATION_WARNINGS x4->params.i_width = avctx->width; x4->params.i_height = avctx->height; +#if X264_BUILD >= 153 + x4->params.i_bitdepth = desc->comp[0].depth; +#endif av_reduce(&sw, &sh, avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den, 4096); x4->params.vui.i_sar_width = sw; x4->params.vui.i_sar_height = sh; @@ -837,6 +841,24 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; } +static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUVJ420P, + AV_PIX_FMT_YUV422P, + AV_PIX_FMT_YUVJ422P, + AV_PIX_FMT_YUV444P, + AV_PIX_FMT_YUVJ444P, + AV_PIX_FMT_YUV420P10, + AV_PIX_FMT_YUV422P10, + AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_NV12, + AV_PIX_FMT_NV16, + AV_PIX_FMT_NV20, +#ifdef X264_CSP_NV21 + AV_PIX_FMT_NV21, +#endif + AV_PIX_FMT_NONE +}; static const enum AVPixelFormat pix_fmts_8bit[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P, @@ -874,12 +896,14 @@ static const enum AVPixelFormat pix_fmts_8bit_rgb[] = { static av_cold void X264_init_static(AVCodec *codec) { - if (x264_bit_depth == 8) + if (X264_BIT_DEPTH == 8) codec->pix_fmts = pix_fmts_8bit; - else if (x264_bit_depth == 9) + else if (X264_BIT_DEPTH == 9) codec->pix_fmts = pix_fmts_9bit; - else if (x264_bit_depth == 10) + else if (X264_BIT_DEPTH == 10) codec->pix_fmts = pix_fmts_10bit; + else /* X264_BIT_DEPTH == 0 */ + codec->pix_fmts = pix_fmts; } #define OFFSET(x) offsetof(X264Context, x)