From patchwork Wed Oct 12 13:08:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 38702 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1367072pzb; Wed, 12 Oct 2022 06:09:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6XNeJ+PQuOHFrLdaSKuzI2oB4gVZ0l8elduQ33lKFoKLJAzCMSt8RTx3k5M6z5JZ+fFbDR X-Received: by 2002:a17:906:db03:b0:741:337e:3600 with SMTP id xj3-20020a170906db0300b00741337e3600mr23249754ejb.343.1665580158504; Wed, 12 Oct 2022 06:09:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665580158; cv=none; d=google.com; s=arc-20160816; b=hUrkLgZ7DUp+Pw4xnX4mfeDZP3wpTRuGEHX8dZHd1hOnbODWXx1hUicspi8mwIxRJF lhNd/lKf8k4lfuAbe5FB21cnZYJcKnLPKZfW0UEx7VZWV1ss3PU4WZf5eRcUAjMGigza mO/5cvC0ECLo76fI5Da/uacSb3+OpA4QFQiSVdbxOQg0BKDFy76au8L3vKqgyxMwedMx 4wdn/TGVW9oIfcjc2NxCEagVunEZg4v/5KCalFywOKdlRT7OzP3unNKHNvrjNgDJBAjf VL4b3vtryhJo0rk5rnSDCp6heLFsvQcCGnhYef3jUX0v5BUnEwHhCUhJROaVdWK3Roqw RA3w== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=GqWpoaJS4LuTarSROey62WA+nNvW0TuwVleEaJBSJQo=; b=V/mhZrO2SP9ekqrSB9DemsOuKmFQhTVm1QtaTEtTEpxCdYp819kvORcNNbiEs79+DX 9TW1Pgsz8q8s82ksePN61cHA5clW52hp1WlUN83nuwoWo8Gq92jyDguEqBjRYjw/NNkr RYVr9qThR9hEdpc6vdh6fpHMc7Dy4PXc62HbUCc8D+Q6Rv+uuB/ZpPlIexhd1xoW4XoZ UY7S8jXpHTKvtMz4jIHI9OVVk5QWKJhNd+IiBYX1LQxSDQy8te7L+s5If0E+rm9VwL06 OLezgnRjRMBQR2vZiCYFRdTaSejjaK+D8OAyQFbCTuirUx4c0vYng9w468YJQBnun/yT DqRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=e2DCfVKM; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id oz16-20020a1709077d9000b0072b40bc7412si8834148ejc.223.2022.10.12.06.09.17; Wed, 12 Oct 2022 06:09:18 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=e2DCfVKM; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F0E6E68BCF6; Wed, 12 Oct 2022 16:09:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 C4EA568BA15 for ; Wed, 12 Oct 2022 16:09:05 +0300 (EEST) Received: by mail-oi1-f174.google.com with SMTP id o64so19028146oib.12 for ; Wed, 12 Oct 2022 06:09:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=mxTM5lI/hud57h8nPeHMP1ZVnK7d3dG6xBj14hYddZs=; b=e2DCfVKM8c3GiELj+h/OfD4ZY3suOTpdaey/ZLCMUIzTlFrTis4yoDJF/CDnVJBMWd aHDqSi1qEYDKrr633WdnVRlYWSro4fiHU+XHRi0IaxKTj8FpzupwbaMv6f0h0Ztn+apL 4TJgzsSV20B3cC5A8ARShj+U1k4ztsL9rxcbNUOl2EjiPlvQ2jwa1HHlHkwiyuwcfueK zEagPNKhVG41+DICkvYqv5bqlDv+KnWu9acGbKaCO96TWml7ZNU3FYJvswe8ZzRD5/Fq e2/hLWcsKCNdh8tTT+NjFHmis9Kwffh/TrOOGE2S46MmvFueRKi2O4PzTQv+IHaleSmp vjyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mxTM5lI/hud57h8nPeHMP1ZVnK7d3dG6xBj14hYddZs=; b=GWmescdE0bZp7iZbKHscdeMUte2t76ORmpbJA4wCmMo62BD1fSzfBfkJ+v+fc5TGuJ eeeWj8Ek6AFcyP9w1tsJe7IDh21qnP7/pb11aOYr0RpLIRcz6STVyqK1JgQ0O5HMXz+M 16zWG5iVPl8Xez1WCpUSDE3MUYxooFAWC7YMB3YFGDegyflWsolz8jgWqDM8TVr5Tj+f HQKBHWuPduVzHYx4xrMpTA4WIW/7XbLz7/JBkB4Bu50NU+lfFwzMXAVlYqK/zbb9bof1 2EFqWTN5q2buWEDGzIje5wHTKBbPhqeT9Kb7iDY1fOYyiHFfAzsiKez/mpXwklflucvX LaeA== X-Gm-Message-State: ACrzQf0/SbALf6wK9sRgh8f/WTomYMooiX4hEuyvvLliKC3a384XvXxH BZsgkQRilG543TR9mWHcknFBlNPqF94= X-Received: by 2002:a05:6808:1395:b0:350:d8e8:9048 with SMTP id c21-20020a056808139500b00350d8e89048mr1990380oiw.35.1665580143933; Wed, 12 Oct 2022 06:09:03 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id ch15-20020a0568081c0f00b0035028730c90sm6664092oib.1.2022.10.12.06.09.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Oct 2022 06:09:02 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Oct 2022 10:08:26 -0300 Message-Id: <20221012130829.2392-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4 v2] avcodec/librav1e: support setting sample aspect ratio 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: q7m4vci/hHHs Signed-off-by: James Almer --- Changes since v1: - Ensure we're not passing values like 0/1 as they are not supported by librav1e. libavcodec/librav1e.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index 0601efed2c..a13d6c9eaf 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -298,6 +298,12 @@ static av_cold int librav1e_encode_init(AVCodecContext *avctx) goto end; } + if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) + rav1e_config_set_sample_aspect_ratio(cfg, (RaRational) { + avctx->sample_aspect_ratio.num, + avctx->sample_aspect_ratio.den + }); + rret = rav1e_config_parse_int(cfg, "threads", avctx->thread_count); if (rret < 0) av_log(avctx, AV_LOG_WARNING, "Invalid number of threads, defaulting to auto.\n"); From patchwork Wed Oct 12 13:08:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 38703 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1367162pzb; Wed, 12 Oct 2022 06:09:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4xCGH63VN3tZu+J1eg1y1ECPREmE+i51jcqFQPrs0Id4TAGsRZxWSxqAhQ1pf5lMJmETNb X-Received: by 2002:a05:6402:3552:b0:45c:e4c:e6db with SMTP id f18-20020a056402355200b0045c0e4ce6dbmr15282342edd.403.1665580167459; Wed, 12 Oct 2022 06:09:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665580167; cv=none; d=google.com; s=arc-20160816; b=x3lej6WjHz5XrmPr5JeOVi+ZHTdW7qchCYNcqC/fjP5+MNPa6E7EQxrt1A+gMCPf9w H1DKcs4elTjWMHLzeyWV1F60jRKdtIHTNp3w0t9vyeGc9XeAzDEkvp5pfJWwXGmbiena 3fQ6fPDrvKknAa13f06Ehpc8gLzeAkuqEGcRXwQTmTLo91V/vFbYET7WpZCvdvomc6aB zqTxDexLKQR1z56aeiHbpfXMl2koO3yqftE5kgqdFO0mSBUkTCnZC5uJdRLyImDyy8SG qiOZ/YxQPEBNmg6yXhvexVEPyYObyiVr8QvGi4uEptgeo8LLGDl40eUgI9fLcfYpwjkf woAg== 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:dkim-signature:delivered-to; bh=YMasdtEui99wa5Ne3dx0QTNgDVeDFBipKC4u2SKJh3s=; b=zDBYtxVOOeSpiJaPGfqexiBiSW8i3x6hB3I17xrBaUU9yT9RwIoaeIbBAzmTSPEZOi zTNUnj4gEz8W0tlFjiOkErJq6+AI0kaK4VqmJkWUjVUM02948JKhf8OtBSSdfNK8YL0+ ElnRrPCijiys93wR3rbRhdvY+nEOolF2F+ReYjclzdNBvGeub19MGVzIcPPB0jmrVbC1 /qTQAnNvAopTvujsDiXff8hkTf08VJ20XB5EcxbssgELAkI1rSC2AOv7qvZGEBSKalJ9 m3jcla4N17h0BmBQkXQUIG/xKjPcEiFY89DUnWP2s36EE9qmUuRZ1itq4bd2WFEDxAq8 M/6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Z+3V2OZd; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y1-20020a50eb01000000b0045981993486si4340341edp.227.2022.10.12.06.09.27; Wed, 12 Oct 2022 06:09:27 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Z+3V2OZd; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AF24368BD37; Wed, 12 Oct 2022 16:09:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 915CC68BA15 for ; Wed, 12 Oct 2022 16:09:07 +0300 (EEST) Received: by mail-oi1-f180.google.com with SMTP id n130so2810711oia.6 for ; Wed, 12 Oct 2022 06:09:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xt1/NponVHySUna6SmJLLh6i+yzzJlRKRAddvzrnraA=; b=Z+3V2OZda0O27T4ziVvE86u/28e1ByzECIaCLnGOxtLUY0adHTOOdtVY4KH7hz0Yar 9LjaxHXsvs4QDe0Hos7YOSEwia9calQh/T262rXKwDBrg2DE2iYglg8yhhHDN+PHirRh Hb9TzUQ9Y5MIjgD+a2DGKK5rRTLS0nHCWDGX8Z4ipReRIRYVM/wsLdR1fMWimePsgsHQ Cm8MjRrKw+mBhfNeQZmfwvTLi6RhuLmYQNzdbuM6lRAKHUmiUHRXX4qsOKV78kQH+Es7 pq0Rz5ZnZDGTAcPQgsvreUpa7V/e+VcpxwdeDakRmsf80pRlY0lOf6w64c9BmLifxqHf Zofw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xt1/NponVHySUna6SmJLLh6i+yzzJlRKRAddvzrnraA=; b=7NoW+cfvN0IhrJDO13JN/CVczhL/+GQFvtryVvpqnE5gLoc7qrcmRHGi60ccCArRSk cW4d3RqEoLiKgBqsmvwTxTJbPSI/mkPlKODeBCcoatwLEp33656tEKxM8alPJx7BON6f dda0esiZjmGArsx4OSdT/w/Jrg9qQJMj4P1lUxpwecMi+XPzRULniwtVUVeJBkFXJliK 2RltkOlhtDV8Btm2Gmf3z5KzPACLGZWf/dJMc2gGdocIA2FaY8FfZW3VKZrrbFlBfH6v ZhYQnOGvdBclwA2yaZpzG4dJg/hpBSmcDTNv8++8lPrzTzkXq2p7of8GtF2c6m5bemAH K22g== X-Gm-Message-State: ACrzQf12A+hmihinUpjbsHrqJvw5ateTKBQt3ZFpactvzupzdWIIQsgT DxpNN3gMTkGkmvcTI069VLtLof39Ks0= X-Received: by 2002:a05:6808:f0a:b0:350:61ee:8306 with SMTP id m10-20020a0568080f0a00b0035061ee8306mr2004196oiw.170.1665580145847; Wed, 12 Oct 2022 06:09:05 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id ch15-20020a0568081c0f00b0035028730c90sm6664092oib.1.2022.10.12.06.09.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Oct 2022 06:09:04 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Oct 2022 10:08:27 -0300 Message-Id: <20221012130829.2392-2-jamrial@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221012130829.2392-1-jamrial@gmail.com> References: <20221012130829.2392-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/librav1e: export extradata on init() 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: i1gKOWQwEEce librav1e provides a function to create extradata, so use it instead of extracting the sequence header OBU from packets. Signed-off-by: James Almer --- configure | 1 - libavcodec/librav1e.c | 66 +++++++++++-------------------------------- 2 files changed, 17 insertions(+), 50 deletions(-) diff --git a/configure b/configure index ab6ff27249..84641fd03e 100755 --- a/configure +++ b/configure @@ -3378,7 +3378,6 @@ libopus_decoder_deps="libopus" libopus_encoder_deps="libopus" libopus_encoder_select="audio_frame_queue" librav1e_encoder_deps="librav1e" -librav1e_encoder_select="extract_extradata_bsf" librsvg_decoder_deps="librsvg" libshine_encoder_deps="libshine" libshine_encoder_select="audio_frame_queue mpegaudioheader" diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index a13d6c9eaf..604115476c 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -30,7 +30,6 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avcodec.h" -#include "bsf.h" #include "codec_internal.h" #include "encode.h" #include "internal.h" @@ -41,7 +40,6 @@ typedef struct librav1eContext { RaContext *ctx; AVFrame *frame; RaFrame *rframe; - AVBSFContext *bsf; uint8_t *pass_data; size_t pass_pos; @@ -176,7 +174,6 @@ static av_cold int librav1e_encode_close(AVCodecContext *avctx) } av_frame_free(&ctx->frame); - av_bsf_free(&ctx->bsf); av_freep(&ctx->pass_data); return 0; @@ -245,36 +242,6 @@ static av_cold int librav1e_encode_init(AVCodecContext *avctx) } } - if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { - const AVBitStreamFilter *filter = av_bsf_get_by_name("extract_extradata"); - int bret; - - if (!filter) { - av_log(avctx, AV_LOG_ERROR, "extract_extradata bitstream filter " - "not found. This is a bug, please report it.\n"); - ret = AVERROR_BUG; - goto end; - } - - bret = av_bsf_alloc(filter, &ctx->bsf); - if (bret < 0) { - ret = bret; - goto end; - } - - bret = avcodec_parameters_from_context(ctx->bsf->par_in, avctx); - if (bret < 0) { - ret = bret; - goto end; - } - - bret = av_bsf_init(ctx->bsf); - if (bret < 0) { - ret = bret; - goto end; - } - } - { AVDictionaryEntry *en = NULL; while ((en = av_dict_get(ctx->rav1e_opts, "", en, AV_DICT_IGNORE_SUFFIX))) { @@ -427,6 +394,23 @@ static av_cold int librav1e_encode_init(AVCodecContext *avctx) goto end; } + if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { + RaData *seq_hdr = rav1e_container_sequence_header(ctx->ctx); + + if (seq_hdr) + avctx->extradata = av_mallocz(seq_hdr->len + AV_INPUT_BUFFER_PADDING_SIZE); + if (!seq_hdr || !avctx->extradata) { + rav1e_data_unref(seq_hdr); + av_log(avctx, AV_LOG_ERROR, "Failed to get extradata.\n"); + ret = seq_hdr ? AVERROR(ENOMEM) : AVERROR_EXTERNAL; + goto end; + } + + memcpy(avctx->extradata, seq_hdr->data, seq_hdr->len); + avctx->extradata_size = seq_hdr->len; + rav1e_data_unref(seq_hdr); + } + ret = 0; end: @@ -556,22 +540,6 @@ retry: av_free(rpkt->opaque); rav1e_packet_unref(rpkt); - if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { - int ret = av_bsf_send_packet(ctx->bsf, pkt); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "extradata extraction send failed.\n"); - av_packet_unref(pkt); - return ret; - } - - ret = av_bsf_receive_packet(ctx->bsf, pkt); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "extradata extraction receive failed.\n"); - av_packet_unref(pkt); - return ret; - } - } - return 0; } From patchwork Wed Oct 12 13:08:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 38704 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1367258pzb; Wed, 12 Oct 2022 06:09:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7oev8XxW/xTc/z4w7l0w0eg+2JzAUL6G9XhyTH08wDkiIB/idU5Ym4MAVBkXGUb1O5Zihv X-Received: by 2002:a17:907:94d6:b0:78d:f947:7cf5 with SMTP id dn22-20020a17090794d600b0078df9477cf5mr1478663ejc.446.1665580176944; Wed, 12 Oct 2022 06:09:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665580176; cv=none; d=google.com; s=arc-20160816; b=qBNvoHbRFrvqH90MYyGT1ugTXurF1phrBspm1yzDaOYivRrhelKZuuI1qSJ3Al5Ivw As1on3IBoXg1lzK/ZTfZYRMfzqSpBrws9lQUyEzJ8u4mh78wZJgAzOOmINSlPOuwUNqk RyWZot2t1Tt/XNFhUqBLsryBDeAfnNMC4QNAveAWkV93x5md0GoqEuj4+ZYn9cEFIW0N cXLj5GROh/RyM9+lVW1WeDAe7h+c5v2ICe/2tvrYaXPWqWWut+gmrbDMrlzcIprjSUXg H97nZCEYu4bJUjIeTQlmLf5DHZXn2EovAhm0HDrsDzCuU8wenO6s6VkfckA52tYKTAh4 4h1w== 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:dkim-signature:delivered-to; bh=3hP6LHyYg7MMZBxEaibDgtfEUGyFovZAFTJopa7EUy0=; b=WOTc+k/baUdbZExNJ+AgjmFiBf1Zd1qxfqIjarABDloDz26qm8zBMy55FMe/ZnHBiX RV8Sy1n8dC5yiF9vADlD7AO9k6lwgiwBdEwRy47lagcdkWvV/kuCROJ+D1SbGIIOTC0D stcS+pNYirqSWa/k4CfLYCz3xqLJDu99CNzf9ZDim+jGI1Cx6FUgyeFOh78PX+OBqHAf M21CPqVwgaAQzBOkpWi568jMtutWOEAVWdirio374/oWMARLtzKsQGT1U9a8UllhRo2P 6w0dqwtxAXg2Rfn6T8xBDLMz4ji3O1N3Cc5rN7HRxk9mxhxsV2Y89AqCT2o0q/X5AzqJ B7zA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fKmmq3c7; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k18-20020a05640212d200b0044e78dbb615si13753920edx.379.2022.10.12.06.09.36; Wed, 12 Oct 2022 06:09:36 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fKmmq3c7; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BDBB168BD3B; Wed, 12 Oct 2022 16:09:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 8856868BD37 for ; Wed, 12 Oct 2022 16:09:09 +0300 (EEST) Received: by mail-oi1-f174.google.com with SMTP id y72so12320323oia.3 for ; Wed, 12 Oct 2022 06:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DwD8Sg5Hh6Yr5hhj7OE4eJIuFMh2IAlYbym+5tbtpC4=; b=fKmmq3c7w2gKQ9vGr2ZblqqAUMI3IT997c2RzmtPTBszE/VBkaxamhrn33ZzQ8SSW/ hX/nm3A9nIoujaK7wj46rt8OlmFa0klXumwxpb34YTUzI3nyom11wNA0nHTKWyNl9OLp E2O4c2tJMVdPDYYjJGMVpe7R6KZdi49NNCBfFhREpO82qjXBueXUpEVPPt7mHDu+Qval ex7IJEVvlTp0nSM9nhcXm7SeRirAVVddAFpy5awEhH3DIVc+pQj15x441PEeCKNR72q2 HPwOyQcCPZMnx4Q3EKBvPVwhsAUw7jgKzQLwnAjmQRZHI3L6ay1acJ1CjvutdTcWjNGW jkFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DwD8Sg5Hh6Yr5hhj7OE4eJIuFMh2IAlYbym+5tbtpC4=; b=Kl79XNvHKoWOkjcN2dxe3KpE9KRzXz0AM5v0PhL6IomvcgGnxoMNE9DI/WmqcqSuRl PBqhJ6GHi3ar2atjSMUDw1IAWasxhmzZzDMiT3Ct0ofF8gANJh2nwVk0iyQbSEkGvlxD vNima9ev/Hp443vIhkd3+hjhGKzyVhrTbCoA2TIeUDvOaoeZdjFEzpT7syuv0Fbo8crU g4G2zT8olL87Dsc5YDcbMunBqYqy8ajg1oUO5jb14seWgwPOjVT4VoepMFMy/Qj4kGbJ VVLm19xQ4R3RlVd+W6/QoAP5SCx3j64QPeIABGgTNgpsbHX+PmHq2SposJ9hC2ZQq4Gn MlSw== X-Gm-Message-State: ACrzQf0Js5ZYhTJSUSWhvBCbCCXzKde9nodn91pR2avW2zkFvPtU2syF ar4IeDQMOy9P2uPstB1JYW2OWAU778E= X-Received: by 2002:a05:6808:18a9:b0:354:b872:8a0 with SMTP id bi41-20020a05680818a900b00354b87208a0mr2015884oib.197.1665580147543; Wed, 12 Oct 2022 06:09:07 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id ch15-20020a0568081c0f00b0035028730c90sm6664092oib.1.2022.10.12.06.09.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Oct 2022 06:09:06 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Oct 2022 10:08:28 -0300 Message-Id: <20221012130829.2392-3-jamrial@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221012130829.2392-1-jamrial@gmail.com> References: <20221012130829.2392-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/librav1e: 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: 4CPMyWvJCclQ This bumps the minimum required version to 0.5.0 Signed-off-by: James Almer --- configure | 2 +- libavcodec/librav1e.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 84641fd03e..96479d48d6 100755 --- a/configure +++ b/configure @@ -6674,7 +6674,7 @@ enabled libopus && { enabled libplacebo && require_pkg_config libplacebo "libplacebo >= 4.192.0" libplacebo/vulkan.h pl_vulkan_create enabled libpulse && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new enabled librabbitmq && require_pkg_config librabbitmq "librabbitmq >= 0.7.1" amqp.h amqp_new_connection -enabled librav1e && require_pkg_config librav1e "rav1e >= 0.4.0" rav1e.h rav1e_context_new +enabled librav1e && require_pkg_config librav1e "rav1e >= 0.5.0" rav1e.h rav1e_context_new enabled librist && require_pkg_config librist "librist >= 0.2.7" librist/librist.h rist_receiver_create enabled librsvg && require_pkg_config librsvg librsvg-2.0 librsvg-2.0/librsvg/rsvg.h rsvg_handle_render_cairo enabled librtmp && require_pkg_config librtmp librtmp librtmp/rtmp.h RTMP_Socket diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index 604115476c..130417622a 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -23,6 +23,7 @@ #include #include "libavutil/internal.h" +#include "libavutil/imgutils.h" #include "libavutil/avassert.h" #include "libavutil/base64.h" #include "libavutil/common.h" @@ -538,6 +539,40 @@ retry: pkt->pts = pkt->dts = *((int64_t *) rpkt->opaque); av_free(rpkt->opaque); + + if (avctx->flags & AV_CODEC_FLAG_RECON_FRAME) { + AVCodecInternal *avci = avctx->internal; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); + ptrdiff_t linesizes[4]; + size_t sizes[4]; + + av_frame_unref(avci->recon_frame); + + avci->recon_frame->format = avctx->pix_fmt; + avci->recon_frame->width = avctx->width; + avci->recon_frame->height = avctx->height; + + ret = av_frame_get_buffer(avci->recon_frame, 0); + if (ret < 0) { + rav1e_packet_unref(rpkt); + return ret; + } + + for (int i = 0; i < 4; i++) + linesizes[i] = avci->recon_frame->linesize[i]; + + ret = av_image_fill_plane_sizes(sizes, avctx->pix_fmt, avctx->height, linesizes); + if (ret < 0) { + rav1e_packet_unref(rpkt); + return ret; + } + + for (int i = 0; i < desc->nb_components; i++) { + rav1e_frame_extract_plane(rpkt->rec, i, avci->recon_frame->data[i], + sizes[i], linesizes[i], desc->comp[i].step); + } + } + rav1e_packet_unref(rpkt); return 0; @@ -601,7 +636,7 @@ const FFCodec ff_librav1e_encoder = { .defaults = librav1e_defaults, .p.pix_fmts = librav1e_pix_fmts, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | - AV_CODEC_CAP_DR1, + AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_RECON_FRAME, .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS, .p.wrapper_name = "librav1e", From patchwork Wed Oct 12 13:08:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 38705 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1367344pzb; Wed, 12 Oct 2022 06:09:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6cjFcm1lxZ9vJyG+P2kT1PgyoGeeLfhJe2fvOXX75yynsUHLoaUX57KZz4CEjTsGgCaRoR X-Received: by 2002:a17:907:1dc7:b0:78d:c153:d64a with SMTP id og7-20020a1709071dc700b0078dc153d64amr10110504ejc.429.1665580186401; Wed, 12 Oct 2022 06:09:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665580186; cv=none; d=google.com; s=arc-20160816; b=Fh6nX8p8XcjOPkxFxw8YO9xhE13Ed0wrVIXgqwMpyN2ucJiDtFusbMhm/w5zSZxu3F o+K7L5D53O3+gfLrTrH+GIJlipGBDfgcWGz8U+EEv0NAV6o7jPAxkK27g2QnfPJUNfS/ ioMViDSNTHbRnhz/Ov5WMaaHIpBbP+o14aidZJQVjMo9UG7YccJu2fqeOFtlTILD4xv4 NmJevAoLcdvUApBm4Yr/pzb53kxhbMDhnQ7tdGajyOgJpnFu6slHudiqxNGTI9zCE1LB 0Nu5ww/468Q0fwQ7sfD7Nl5W/V1E1gPmp1BT4Re0GXV8hMEGCTCE/92ACQyPr4SWKfDc l+Iw== 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:dkim-signature:delivered-to; bh=tMRJ8NB58EFxTsRYWi9G4RWlygsisKXJg/gu/2IMG/Q=; b=Hc+lnb42xBM8NxPOLJGGzICNq3RHuKnNFp/CVeXR+N9UTpC71lBFWNvO2YJWg83nN+ AqmARazMr++YzjztdGQDB0XYEXTB9KWdiTlLbO2Zpw/nZInmdZq7rPHgyeuuzWpb34Ve TDJpE+qgBqLTRsjUMleWMUgdPoyOxreeJMmXHpK/ffTg677VUKGxYq0ccIySfBFHCAGF EGbZjngxb3QpunEfyLG/W0C7ncVHnzEqCD/WtYyKDly3mLk9ohR0H6x3BWxr5KRpsuXW 0y0K/SUP83xad3r8AVfJga3EvTSC3kcXoCH55RpUh9daSU2epFphctCd8tBFR5Z7rJs8 vpDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=F3FCvfPa; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t9-20020a50d709000000b004542c9947c1si16409971edi.217.2022.10.12.06.09.45; Wed, 12 Oct 2022 06:09:46 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=F3FCvfPa; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB73868BD53; Wed, 12 Oct 2022 16:09:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f48.google.com (mail-oa1-f48.google.com [209.85.160.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49AF068BC9A for ; Wed, 12 Oct 2022 16:09:11 +0300 (EEST) Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-132fb4fd495so19358182fac.12 for ; Wed, 12 Oct 2022 06:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wyCg6k1YxXbr2bpsHm9dopKjsjnk7hUFWkBtyWEzeNw=; b=F3FCvfPa30yGUxNzbSmW3sAdGw5ohRwpv9NVQNCFfRHjFg7aGD7aUMI9HUvMteTkx/ J9wSmW8gYtAtPHUv5Mv3gvYThTO/4hGxVRWyi2ZRjF3lkEdQx31nXsoWl/rmiHlMD+ID nGG0Ol4Yzaq6Rc2LoM6+K4XHcgPGL9tYxiDsoRU75e07m+p60XdbT2Sh8Xtc5VKusJKq mjT0k+roZB/j/LKDHA7uTXQwqhC9OOgKnR9uXEj/8RSORLW19N+VWQOJvPmhUH2VrRfc ishm6aPhAq49bB69F8h5B7/l8oQ9IqAsAEpKIbcxUkAQQzvfSqFnbYPA+9bEeAXu3u4G eWWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wyCg6k1YxXbr2bpsHm9dopKjsjnk7hUFWkBtyWEzeNw=; b=Ag/5GQQWu3vnR4Cl4wl3aZc4TxooBzzjjDmxmjTuVhp6E8Cl/HvM+MH5cVlJysuZMb 8aNRnKDb1vdVMqWL/V6I8OcOJPaxoFpMfY/ZNEjMqIz9ieOd6yb0Y8hYwe2ILBvUL37t mbBGmTYqhrMO2LYhZmfYuVaIrnowRcNXyX/4ZH0UMEn3MRt7mafevhWN7G1p/YPqZXKX gxtSLHXqqEO3IugjxYuEs0vJ3Swr4Cj1kAURpZzqjIPgBCAJAmA7zJS5sjUMVRV/o7kj mXOObz6TFwXGBm9kRB34hf/Qb2FXqG+Obaq90KPhgPl0dLnJcBfZhKBqtTWavIM3aRlr gnfQ== X-Gm-Message-State: ACrzQf3YBmS50Ser94+OGSIxheVObRyqDUPDudBxbj9wyUBxYJjMxAhp F6jsoWASpnrWxuHoeSJz4Ef7OaBll2Y= X-Received: by 2002:a05:6870:f10f:b0:132:5c4f:5998 with SMTP id k15-20020a056870f10f00b001325c4f5998mr2444945oac.118.1665580149542; Wed, 12 Oct 2022 06:09:09 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id ch15-20020a0568081c0f00b0035028730c90sm6664092oib.1.2022.10.12.06.09.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Oct 2022 06:09:08 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Oct 2022 10:08:29 -0300 Message-Id: <20221012130829.2392-4-jamrial@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221012130829.2392-1-jamrial@gmail.com> References: <20221012130829.2392-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/librav1e: use lavu image helpers where adequate 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: bvfZi/AR6gNv Signed-off-by: James Almer --- libavcodec/librav1e.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index 130417622a..284af34ec4 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -437,6 +437,8 @@ static int librav1e_receive_packet(AVCodecContext *avctx, AVPacket *pkt) if (frame->buf[0]) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); + ptrdiff_t linesizes[4]; + size_t sizes[4]; int64_t *pts = av_malloc(sizeof(int64_t)); if (!pts) { @@ -453,12 +455,20 @@ static int librav1e_receive_packet(AVCodecContext *avctx, AVPacket *pkt) return AVERROR(ENOMEM); } + for (int i = 0; i < 4; i++) + linesizes[i] = frame->linesize[i]; + + ret = av_image_fill_plane_sizes(sizes, frame->format, frame->height, linesizes); + if (ret < 0) { + rav1e_frame_unref(rframe); + av_frame_unref(frame); + av_freep(&pts); + return ret; + } + for (int i = 0; i < desc->nb_components; i++) { - int shift = i ? desc->log2_chroma_h : 0; - int bytes = desc->comp[0].depth == 8 ? 1 : 2; - rav1e_frame_fill_plane(rframe, i, frame->data[i], - (frame->height >> shift) * frame->linesize[i], - frame->linesize[i], bytes); + rav1e_frame_fill_plane(rframe, i, frame->data[i], sizes[i], + linesizes[i], desc->comp[i].step); } av_frame_unref(frame); rav1e_frame_set_opaque(rframe, pts, av_free);