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 90294435AA for ; Mon, 18 Jul 2022 12:24:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EEF1268B88F; Mon, 18 Jul 2022 15:24:04 +0300 (EEST) Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D5E768B701 for ; Mon, 18 Jul 2022 15:23:58 +0300 (EEST) Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-10c0e6dd55eso23105053fac.7 for ; Mon, 18 Jul 2022 05:23:58 -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=Vb07/fmMMatdlYJAfDgBW6TLNdcgwKQDNJ/DiFcO1LE=; b=dj2R1NnU2o+33sAfoa2HSe4RAI3CrKcDMN8Vu5qklhXnk3yypjQuY2I4s3RVZT1C/z pKY/A4OjW58bRVfiWpOqmi9Ts1PSi0u877lSQhqOku9ZhF0CeGvLsReXPX/Eoxmxpc7c iSRVBFSXdMozGvKIdrmgWBVn0ZyysZkWMpHtWD2mFhB7NraEiob52IDTPf7L8+rfiv8+ +brM+lqyd4jbq027pmcUfZn5Dw+/i3h1X84Ad2j8rhw2ep3SRwKcgjn+wVq2DM1fDmIt pzAGNKxNbwE5ynrJmT3WoHciVcafzpHQjHY7PKm3kiNcZoWqytixKD3Iq7VnjfgGUULq sy4A== 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=Vb07/fmMMatdlYJAfDgBW6TLNdcgwKQDNJ/DiFcO1LE=; b=jfL2lBc7zsi9X3YeEi3ACodYp8D8s1smG6Hkbrc6O3xknzl6SYkqpSW1FC9tkIdz+L ew7bB4EMYYNnn+yh0//eicz9dxYNM8slENGR+CMd1gordSj0DSYa3oYF32+QkTYc/Fkw kO5l4esZLjXtPYrLN/cZVnfi2Xc/gwqE9x5NtXsLENHrgbd0AYHDuXTs9n64oz7SWTVh TZIFXAq293ZrZqNd7WSGJpMwVTDkoXdH9z2rYapBuuXNSrrEn7qX595RrYCS16OiIMYg ySurfu8/qUacBcTVDfkfmCzy8ryJVDaF8eiK0b/tqlXXR2xn10kWqvURx1egOPv50nbo i+OQ== X-Gm-Message-State: AJIora9ECxRomc42fuypalbDeZGcgwjWvF5ehIqOGiSEHFiy6c+FQOIo uqsPSr6H5lEQDjw3Yb6SxMTKOAjM+z/dtQ== X-Google-Smtp-Source: AGRyM1tzyvNv6HJO+k7Cm/iWgwOFoBxYGQ5QOXli8tIb375U9fc8HwXx1e/J2Xfzzp1BT8Er6mA+cg== X-Received: by 2002:a05:6808:16a1:b0:2f9:bfea:e5f3 with SMTP id bb33-20020a05680816a100b002f9bfeae5f3mr13251814oib.28.1658147036127; Mon, 18 Jul 2022 05:23:56 -0700 (PDT) Received: from [192.168.0.13] ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id o21-20020a9d7655000000b0061c4e836233sm4994802otl.8.2022.07.18.05.23.54 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 18 Jul 2022 05:23:55 -0700 (PDT) Message-ID: <8f3313ba-de91-6ea7-6bef-03ea0dfe0d33@gmail.com> Date: Mon, 18 Jul 2022 09:23:58 -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: <20220717220619.GO2088045@pb2> <20220718071225.4446-1-anton@khirnov.net> From: James Almer In-Reply-To: <20220718071225.4446-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/18/2022 4:12 AM, Anton Khirnov wrote: > --- > libavcodec/libx264.c | 52 +++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 51 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c > index 98ec030865..5e360682e6 100644 > --- a/libavcodec/libx264.c > +++ b/libavcodec/libx264.c > @@ -311,6 +311,25 @@ 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; We're still supporting old x264 versions, so you should add some considerations for 9 bit pixfmts. On X264_BUILD < 153, just check the value of x264_bit_depth. > + case X264_CSP_NV12: return AV_PIX_FMT_NV12; > + case X264_CSP_NV16: return AV_PIX_FMT_NV16; Missing X264_CSP_NV21 (wrapped like X264_CSP_I400). That aside, LGTM. > + }; > + return AV_PIX_FMT_NONE; > +} > + > static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, > int *got_packet) > { > @@ -496,6 +515,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 +974,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 +1272,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), _______________________________________________ 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".