From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C34764377B for ; Thu, 28 Jul 2022 14:33:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 97E6168B997; Thu, 28 Jul 2022 17:33:17 +0300 (EEST) Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D563F68B7FC for ; Thu, 28 Jul 2022 17:33:11 +0300 (EEST) Received: by mail-oi1-f174.google.com with SMTP id s204so2611538oif.5 for ; Thu, 28 Jul 2022 07:33:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=3Q88WvUFJfJ3ahXiN2cQ+6PjJ4ARUKFMenqYaTlunEg=; b=leTdeJdX4TPn6GH9voCv4K9GnLwxfpevLqbaOHY6hvlgnlCj2eN7GawJlc+XhTs8d5 qJ1dvTVlk9jXVUQBGeOd41VNNY5pLAplMw+a0mbUd7oP+0BUbWQmr8nrqZ+uLgsiPyKD xkAjNYWKPMxfoYDPjHaLG6gYIB3p6Q3qXFRakB9M13OMHTlxj7EdTxntXAzPAzOQ5JNX W1CgAgrxuXdtYaag0jYkCgWGZCQWxNHhWFjKcGhc0tnCRGq+11hhfkZI/KTgGtaqDFqn lncbUPPOWalGn/hqQkwu0H90Rv4TdHUtZVuVT4K9RkzEegY8i/XBoE7c1JLNfFgMeD11 A4PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=3Q88WvUFJfJ3ahXiN2cQ+6PjJ4ARUKFMenqYaTlunEg=; b=xs/UbFsKOLgR40PKccydMKh4QrqGKebEtXOltRpu9jqz1rNgAG4uc19vcA0szJwF9u +ubMmO4F5EB7mT95HbIoPYZmuqe5JY2ii6XIq231OYOWLTRTxFQEVDSMUonB/842ln5K CGL2I5urv6RMA98I0SwJTxE51Y6ygljKEHAKziq6Vkq7Uno7pQEGSH2CRqG8yDu+WvZ7 wMFYnJGpj/jquuHqwaG7q2WuLCNTzpqVV6n/k3L7JsDqxvyYd8Yav/NZJtrPnWidF8xl h9p09aOltjMj10FLEtBACrZ7GBLeLDme7wtUp5nZpWcfhw1wp2cysYCKGUwr3NZT0lBi FjTw== X-Gm-Message-State: AJIora9EsyVX/WkTSkTirShOj5AFWdo6ZJeC+Ch69GVQIFfOHbbpZZGD UYDFCxROK5/zhWozY2VhVwks6yjznnd5/w== X-Google-Smtp-Source: AGRyM1utdX4Q8dGOQbU7DM02SWpvF12YlvGqaAb348M8LC7YYPO5vt+D9IPq3mlR1tkn1khU+ZnmqQ== X-Received: by 2002:a05:6808:ec8:b0:2f9:6119:d6ed with SMTP id q8-20020a0568080ec800b002f96119d6edmr4090411oiv.215.1659018789791; Thu, 28 Jul 2022 07:33:09 -0700 (PDT) Received: from [192.168.0.11] ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id 68-20020a4a1147000000b004357ccfc8bfsm416240ooc.7.2022.07.28.07.33.08 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 28 Jul 2022 07:33:09 -0700 (PDT) Message-ID: <3a1ffcb2-4919-1933-3e14-d73b773a5571@gmail.com> Date: Thu, 28 Jul 2022 11:33:08 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220728142401.669-1-anton@khirnov.net> From: James Almer In-Reply-To: <20220728142401.669-1-anton@khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH] 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 7/28/2022 11:24 AM, Anton Khirnov wrote: > Bump the version requirement to 122, which introduced b_full_recon. > --- > configure | 2 +- > libavcodec/libx264.c | 55 +++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 55 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 6629d14099..50d73a5325 100755 > --- a/configure > +++ b/configure > @@ -6674,7 +6674,7 @@ enabled libwebp && { > enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion > enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } > enabled libx264 && require_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && > - require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && { > + require_cpp_condition libx264 x264.h "X264_BUILD >= 122" && { > [ "$toolchain" != "msvc" ] || > require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } && > check_cpp_condition libx262 x264.h "X264_MPEG2" > diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c > index e8c1fb2106..6afa3cdadb 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,9 @@ static av_cold int X264_init(AVCodecContext *avctx) > if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) > x4->params.b_repeat_headers = 0; > > + if (avctx->flags & AV_CODEC_FLAG_RECON_FRAME) > + x4->params.b_full_recon = 1; > + > if(x4->x264opts){ > const char *p= x4->x264opts; > while(p){ > @@ -1223,7 +1275,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), LGTM. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".