From patchwork Sat May 20 19:00:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41749 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp709008pzb; Sat, 20 May 2023 12:00:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4M2/yeenmv/eJpViVlGLDMAIrO7q/SUgY++vgk7WdwY+Zv82tVn9yJoVgyL36nKVTs/GYZ X-Received: by 2002:a17:906:dc92:b0:965:ffda:b9d2 with SMTP id cs18-20020a170906dc9200b00965ffdab9d2mr5496731ejc.11.1684609242644; Sat, 20 May 2023 12:00:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684609242; cv=none; d=google.com; s=arc-20160816; b=FVSmo8dyFWS3FdwDXVK4ViR07ZRKpMC81lE+Rat1+uhkIkPjtAvP7RExlYTm6MYk/R LaTC6DbcZuV/+XbHtmpbH643S1W8khuNQ/VKjuCObmMt75fcu6fhy/c1VtU2toqf7spr V1JqTsxm9JQzmEWQ23/1juaaCZEfYTBT33/BFl81Gg4S/A1K2nupjekxU0TbNKA2WvzC MNpBEbwA00XE3blr9gQy3zbtBJ6t90ks012r6JHUmQxyqt7VJAAapHldXoOW+K3bZCbF EyfKA3Bil79WTO2hT75kgVvbrpelC85FBo/UOsDY//+XHItoLiNNee1hp4WI915iuKe2 ee/g== 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=i6NNIDJtuO29Dq3L4faaTJCIj6pQS9YCKvfSvFd4c2Q=; b=AP1uK/TKvR733SlMKmQN/cp+8/kbxqLKRPmH6+VMIPMczYwoWv1Nn2QCtu/nLshA70 532k5AD6aDiSGjPz7bKWL3nn1pT23E7xqGfWqe+nZXj/VLyDHcfyiL9YMfjzxTr9dfcP qNDs9SV1C+aExUE6w/hQtfuSjrArDKyYsPB6fevWV+8u1xUffk353Ho6E+SUrwySbJZb rrJ5JLycUY9tK2lHooMC9sbYrDOv9v1HXbyzC3UNdFbmpXO+ZE32xRSTcVlfdZ14ud2r 1GFMyRMUwp872BNa/GSNBMJJrOKakMWjR2iNVWw6jPV4RIbrsXw5tT0IfDpMTDfAy43f R/lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Q6cWq38S; 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 si4-20020a170906cec400b0096f523eff33si352085ejb.962.2023.05.20.12.00.41; Sat, 20 May 2023 12:00:42 -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=20221208 header.b=Q6cWq38S; 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 2F2646807A1; Sat, 20 May 2023 22:00:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4EC16807A1 for ; Sat, 20 May 2023 22:00:31 +0300 (EEST) Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-6af6fe73f11so92045a34.0 for ; Sat, 20 May 2023 12:00:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684609230; x=1687201230; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=WKuSZmtZEB6MHhdtn2Fy01BQQ6M06qtWOi0weVXiEus=; b=Q6cWq38SrOOIcD2+ytmMDbeTIY6AygyBfMDbO+tTfIgbIz4sfg9vi5bausekcEEvzI OrSqsMWRJUXRNyMRSbTmtLawu00f3djiPyCA+H/+M2zqzpuGkMf0zLrO0zmz+ymKgVlK EsTWUArSJHRlJ6VoW+kjh4m8Z+5bZOa18V/sp7DVNKR9IDDaUb78gVjfJpw22AxGoBW0 ixXbm4Vt/oGBVnRp2PrW2r6fIyIsNx++x6er1NfgYSmgzlKCIsLOsC33R/UMS0JlQDOc CjYy+NK9UDVLQTgJ8cveLVfrlA0mExqlmnDPMyx9Hj5DfWb5wQq2Ozxzl7NZcSIOB9yj uT1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684609230; x=1687201230; 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=WKuSZmtZEB6MHhdtn2Fy01BQQ6M06qtWOi0weVXiEus=; b=TTFYUa2zGOxplK4yrjoCTRpCcDRi/4ONNR0WYufSd8rl2NBkQDdnFjkGevbBZjGlja RiZ9SiPtlyricqRV3qvXu187gsm/7iqxn2vs8vUlaJXZmmciSqdsfVsYr960o76aPe/c si84vVM5fa/Bb3YwKZ9mvbhkK7MiD90FAx5YbTI1De3UG2Ql09Ng8jDrmZn51Bvc0q9S NqZYriq7H91euoEAJmo3wtGDDBiueNP//lz045I/veSgxP+QEChtLMBq9SKJSGee9Ag4 myR2N6+WATESlGzu3CxrqjrFGA6PPQqzJZXGOj0d0eKuHbxWK5qabYsHQjTtvatLiQFw H5Hw== X-Gm-Message-State: AC+VfDwvRDhnZj4l0dyr+17QeXMaQ7o12ciRphasHFfbZDWcJHiks5Qn rOtmpa3EfCjU69f29jh8Z/xvTMTTX8c= X-Received: by 2002:a9d:77cf:0:b0:6ab:1c78:d5e with SMTP id w15-20020a9d77cf000000b006ab1c780d5emr3079050otl.5.1684609229561; Sat, 20 May 2023 12:00:29 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id z13-20020a0568301dad00b006ab26c69534sm812906oti.23.2023.05.20.12.00.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 12:00:29 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 May 2023 16:00:32 -0300 Message-Id: <20230520190032.3190-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] avcodec/av1dec: convert to receive_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: IHt6etQKIzLe This removes the overhead of inserting the av1_frame_split bsf as part of the decoding process. Signed-off-by: James Almer --- configure | 2 +- libavcodec/av1dec.c | 77 ++++++++++++++++++++++++++++++++++----------- libavcodec/av1dec.h | 4 +++ 3 files changed, 63 insertions(+), 20 deletions(-) diff --git a/configure b/configure index a54398c57f..87f7afc2e1 100755 --- a/configure +++ b/configure @@ -2776,7 +2776,7 @@ asv1_encoder_select="aandcttables bswapdsp fdctdsp pixblockdsp" asv2_decoder_select="blockdsp bswapdsp idctdsp" asv2_encoder_select="aandcttables bswapdsp fdctdsp pixblockdsp" atrac1_decoder_select="sinewin" -av1_decoder_select="av1_frame_split_bsf cbs_av1 atsc_a53" +av1_decoder_select="cbs_av1 atsc_a53" bink_decoder_select="blockdsp hpeldsp" binkaudio_dct_decoder_select="wma_freqs" binkaudio_rdft_decoder_select="wma_freqs" diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index d46ee48335..6951e8ea1e 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -32,6 +32,7 @@ #include "bytestream.h" #include "codec_internal.h" #include "decode.h" +#include "internal.h" #include "hwconfig.h" #include "profiles.h" #include "thread.h" @@ -760,6 +761,7 @@ static const CodedBitstreamUnitType decompose_unit_types[] = { static av_cold int av1_decode_init(AVCodecContext *avctx) { + AVCodecInternal *avci = avctx->internal; AV1DecContext *s = avctx->priv_data; AV1RawSequenceHeader *seq; int ret; @@ -767,6 +769,8 @@ static av_cold int av1_decode_init(AVCodecContext *avctx) s->avctx = avctx; s->pix_fmt = AV_PIX_FMT_NONE; + s->pkt = avci->in_pkt; + for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++) { s->ref[i].f = av_frame_alloc(); if (!s->ref[i].f) { @@ -1041,11 +1045,11 @@ static int export_film_grain(AVCodecContext *avctx, AVFrame *frame) return 0; } -static int set_output_frame(AVCodecContext *avctx, AVFrame *frame, - const AVPacket *pkt, int *got_frame) +static int set_output_frame(AVCodecContext *avctx, AVFrame *frame) { AV1DecContext *s = avctx->priv_data; const AVFrame *srcframe = s->cur_frame.f; + AVPacket *pkt = s->pkt; int ret; // TODO: all layers @@ -1079,7 +1083,7 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif - *got_frame = 1; + av_packet_unref(pkt); return 0; } @@ -1145,22 +1149,29 @@ static int get_current_frame(AVCodecContext *avctx) return ret; } -static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, - int *got_frame, AVPacket *pkt) +static int av1_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) { AV1DecContext *s = avctx->priv_data; AV1RawTileGroup *raw_tile_group = NULL; - int ret; + int i = 0, ret; - ret = ff_cbs_read_packet(s->cbc, &s->current_obu, pkt); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "Failed to read packet.\n"); - goto end; + if (!s->current_obu.nb_units) { + ret = ff_decode_get_packet(avctx, s->pkt); + if (ret < 0) + return ret; + + ret = ff_cbs_read_packet(s->cbc, &s->current_obu, s->pkt); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to read packet.\n"); + goto end; + } + + s->nb_unit = 0; + av_log(avctx, AV_LOG_DEBUG, "Total OBUs on this packet: %d.\n", + s->current_obu.nb_units); } - av_log(avctx, AV_LOG_DEBUG, "Total obu for this frame:%d.\n", - s->current_obu.nb_units); - for (int i = 0; i < s->current_obu.nb_units; i++) { + for (i = s->nb_unit; i < s->current_obu.nb_units; i++) { CodedBitstreamUnit *unit = &s->current_obu.units[i]; AV1RawOBU *obu = unit->content; const AV1RawOBUHeader *header; @@ -1251,13 +1262,15 @@ static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, goto end; } + ret = 0; if (s->cur_frame.f->buf[0]) { - ret = set_output_frame(avctx, frame, pkt, got_frame); + ret = set_output_frame(avctx, frame); if (ret < 0) av_log(avctx, AV_LOG_ERROR, "Set output frame error.\n"); } s->raw_frame_header = NULL; + i++; goto end; } @@ -1361,6 +1374,7 @@ static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, } if (raw_tile_group && (s->tile_num == raw_tile_group->tg_end + 1)) { + int show_frame = s->raw_frame_header->show_frame; if (avctx->hwaccel && s->cur_frame.f->buf[0]) { ret = avctx->hwaccel->end_frame(avctx); if (ret < 0) { @@ -1375,8 +1389,9 @@ static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, goto end; } + ret = 0; if (s->raw_frame_header->show_frame && s->cur_frame.f->buf[0]) { - ret = set_output_frame(avctx, frame, pkt, got_frame); + ret = set_output_frame(avctx, frame); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Set output frame error\n"); goto end; @@ -1384,13 +1399,36 @@ static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, } raw_tile_group = NULL; s->raw_frame_header = NULL; + if (show_frame) { + i++; + goto end; + } } } + ret = 1; end: - ff_cbs_fragment_reset(&s->current_obu); - if (ret < 0) + av_assert0(i <= s->current_obu.nb_units); + s->nb_unit = i; + + if (ret < 0 || s->current_obu.nb_units == i) { s->raw_frame_header = NULL; + av_packet_unref(s->pkt); + ff_cbs_fragment_reset(&s->current_obu); + s->nb_unit = 0; + } + + return ret; +} + +static int av1_receive_frame(AVCodecContext *avctx, AVFrame *frame) +{ + int ret; + + do { + ret = av1_receive_frame_internal(avctx, frame); + } while (ret > 0); + return ret; } @@ -1404,6 +1442,7 @@ static void av1_decode_flush(AVCodecContext *avctx) av1_frame_unref(avctx, &s->cur_frame); s->operating_point_idc = 0; + s->nb_unit = 0; s->raw_frame_header = NULL; s->raw_seq = NULL; s->cll = NULL; @@ -1411,6 +1450,7 @@ static void av1_decode_flush(AVCodecContext *avctx) while (av_fifo_read(s->itut_t35_fifo, &itut_t35, 1) >= 0) av_buffer_unref(&itut_t35.payload_ref); + ff_cbs_fragment_reset(&s->current_obu); ff_cbs_flush(s->cbc); } @@ -1437,14 +1477,13 @@ const FFCodec ff_av1_decoder = { .priv_data_size = sizeof(AV1DecContext), .init = av1_decode_init, .close = av1_decode_free, - FF_CODEC_DECODE_CB(av1_decode_frame), + FF_CODEC_RECEIVE_FRAME_CB(av1_receive_frame), .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_AVOID_PROBING, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_SETS_PKT_DTS, .flush = av1_decode_flush, .p.profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles), .p.priv_class = &av1_class, - .bsfs = "av1_frame_split", .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_AV1_DXVA2_HWACCEL HWACCEL_DXVA2(av1), diff --git a/libavcodec/av1dec.h b/libavcodec/av1dec.h index cef899f81f..59ffed1d9b 100644 --- a/libavcodec/av1dec.h +++ b/libavcodec/av1dec.h @@ -28,6 +28,7 @@ #include "libavutil/frame.h" #include "libavutil/pixfmt.h" #include "avcodec.h" +#include "packet.h" #include "cbs.h" #include "cbs_av1.h" @@ -68,6 +69,7 @@ typedef struct AV1DecContext { enum AVPixelFormat pix_fmt; CodedBitstreamContext *cbc; CodedBitstreamFragment current_obu; + AVPacket *pkt; AVBufferRef *seq_ref; AV1RawSequenceHeader *raw_seq; @@ -90,6 +92,8 @@ typedef struct AV1DecContext { AV1Frame ref[AV1_NUM_REF_FRAMES]; AV1Frame cur_frame; + int nb_unit; + // AVOptions int operating_point; } AV1DecContext;