From patchwork Fri May 19 23:59:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41728 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp185752pzb; Fri, 19 May 2023 16:59:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ61/eOFFHzBlX6N/ADoHAesir2VPCaxMAaDwKcy/NKCwFy3xpkftl8U//gIcDlQgCeBXBsq X-Received: by 2002:a17:907:26c8:b0:965:fa80:bf1 with SMTP id bp8-20020a17090726c800b00965fa800bf1mr3623356ejc.32.1684540788250; Fri, 19 May 2023 16:59:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684540788; cv=none; d=google.com; s=arc-20160816; b=P3+BOqXs/VcGl5TfXg4Xs1nRxsB+q4EDAY3ZMC/mOfqWFURRTrjSOp5QFoOmSrn9h5 WyzEkUzp2GdMOEZf5QsFmcZNeLdqpFbXfs72eTnCxWNZFoqP3F6+M3/9lfPae9QtaQ4e 2WDJUEYNSBsgqXghDr/nFjNomAc2mZLUFwJANgv9K50U7msDXyg740TLd2zfSOGZAt8g MYhycMOx2wnD6hRsvXXet/QQS01okhwV0su9flL2QwMEzOrmBUoUNgkCCU5tH+/PGxaj H187xhjyiR/sn6CndFHgVgF1I0IPzQQo0aWyu3v5LY+hvX4G/9LI2/UChROR3eMliUzP MFpA== 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=hFwrjiC2Mlx+P1nnxROXtqSxLp9h25rds1eXXYt2FU4=; b=TL7QqTNn/jPvxCuTGERkVxDjr5nWn+CNL24q9+o/Z7flWnGYGDnQOem7jJDzl96pzI pvQGLaF13hM7HdLu4tpn4I0QZJ3LWgSMTJd9zeMa4m26TT/IXiNKVRPbnmUf79iw+dXQ 2klHKcYI27WzH6Kwrmdj4VTwRjg43c0phBDnObWcK317TAbnJavgLb4/Fv6sg7d8FEmt PwTQVjI2LuYA1GivuA3rtHV2Z5niI9wFT3daNWHBu/1MRUN0S1nva9y1+N+CPbXKMy7i BiLi+zd+bv+eqPeqxvKSsI9FDXp0pTLPXZgYNXDjYh4RQN5ZiE3BgW/i2F4BKei4F1PJ k2xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=mTARRFAm; 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 ja4-20020a170907988400b0096b0e9327a3si289195ejc.513.2023.05.19.16.59.47; Fri, 19 May 2023 16:59:48 -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=mTARRFAm; 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 7BB4968C146; Sat, 20 May 2023 02:59:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DEEA168C0DF for ; Sat, 20 May 2023 02:59:36 +0300 (EEST) Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-6ad13a1fbceso2900008a34.2 for ; Fri, 19 May 2023 16:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684540774; x=1687132774; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=seYhmTJubNtzvYHWSOrGlrMlaRvPupR+bIxNtKbdVnw=; b=mTARRFAmqPuAdTvLM3QJAEfaT9uYmwyO1/s5QXaDZEDBju7moT3o/dlhpa0ghTAanZ HkXbQ2BRu/ZWg9iB04Nt4BtfT+my3EBqT2PGBwdw3EvlnIkNhqpCYy2OGYqVyvoBr/8Y rdWpgZWJbjjSflx+eaPeIeR8X4mVe/D+BYKuYsoWEIu5dmoxAuG5A730dbWaoPwLPjQ3 VsG/azamYroyd+KaTlhL7YWTttmy9//DnKI6JePFGCsYySj6Sv/fQ3BefmIrPjnF4Y7Y mw7jehNp1xklRSNT7HEVieLTGZrHCgVj9DiZB/0i7LGdJKvVxurj886zLq+VL2QCXARf qtsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684540774; x=1687132774; 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=seYhmTJubNtzvYHWSOrGlrMlaRvPupR+bIxNtKbdVnw=; b=CF34iXzAK5t4IUBSyzcl+eONgZhAOdLXOreVt02xANM2vNE082VEVlv7LrwaVke6YF 7LoA/nF9mW4gobHukvOJHnu6I8tXW3lLsazu9fYvaeCNeDKWxFqpbRIgJNzfz+z4kVoF kIau9D+U6qMuWskWbWK1DmYbNGPmLTsv23rgaRgNjKqCIL3JM0NNUX4zv+id/CDhWMPe lAP9/NmW/s5vtMDLOvm0SA0tmvilgZ8O0+YXkV7WBdkNVvakvtAzDAbwS1P6IcaG/YH9 3E0lVkn5OUhVNpNfhRakOWebZ1xZS6lIE+Ba4vCiC/5ab9O9rjGzN6xmIHt8A/WUvMD6 QsRg== X-Gm-Message-State: AC+VfDzh4VZp8SeARddXzPDZZCoiB02LDMkCvzPMPJPe+bwXVAAeqoY5 aLLg2//xzOv1Wvnn0swyjZKKF9LDJeE= X-Received: by 2002:a05:6830:13c7:b0:6ac:a5b6:318d with SMTP id e7-20020a05683013c700b006aca5b6318dmr2078556otq.37.1684540774104; Fri, 19 May 2023 16:59:34 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id t3-20020a9d5903000000b006a43519523fsm161389oth.1.2023.05.19.16.59.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 16:59:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 May 2023 20:59:07 -0300 Message-Id: <20230519235907.4321-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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: 42cN/l20wtAP Signed-off-by: James Almer --- libavcodec/av1dec.c | 75 +++++++++++++++++++++++++++++++++------------ libavcodec/av1dec.h | 4 +++ 2 files changed, 60 insertions(+), 19 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index d46ee48335..9344d4ff28 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -657,6 +657,7 @@ static av_cold int av1_decode_free(AVCodecContext *avctx) } av1_frame_unref(avctx, &s->cur_frame); av_frame_free(&s->cur_frame.f); + av_packet_free(&s->pkt); av_buffer_unref(&s->seq_ref); av_buffer_unref(&s->header_ref); @@ -767,6 +768,10 @@ static av_cold int av1_decode_init(AVCodecContext *avctx) s->avctx = avctx; s->pix_fmt = AV_PIX_FMT_NONE; + s->pkt = av_packet_alloc(); + if (!s->pkt) + return AVERROR(ENOMEM); + for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++) { s->ref[i].f = av_frame_alloc(); if (!s->ref[i].f) { @@ -1042,7 +1047,7 @@ static int export_film_grain(AVCodecContext *avctx, AVFrame *frame) } static int set_output_frame(AVCodecContext *avctx, AVFrame *frame, - const AVPacket *pkt, int *got_frame) + const AVPacket *pkt) { AV1DecContext *s = avctx->priv_data; const AVFrame *srcframe = s->cur_frame.f; @@ -1079,8 +1084,6 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif - *got_frame = 1; - return 0; } @@ -1145,22 +1148,32 @@ 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(AVCodecContext *avctx, AVFrame *frame) { AV1DecContext *s = avctx->priv_data; AV1RawTileGroup *raw_tile_group = NULL; - int ret; + int i, 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; +again: + 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); + av_packet_unref(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 for this TU:%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; @@ -1168,6 +1181,7 @@ static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, if (!obu) continue; + ret = 0; header = &obu->header; av_log(avctx, AV_LOG_DEBUG, "Obu idx:%d, obu type:%d.\n", i, unit->type); @@ -1251,13 +1265,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, s->pkt); if (ret < 0) av_log(avctx, AV_LOG_ERROR, "Set output frame error.\n"); } s->raw_frame_header = NULL; + i++; goto end; } @@ -1361,6 +1377,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 +1392,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, s->pkt); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Set output frame error\n"); goto end; @@ -1384,13 +1402,30 @@ 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 = AVERROR(EAGAIN); } end: - ff_cbs_fragment_reset(&s->current_obu); - if (ret < 0) + av_assert0(i <= s->current_obu.nb_units); + s->nb_unit = i; + + if (s->current_obu.nb_units == i) { + ff_cbs_fragment_reset(&s->current_obu); + s->nb_unit = 0; + } + if (ret == AVERROR(EAGAIN)) + goto again; + if (ret < 0) { s->raw_frame_header = NULL; + ff_cbs_fragment_reset(&s->current_obu); + s->nb_unit = 0; + } + return ret; } @@ -1403,7 +1438,9 @@ static void av1_decode_flush(AVCodecContext *avctx) av1_frame_unref(avctx, &s->ref[i]); av1_frame_unref(avctx, &s->cur_frame); + av_packet_unref(s->pkt); s->operating_point_idc = 0; + s->nb_unit = 0; s->raw_frame_header = NULL; s->raw_seq = NULL; s->cll = NULL; @@ -1411,6 +1448,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 +1475,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;