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 AF3D24362C for ; Tue, 19 Jul 2022 12:51:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 606B068B5CB; Tue, 19 Jul 2022 15:51:25 +0300 (EEST) Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54B3568B5B3 for ; Tue, 19 Jul 2022 15:51:18 +0300 (EEST) Received: by mail-oi1-f170.google.com with SMTP id x185so6598884oig.1 for ; Tue, 19 Jul 2022 05:51:18 -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=NiFQ3AJZjmkr6UIvKMJTGumT8g2bg6ZnWBokk3qhpEs=; b=jjiv4c/b7wx+M6OJPpU1APeE3gPu46lEqTw4GvjXfc/ENBKOlfQ1dYI6B/iBgpIddb 1W9MxbEam7aRUAACLBB0+FJ88A3k3lWo1rHGtWWXnhegoiKqh/wP4pG7d+d3+7VodOhz nWOMefzS0SyaE1aM/O2T3aERiAL8dDnCHjBia6vmXIX+cSEeN4yBdE+mjdOS5is2kDM4 HqpKYM1y4hfKMaij3ZFsQcALoWGjT77ZZucMtBc5qRl6l9jDY4Szl/DSkTBqPZ5ZwQpd 9czCKU12KInUVjl3tfzzceUeGZ4bUfjfsiRPcxMsk2BOiaJoruRuwRkYJpOJoqecclsz bbkQ== 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=NiFQ3AJZjmkr6UIvKMJTGumT8g2bg6ZnWBokk3qhpEs=; b=7gGEIH3w0VEREaRg0ZYdSJjVqFOz33Yty1duFqvS3gFuJL+5JBdqOaZVq55xNjnRNF F/I577cd9ORuFdNdsaL5fAlcL2y8AhHmad8S1bz4NyDmge7vajAl1olUBGwbNclBqFOe Cl19KoKyQ+MEespnwRMpC+7uGeCNWVKtTYcxyeun6hVkeE65CBTzwqXBiJEpDP9GxVkj Iku4koB0pKGPmytjPjFQH9LKjfkJPnA+dfk9u8rjKMcBIaAQ4iyYt3dhJjdGE9YYpPcZ 5cq3OKq5WtnU9rucdFkhBKFBsu4TfErO78iQpj2kXFg14T1yMAd8zevue4Uiy0e9uSNY 5C8g== X-Gm-Message-State: AJIora8xpTVhME7AU1dQgWUS04yqn79D5vjLarhP5I24RzZIzqsKwvM8 wlM4/XHdYcW6/eLnFCFInkdeKahvOkomDw== X-Google-Smtp-Source: AGRyM1s45iOc6SBz5KV2G8E+i5u9WaC9VHpucqCHhH9UNJvnwiNCyjr06pV1TxygYLxgS1aFKg1acg== X-Received: by 2002:a05:6808:1b26:b0:33a:782f:b3b4 with SMTP id bx38-20020a0568081b2600b0033a782fb3b4mr4758282oib.250.1658235075687; Tue, 19 Jul 2022 05:51:15 -0700 (PDT) Received: from [192.168.0.11] ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id r6-20020a9d5cc6000000b0061c3246bd42sm6308563oti.44.2022.07.19.05.51.14 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 Jul 2022 05:51:14 -0700 (PDT) Message-ID: Date: Tue, 19 Jul 2022 09:51:13 -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: <20220717192700.1077-4-anton@khirnov.net> <20220719124711.25500-1-anton@khirnov.net> From: James Almer In-Reply-To: <20220719124711.25500-1-anton@khirnov.net> Subject: Re: [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 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/19/2022 9:47 AM, Anton Khirnov wrote: > --- > 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; If this is only >= 122, what will pic_out above contain in older versions? > +#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), _______________________________________________ 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".