From patchwork Thu Dec 8 14:07:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39656 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp342329pzb; Thu, 8 Dec 2022 06:08:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf7NF8gnWgYxHcML/TfB/6x2ho39lx8HlepiFe/IY4sG0zbnkHXRXpNT4ojnd/6ZvmRm0Gvf X-Received: by 2002:a17:906:405:b0:7c0:affa:866f with SMTP id d5-20020a170906040500b007c0affa866fmr1773007eja.26.1670508487683; Thu, 08 Dec 2022 06:08:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670508487; cv=none; d=google.com; s=arc-20160816; b=J21pkbPzkucvbYJ4O7nLNYmUFHj7rXLuy1LoVlF8ej/4e976zJnEGV4U4rrqe1Y9KQ ZPysosVqoWdxae0gy6JKQuFjp1YKrO9iJJGCJIM9LsXnEFlRvBmBMq3QdVHbc8fkE8K/ WwG84hoB0eW4R0Ir2xHDyTFXv7ML9D+3vEIll4HT24hBeP76dUYPwzbtxdbbuuVj0wqC UiCNpAoNkZ69MJdYpFte26T9r5AMuuGVcdVGORKwadSD0mTITCEmQuKl7U7SKglhnwqE 1UnNYOI9h3HxpjKLT7OecJGgb28zah6XASFrRtwEAR7qEfocU4ZlAMCvKa+mH0CiBFhf pYNQ== 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=Eq3RXGvm+BHOYjq+GPb9b7b++mfH2W3jWUSTOkA79h0=; b=I8uwYrgydPeUkYeaL6pe872UbYnrw6qPGP+mQL6OOarJJnylSvSc6B4L6BejFJHx7X zWDLlgiVmPrcvJe9EGloEaWEasODkHZ5/LI6CW8QboQeJYX2xp8tP7M1DvTsttVoExh1 tTg0PK1TCRLffRlbF6YHWXljyvfr9b6FppfmUzKLyYnYwHcgv6hiXZT1ibvIBrlHWK1a sOuUv80Mfj6xKtEFAEwgRsAF5muzfysCXEJCfRfWiIf7UgykgvQqCUxqTVf+GDnaGhK/ rMq+WIRLU+6pyEaXaJU7I1Zah0k3Krn61hTVgoPXWKWS23GhEO9ktyVSo6fvGXE2dZ1o jEBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=dB3Txq3R; 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 nd17-20020a170907629100b00782ff2649a7si18834127ejc.346.2022.12.08.06.08.07; Thu, 08 Dec 2022 06:08:07 -0800 (PST) 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=dB3Txq3R; 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 D195768BA81; Thu, 8 Dec 2022 16:07:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D95DF68BA61 for ; Thu, 8 Dec 2022 16:07:26 +0200 (EET) Received: by mail-oi1-f178.google.com with SMTP id l127so1480419oia.8 for ; Thu, 08 Dec 2022 06:07:26 -0800 (PST) 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=P/A6Cvp0Krwnc5NOTl+15YOkNQgw8UH/dSwo3FD3LUA=; b=dB3Txq3RxJW+U/dJvEwd527HJMRv3Ox8ATdgS2rRINQYBKAIY0zK0/VLnOtyI7gEas XRDxs8gGMFaIOJy8Lrpx7LgEtRcXfTrcjh0hPjwA3ssCZuW/HkjCYTQAgMaImii4DFnt 826IIe5uA+NXh8T30Z4D97rCVZAVJWY56WOy31iie3OurxuGBkGyTLcIPRN3Fk3awW/v baC4JeUmBTqd5uMA3XSnkt4RbaiC/TTg5XiEGLyVkTj1xw4nqg4PLMW59PRdGAL3uOAH SfAs5iEszMEo6UGO/uDnbeXOxiQ+Q0UNMDR2ApYceGrXKBpuyelBmB0Q0YCdESi/+FTb 4eUg== 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=P/A6Cvp0Krwnc5NOTl+15YOkNQgw8UH/dSwo3FD3LUA=; b=Ljmlv7Sig99dEKIHGNJFmkGVExPFoO3pg00ytzERj1mmfIwzZc34qvZryelWtmbeYN E2y+r6SLB1JInK3Rd97/dwSBllebgCHGKF6KB0hfh0ZstM7rPTCOzjhDXlunmTaNJIF0 p4qYAOLe9rJcWBZjpqwTNwO7QdSXTsa1Fb+sy5QPsrc5iopB+VkxEmNzxRVd+7wq3Ac1 PFjgD1Y21NP/FWE0EM/uPrbooqawtxkF18UkJVHqLqQ7et/uTxPoZkPmWOa3eG6SWZn9 klAIg657IFEkGwIJLBU7UuY/hmmptEFxBo0V1p1exC/SytVtJVV/Czq9q2RFBLuqtwzF 0Sxw== X-Gm-Message-State: ANoB5pnMkVn5J1w/q70z5NrNz9K+IOZ45/W6dcS9b6rQlV/0COfhzDxO RXKDzSGPPMTc0ivVaVR/mVOVkxQbICo= X-Received: by 2002:a05:6808:692:b0:35b:7145:2bd5 with SMTP id k18-20020a056808069200b0035b71452bd5mr1017880oig.16.1670508445230; Thu, 08 Dec 2022 06:07:25 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id e29-20020a544f1d000000b0035aa617156bsm10672553oiy.17.2022.12.08.06.07.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 06:07:24 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Dec 2022 11:07:05 -0300 Message-Id: <20221208140706.3086-4-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221208140706.3086-1-jamrial@gmail.com> References: <20221208140706.3086-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/libdav1d: set frame props from the reordered packet 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: q3StAthxl0EE Attach the AVPacket instead of only a few values to the corresponding Dav1dData struct and use it to set all output frame props. Signed-off-by: James Almer --- libavcodec/libdav1d.c | 45 +++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index f98f351e49..d9542dd6a0 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -286,8 +286,10 @@ static void libdav1d_data_free(const uint8_t *data, void *opaque) { } static void libdav1d_user_data_free(const uint8_t *data, void *opaque) { + AVPacket *pkt = opaque; av_assert0(data == opaque); - av_free(opaque); + av_free(pkt->opaque); + av_packet_free(&pkt); } static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) @@ -295,13 +297,14 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) Libdav1dContext *dav1d = c->priv_data; Dav1dData *data = &dav1d->data; Dav1dPicture pic = { 0 }, *p = &pic; + AVPacket *pkt; #if FF_DAV1D_VERSION_AT_LEAST(5,1) enum Dav1dEventFlags event_flags = 0; #endif int res; if (!data->sz) { - AVPacket *pkt = av_packet_alloc(); + pkt = av_packet_alloc(); if (!pkt) return AVERROR(ENOMEM); @@ -320,29 +323,28 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) return res; } - data->m.timestamp = pkt->pts; - data->m.offset = pkt->pos; - data->m.duration = pkt->duration; - pkt->buf = NULL; - av_packet_free(&pkt); + pkt->opaque = NULL; if (c->reordered_opaque != AV_NOPTS_VALUE) { - uint8_t *reordered_opaque = av_memdup(&c->reordered_opaque, + pkt->opaque = av_memdup(&c->reordered_opaque, sizeof(c->reordered_opaque)); - if (!reordered_opaque) { + if (!pkt->opaque) { + av_packet_free(&pkt); dav1d_data_unref(data); return AVERROR(ENOMEM); } + } - res = dav1d_data_wrap_user_data(data, reordered_opaque, - libdav1d_user_data_free, reordered_opaque); + res = dav1d_data_wrap_user_data(data, (const uint8_t *)pkt, + libdav1d_user_data_free, pkt); if (res < 0) { - av_free(reordered_opaque); + av_free(pkt->opaque); + av_packet_free(&pkt); dav1d_data_unref(data); return res; } - } + pkt = NULL; } else { av_packet_free(&pkt); if (res >= 0) @@ -411,17 +413,18 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) INT_MAX); ff_set_sar(c, frame->sample_aspect_ratio); - if (p->m.user_data.data) - memcpy(&frame->reordered_opaque, p->m.user_data.data, sizeof(frame->reordered_opaque)); + pkt = (AVPacket *)p->m.user_data.data; + if (pkt->opaque) + memcpy(&frame->reordered_opaque, pkt->opaque, sizeof(frame->reordered_opaque)); else frame->reordered_opaque = AV_NOPTS_VALUE; // match timestamps and packet size - frame->pts = p->m.timestamp; - frame->pkt_dts = p->m.timestamp; - frame->pkt_pos = p->m.offset; - frame->pkt_size = p->m.size; - frame->duration = p->m.duration; + res = ff_decode_frame_props_from_pkt(frame, pkt); + if (res < 0) + goto fail; + + frame->pkt_dts = pkt->pts; frame->key_frame = p->frame_hdr->frame_type == DAV1D_FRAME_TYPE_KEY; switch (p->frame_hdr->frame_type) { @@ -595,7 +598,7 @@ const FFCodec ff_libdav1d_decoder = { .flush = libdav1d_flush, FF_CODEC_RECEIVE_FRAME_CB(libdav1d_receive_frame), .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS, - .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS | + .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_SETS_FRAME_PROPS | FF_CODEC_CAP_AUTO_THREADS, .p.priv_class = &libdav1d_class, .p.wrapper_name = "libdav1d",