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; }