From patchwork Mon Sep 7 14:31:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 22161 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5E82044B681 for ; Mon, 7 Sep 2020 17:37:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DA7C6881EF; Mon, 7 Sep 2020 17:37:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8FE8F6881EF for ; Mon, 7 Sep 2020 17:37:44 +0300 (EEST) Received: by mail-pj1-f66.google.com with SMTP id np15so7525660pjb.0 for ; Mon, 07 Sep 2020 07:37:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=hYLu93huOPrQ+RaZMDzcxHuNS5DUhlFTcc5PakvetBA=; b=qnFK1+oUdDX7j+E/yV7hxSBs1L2FTqMXtjDMiNLthl+I5ch+vU4Od+2riOz7TAoco5 SQViSyGdV2/wXTVAhYIgMufE++VB5Gv4rl2JQQ0Mb9xiwwG/eemIcGk8b9qrRd2QRvd5 nwqH1AJYNJ3NJ35lwHoScxQ3fjb0MiILSpS/YVywiz+bYyg1AoxZJdXrjp8dApZ5aKOW G1hMWlC8TfX7f27Ph2gd6WajsEGqTCqzVuNvo92xCY9h2FIcRw32sufj3C14mr3jF0S7 gKJo+FP4KyPHs6g8q4uMtUirJd43B1ACHPpx46PdVVKCyeEpDrZmkmz/abgI5fBrjPkO vW8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hYLu93huOPrQ+RaZMDzcxHuNS5DUhlFTcc5PakvetBA=; b=YuoCWHNy9NMZOnk/SMYLhVCY9mpFoYeuQYsAT/CBnuf6fZyXR55OM03GrXr848uPve 38XjW/DtpWD6KgI64+p5k032Vg3UVkTlrcaHx8aCgWxGqarUQyTh+KjO//AJnBOy+BI5 aQ4BPwJoSvWxKJQS/eRHfBPnz/206E3+BY9hCTRP5f16+oM1Ti7Iwgc0p6yCbvjzUsDa 6Q89r6WMwikuUJQHbAjFpUdrJj6Ww4mr4fLzVQAOhc6Zc6H1IKJeH8vbQO/5EVqua3yn QTV0p3bIgcoWmhjBRx8az52G+2WP457aryfKyKwTkf85CqygZtTCm8UqRwf/l5m3Rbx2 23cg== X-Gm-Message-State: AOAM530M6F5YprEUdT9ZCwhcQ4bDLIa2aGSw/8kHwCQDxIv3rJb+yqVx 6q5K78oX1Uavm8lR7rdq4pRD6FtpO9E= X-Google-Smtp-Source: ABdhPJxXsQGgwZDjwqSr3DuvFZlHIwmXR14q9cwafF0KM2dqiUipdyBBvRvz+2zBFVA5yaL7SPN25A== X-Received: by 2002:a0c:f48e:: with SMTP id i14mr19258919qvm.9.1599489146647; Mon, 07 Sep 2020 07:32:26 -0700 (PDT) Received: from localhost.localdomain ([191.83.213.149]) by smtp.gmail.com with ESMTPSA id z19sm11856245qtb.37.2020.09.07.07.32.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2020 07:32:25 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Sep 2020 11:31:48 -0300 Message-Id: <20200907143148.25152-2-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200907143148.25152-1-jamrial@gmail.com> References: <20200907143148.25152-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2 v3] avcodec/decode: use a packet list to store packet properties X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Keeping only the latest packet fed to the decoder works only for decoders that return a frame immediately after every consumed packet. Decoders that consume several packets before they return a frame will fill said frame with properties taken from the last consumed packet instead of the earliest. Signed-off-by: James Almer --- libavcodec/decode.c | 36 +++++++++++++++++++++++++++--------- libavcodec/internal.h | 2 ++ libavcodec/utils.c | 3 +++ 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index da587ac1f6..8f5151cd87 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -43,6 +43,7 @@ #include "decode.h" #include "hwconfig.h" #include "internal.h" +#include "packet_internal.h" #include "thread.h" typedef struct FramePool { @@ -142,15 +143,24 @@ fail2: return 0; } -static int extract_packet_props(AVCodecInternal *avci, const AVPacket *pkt) +#define IS_EMPTY(pkt) (!(pkt)->data) + +static int extract_packet_props(AVCodecInternal *avci, AVPacket *pkt) { int ret = 0; - av_packet_unref(avci->last_pkt_props); - if (pkt) { - ret = av_packet_copy_props(avci->last_pkt_props, pkt); - if (!ret) - avci->last_pkt_props->size = pkt->size; // HACK: Needed for ff_decode_frame_props(). + ret = avpriv_packet_list_put(&avci->pkt_props, &avci->pkt_props_tail, pkt, + av_packet_copy_props); + if (ret < 0) + return ret; + avci->pkt_props_tail->pkt.size = pkt->size; // HACK: Needed for ff_decode_frame_props(). + avci->pkt_props_tail->pkt.data = (void*)1; // HACK: Needed for IS_EMPTY(). + + if (IS_EMPTY(avci->last_pkt_props)) { + ret = avpriv_packet_list_get(&avci->pkt_props, + &avci->pkt_props_tail, + avci->last_pkt_props); + av_assert0(ret != AVERROR(EAGAIN)); } return ret; } @@ -512,6 +522,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (ret >= pkt->size || ret < 0) { av_packet_unref(pkt); + av_packet_unref(avci->last_pkt_props); } else { int consumed = ret; @@ -550,9 +561,11 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) av_assert0(!frame->buf[0]); - if (avctx->codec->receive_frame) + if (avctx->codec->receive_frame) { ret = avctx->codec->receive_frame(avctx, frame); - else + if (ret != AVERROR(EAGAIN)) + av_packet_unref(avci->last_pkt_props); + } else ret = decode_simple_receive_frame(avctx, frame); if (ret == AVERROR_EOF) @@ -1683,7 +1696,7 @@ static int add_metadata_from_side_data(const AVPacket *avpkt, AVFrame *frame) int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) { - const AVPacket *pkt = avctx->internal->last_pkt_props; + AVPacket *pkt = avctx->internal->last_pkt_props; int i; static const struct { enum AVPacketSideDataType packet; @@ -1701,6 +1714,11 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) { AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE }, }; + if (IS_EMPTY(pkt)) + avpriv_packet_list_get(&avctx->internal->pkt_props, + &avctx->internal->pkt_props_tail, + pkt); + if (pkt) { frame->pts = pkt->pts; #if FF_API_PKT_PTS diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 5d0e6e7831..ce4dbbc2b9 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -145,6 +145,8 @@ typedef struct AVCodecInternal { * for decoding. */ AVPacket *last_pkt_props; + AVPacketList *pkt_props; + AVPacketList *pkt_props_tail; /** * temporary buffer used for encoders to store their bitstream diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2e5185f364..3e644e246a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -50,6 +50,7 @@ #include "thread.h" #include "frame_thread_encoder.h" #include "internal.h" +#include "packet_internal.h" #include "put_bits.h" #include "raw.h" #include "bytestream.h" @@ -1149,6 +1150,8 @@ av_cold int avcodec_close(AVCodecContext *avctx) av_packet_free(&avctx->internal->compat_encode_packet); av_packet_free(&avctx->internal->buffer_pkt); av_packet_free(&avctx->internal->last_pkt_props); + avpriv_packet_list_free(&avctx->internal->pkt_props, + &avctx->internal->pkt_props_tail); av_packet_free(&avctx->internal->ds.in_pkt); av_frame_free(&avctx->internal->es.in_frame);