From patchwork Sat Feb 2 15:05:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Volkert X-Patchwork-Id: 11956 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 5F0164465CA for ; Sat, 2 Feb 2019 17:05:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A40668A898; Sat, 2 Feb 2019 17:05:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34D3368A88D for ; Sat, 2 Feb 2019 17:05:22 +0200 (EET) Received: from snake.fritz.box ([84.170.34.24]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Mc8Pz-1gXbC22DTT-00JaP9 for ; Sat, 02 Feb 2019 16:05:21 +0100 From: Thomas Volkert To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Feb 2019 16:05:21 +0100 Message-Id: <20190202150521.6374-1-silvo@gmx.net> X-Mailer: git-send-email 2.17.1 X-Provags-ID: V03:K1:4MD8j9wKGBCeHlVV4nW1oL1tdt/zZyyKV/WV0hzTo6fjR+EdHq3 dC8df8K7JcoKUp6Z0LYwUom6Hmh4sh68tYZlUoDRF6pz5FyRveHz3xPKqOUb5EBLFCO6OFq TKWV+8eXZ8Glm5APSZrx9eF863Yemc9kc5JGHsmMB+JA0Oj25feEz+vsWAS3Q4T1FiLvxJ/ Sj0QSWvqVkvrPDUOF7Y/Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:/WScAF38QIk=:ofqE4pixFrhl8tfePjFwM9 Ye/AYFa8oiDOtxgIYo6ubm5CJ1Pg9mmtN2ox17P+WPqA+PyTialpnFWSVvXISVVehpasBAfck 6+QkLjTHVO/ffpwrCG5XU/YSjcMU11wR45gr2/Z1KCstcmO4fBqOuHGjk9frXZGcsXwdjz+Cg RZPo6hzBXimqxJmduqunlFAHRIaPJOftiZAG18Sib8P+2S6VGfgYpgwuT8X10DlcuxZvtNHs1 ttfhue3bQiIhrG4LIqapCbRejAERI/3RFzMIXtmuzZn7Bp4fZTTCabs48t8mptYJoBk7HHGOr ji3HsUoCUPQO1m+xbaf0ACHnMrMa3CC0S6jHCqZXfZFB4q6ExSPYt5KxV+Q8bp/iQx08xsaDg BmKRvhU9cQWrT/V5qKKy11R13FhzeQ9GhFyb+5Jk7Vhj7rIab8hoLZ3/fl9bpgmLLUR8Sx2LS CZ7mrAeCHOR4UljkNhJwZ4r+eBr4kEbvS8APjLtAwAB/Z9tF8ATG7MVMS+HH0mqWehzuwdHec 06H8rhOsBY27KqWzcsJbf428+XAucVam3Oyc/IJm6Nzd4RHOGOZU2QXqm51KZ7tNYw8l3ukE7 VswhBmiCUFIwaZiZ5Pqkwb1xoXgCF8ieazLKUl8iPK8/EhZ6K/fJAmXP7O9SG9EclMIjaidmQ RLHT+3mZMMtaZ1lcDWEVTuexZkyTpLJfZCO/1DKwWWgB+xRqZ0iAiZBr+fvdPbQGfcDCcVeZ9 EpvjpFuTQ9CjpWZstMm9fBPbd7tortpJ1UfRCiRZJPf65HfVPE23axObT5QXTtnETqL7+v4Ii Lh295pchKs2iGJK9PettHPT/rniUZEphEJWZbSenCMFUdoz6cLh8ruB6EtIqo79VQ6OifbMRS LWAYlG5fE+SwvNK351Mm4mUB2aiuy/U//KnUaLPtaV5ZmMcSiAKP1SYFuSHy8r Subject: [FFmpeg-devel] [PATCH] avcodec/libx264: support BGRA pixel format 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" From: Thomas Volkert --- libavcodec/libx264.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index a3493f393d..dd51fdc6dc 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -158,6 +158,9 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt, static int avfmt2_num_planes(int avfmt) { switch (avfmt) { + case AV_PIX_FMT_BGRA: + return 4; + case AV_PIX_FMT_YUV420P: case AV_PIX_FMT_YUVJ420P: case AV_PIX_FMT_YUV420P9: @@ -511,13 +514,10 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) case AV_PIX_FMT_YUV444P9: case AV_PIX_FMT_YUV444P10: return X264_CSP_I444; #if CONFIG_LIBX264RGB_ENCODER - case AV_PIX_FMT_BGR0: - return X264_CSP_BGRA; - case AV_PIX_FMT_BGR24: - return X264_CSP_BGR; - - case AV_PIX_FMT_RGB24: - return X264_CSP_RGB; + case AV_PIX_FMT_BGRA: return X264_CSP_BGRA; + case AV_PIX_FMT_BGR0: return X264_CSP_BGRA; + case AV_PIX_FMT_BGR24: return X264_CSP_BGR; + case AV_PIX_FMT_RGB24: return X264_CSP_RGB; #endif case AV_PIX_FMT_NV12: return X264_CSP_NV12; case AV_PIX_FMT_NV16: @@ -987,6 +987,7 @@ static const enum AVPixelFormat pix_fmts_all[] = { }; #if CONFIG_LIBX264RGB_ENCODER static const enum AVPixelFormat pix_fmts_8bit_rgb[] = { + AV_PIX_FMT_BGRA, AV_PIX_FMT_BGR0, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB24,