From patchwork Tue Jul 19 12:47:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 36839 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1725253pzb; Tue, 19 Jul 2022 05:47:25 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uDa9RCXux1StX2ERs2vUb3Qp9dWKY1qMGwqnp4hCs42cvt0wFq6zRxPK+jQHyKk633QVua X-Received: by 2002:aa7:db09:0:b0:43a:7353:94a6 with SMTP id t9-20020aa7db09000000b0043a735394a6mr44210190eds.191.1658234845262; Tue, 19 Jul 2022 05:47:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658234845; cv=none; d=google.com; s=arc-20160816; b=qvFS/XSoQWvjNj6yFDlA7Tyo0+vqa7bnf9U9c3D6rUyCNaE16ZlY70pbSY7al73q7p Gm3w372QdDigz5CELWnUqA/Es6xrPJ5stOlvBtizUEh5jJUt7jnRGZ/XA+2mHLn2nreT AKJMpC6HmKvbbNgEgDBwbO7DC47Qu0+KyXX7MMxQ7gCudUBggxC7JQy+VGpFnLw5bGcR kDcKX3yua9MgsS1HFVywxDa/W5WdPqNn9NmswTwqqzQm23eWym/J8SzXLSJKZJDjShmP tpTNpKmA+8WCovAoG8ZKXFKhwQ8M0Z+Z/pk9EIi+uewEijYnTViikwB+DiFytIbnXhaA +ctQ== 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:delivered-to; bh=uSwafCV8Fby9om7VfVL4Ar3hGfdTFDrW+NptfBkS3kQ=; b=GhegSdglUB9frPZV5Zc5/s+qWAow2PZkN7R58dnjjrCPNwc6WfJ2QqN/kfunhq+2oq qnqqoGjfU/40lerYU3B5ApjPPrCXSLOkpyhThNPeq/nzpXNqvw5yEVKCDeNb7chbTBpl NRcohmkZUTAw9khzx2Bw8/F1nvBRyMrmLfbqjW93ZMtW/QofFEMuP4aL63bSsuvjpbU0 3M4DcTM3/Bg3yKWhCdjp3V8ZKd+0j5Wz4pr1CvxlMBixYTeMRLaX7uKhHiC9ggLTX1KH NLlKfHl+YPktwQPRIizERYkTxiLM2KP/Dv7LaNWCoFmbBImWD3zYBXBaI57fGVGKhJjc 4mKw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g10-20020a056402428a00b004359a504775si17983813edc.238.2022.07.19.05.47.24; Tue, 19 Jul 2022 05:47:25 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2FD4F68B5E4; Tue, 19 Jul 2022 15:47:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7713A68B4F7 for ; Tue, 19 Jul 2022 15:47:15 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 1E38A240179 for ; Tue, 19 Jul 2022 14:47:15 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id etLsy8xCgge0 for ; Tue, 19 Jul 2022 14:47:14 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 6E4242400F5 for ; Tue, 19 Jul 2022 14:47:14 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 5E58B3A03A9; Tue, 19 Jul 2022 14:47:14 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Jul 2022 14:47:11 +0200 Message-Id: <20220719124711.25500-1-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220717192700.1077-4-anton@khirnov.net> References: <20220717192700.1077-4-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] lavc/libx264: support AV_CODEC_CAP_ENCODER_RECON_FRAME 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: 2Adg77oh0bOp --- Now tested with x264 118, the oldest supported. --- libavcodec/libx264.c | 57 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index e8c1fb2106..04e8147276 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -311,6 +311,28 @@ static void free_picture(AVCodecContext *ctx) pic->extra_sei.num_payloads = 0; } +static enum AVPixelFormat csp_to_pixfmt(int csp) +{ + switch (csp) { +#ifdef X264_CSP_I400 + case X264_CSP_I400: return AV_PIX_FMT_GRAY8; + case X264_CSP_I400 | X264_CSP_HIGH_DEPTH: return AV_PIX_FMT_GRAY10; +#endif + case X264_CSP_I420: return AV_PIX_FMT_YUV420P; + case X264_CSP_I420 | X264_CSP_HIGH_DEPTH: return AV_PIX_FMT_YUV420P10; + case X264_CSP_I422: return AV_PIX_FMT_YUV422P; + case X264_CSP_I422 | X264_CSP_HIGH_DEPTH: return AV_PIX_FMT_YUV422P10; + case X264_CSP_I444: return AV_PIX_FMT_YUV444P; + case X264_CSP_I444 | X264_CSP_HIGH_DEPTH: return AV_PIX_FMT_YUV444P10; + case X264_CSP_NV12: return AV_PIX_FMT_NV12; +#ifdef X264_CSP_NV21 + case X264_CSP_NV21: return AV_PIX_FMT_NV21; +#endif + case X264_CSP_NV16: return AV_PIX_FMT_NV16; + }; + return AV_PIX_FMT_NONE; +} + static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) { @@ -496,6 +518,33 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, if (x264_encoder_encode(x4->enc, &nal, &nnal, frame? &x4->pic: NULL, &pic_out) < 0) return AVERROR_EXTERNAL; + if (nnal && (ctx->flags & AV_CODEC_FLAG_RECON_FRAME)) { + AVCodecInternal *avci = ctx->internal; + + av_frame_unref(avci->recon_frame); + + avci->recon_frame->format = csp_to_pixfmt(pic_out.img.i_csp); + if (avci->recon_frame->format == AV_PIX_FMT_NONE) { + av_log(ctx, AV_LOG_ERROR, + "Unhandled reconstructed frame colorspace: %d\n", + pic_out.img.i_csp); + return AVERROR(ENOSYS); + } + + avci->recon_frame->width = ctx->width; + avci->recon_frame->height = ctx->height; + for (int i = 0; i < pic_out.img.i_plane; i++) { + avci->recon_frame->data[i] = pic_out.img.plane[i]; + avci->recon_frame->linesize[i] = pic_out.img.i_stride[i]; + } + + ret = av_frame_make_writable(avci->recon_frame); + if (ret < 0) { + av_frame_unref(avci->recon_frame); + return ret; + } + } + ret = encode_nals(ctx, pkt, nal, nnal); if (ret < 0) return ret; @@ -928,6 +977,11 @@ static av_cold int X264_init(AVCodecContext *avctx) if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) x4->params.b_repeat_headers = 0; +#if X264_BUILD >= 122 + if (avctx->flags & AV_CODEC_FLAG_RECON_FRAME) + x4->params.b_full_recon = 1; +#endif + if(x4->x264opts){ const char *p= x4->x264opts; while(p){ @@ -1223,7 +1277,8 @@ FFCodec ff_libx264_encoder = { .p.id = AV_CODEC_ID_H264, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | - AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, + AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE | + AV_CODEC_CAP_ENCODER_RECON_FRAME, .p.priv_class = &x264_class, .p.wrapper_name = "libx264", .priv_data_size = sizeof(X264Context),