From patchwork Sat May 20 01:50:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41729 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp230044pzb; Fri, 19 May 2023 18:51:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ706fmEvICylr/Y75mTcflG4bV+mhUy79qqS04zOHTFrbN/d2bXDFpsKg80rSKhrlb6+dg6 X-Received: by 2002:aa7:de06:0:b0:50b:d53d:7ceb with SMTP id h6-20020aa7de06000000b0050bd53d7cebmr2280917edv.40.1684547476528; Fri, 19 May 2023 18:51:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684547476; cv=none; d=google.com; s=arc-20160816; b=kJE3uVSOUYduUFvYFKG8Ol2sVTZmyOGBlVsYoBmkco9yHSngU29RD+aVPCVTJ3xj2t H/Z/21eOh/Z1tzQEhhyv4YMw5+2PnOr1s7hWw2NBohY+YPjaRDHYcfcYhgDigxhTvGAL WbYiDQT9eF/oCvZSb1RFRIPKeVKsAyOd1yT6cXM0zQLVKqUIaJRV9mbwLQG2BofPFyDP mb3zQbCeCX601iCo7ot/1yxWJ0t+uUIvEDGVEDqWya7RAmZn3ltGdAySOTW0Yoj6DWQN +/fBiOvZMJoEdAd7AgABjNHUhnkKhBQy2QxZ91eOEEHc2Q6SkV9iFpml0mGmKxdXYB26 V+qw== 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=54BST3jzxdQ0fhn7GUwU2gtSrPv/M5Ly0ki+4xT/zZk=; b=HsPRclRKeotSdZig9OL8hRzM7XqWVAp2Eogu1fS6nFoDj+6INd5qGuAXGXUnL8ixbT nOXCGnMBi6zgFaWuz2lXh7esYe02KHDvaML/T+ryAJ2q0g0hLk0GiipErI257CKxt9Nf yjZ+Teo0PSLlncGquqd2j5t18j76tK/4L5+ppMezn9cuviTOEVKZAqPvKPJnArQpG/bM QC5GPmzuRAYqq1LVYfAezwSbNX8M6G5E39RSq35HgytFXbEdtM7aA/xanc0YNIvzP2xl TAo5KoHHemA23Us+ZaX0DcM8EsWXd6+yJBxKgsL4F2quPzPGAR8SlHBv6KYJN/GcW5LC F2Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=s0JUEJUQ; 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 a15-20020aa7cf0f000000b0050bc02518e8si565581edy.147.2023.05.19.18.51.15; Fri, 19 May 2023 18:51:16 -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=s0JUEJUQ; 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 8D47A68C167; Sat, 20 May 2023 04:51:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05AE768A5E1 for ; Sat, 20 May 2023 04:51:05 +0300 (EEST) Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-39446801cf1so2385002b6e.2 for ; Fri, 19 May 2023 18:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684547464; x=1687139464; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=iXZEdycr59qMc4WHjt/Y5jvxiyUN3svK3TTKdu7yAW4=; b=s0JUEJUQ3LEok/ms1WNFNZlpM5EoTFYd2jMqzY2LhBBbZss9MORzfPAzbTmeyuziU/ y3R43BNUNu4eK9XYsn8c9wl3jOaSAjORzoh84+kXgSWhmUx1cDgD7jQWaFTGjFzsQvyI KyeAIZBHyxPVtapkxgyjBL0z6L0InwmS0HJf/8OJsqGxuNmSec5DGDiA8KM91vA0+ESO MSqeu4xuo4f7+F6bNutC53OSWPHaZKohQNCuSXhX5eGWmDDFxB4MnLtlQsSEvyTOQH/B W1xRhYqF9yis1++kVbCgj+oDgQKvAXfKv5Uc0w0qgnC0Vma14rL7l1KI3Ub6furmuh4H evLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684547464; x=1687139464; 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=iXZEdycr59qMc4WHjt/Y5jvxiyUN3svK3TTKdu7yAW4=; b=QOFCOxpiFbwW9NWjpRXwDrIZKgFKlkrwm5Ev0dAkwXdIb9Fw4+KNmcdHvoWH/pNVlM rx3bSlzAeG/Tz/4diG5zURvBz5KoU8T5BeFaswFHZPw9TDxS6ibll79FMvC8p1te7DuC BdxcXofLujuf0senHi+OAGbZwo+pHB0YTYlyby3fmAaJ1Y40kDwYA1nQzJ7Dj3cgPtOk 81UD+WtLhZk4nMilwmBnZqBdKDlOJgV80No1y70c/WBBF0emDY6COZX00B47Rtm7Pgpt h0t5v7r5MEJE062yTi8BUjjGQXxQwz/ZhUr7KFTISoniQ070deXbZvr/BJcyjwAGfnuN Cu5A== X-Gm-Message-State: AC+VfDx2HMF0X7MgUJchcGxn1lY/I6VK69zYg+W11fGv4lzOUcHx5v8H Sgco3LrkiPWpVJ5zPhY8KjQRqCzE7R0= X-Received: by 2002:aca:190e:0:b0:394:3fcd:92a7 with SMTP id l14-20020aca190e000000b003943fcd92a7mr1938149oii.35.1684547464017; Fri, 19 May 2023 18:51:04 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id r72-20020acaa84b000000b003960d7b4535sm187149oie.36.2023.05.19.18.51.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 18:51:03 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 May 2023 22:50:57 -0300 Message-Id: <20230520015057.4589-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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: UkJ6ngvHZWC2 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..53ed37b817 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,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) { + av_packet_unref(s->pkt); + 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; @@ -1168,6 +1182,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 +1266,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 +1378,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 +1393,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 +1403,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; } @@ -1404,6 +1440,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 +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;