From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id EA22D45F0A for ; Sun, 19 Jan 2025 10:37:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 337F968B654; Sun, 19 Jan 2025 12:37:12 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE6A768B5E7 for ; Sun, 19 Jan 2025 12:37:04 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; s=202405r; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1737283024; bh=ty8nrulJ1Dq0Y6etSSeAkRq lvwgYHCIIwE2pDq3tbzs=; b=clqRAfOhQBAZAWNA5skGn+dAQtGoAmiajvYKE1BmpQ1QFqyhh1 Os6gmiLSdpsCY/p5kKzCkZqB5xX+IZonKyhR2Vltda/uXjJ9W6WparWSN3n4sXClNswoNkKbb+L +upqICI951B1LIkNeYKMJGFWzBZAdItXcLK6JpzxcPcPqfw+DEigltjUD9uYmbckXQszlLa4vzh NMAEdOjGu2rvkBuf732gfSck6YwFVp8tvlQ49eTlGbpLksAfCDDWwfj8Yep9MKCG+uKlyWrKQJV bWXrRz0XpSGEhVFz2WfHlZortJgPDQlqLUrwxwfJwG2Qh3BIZ/P/gS8ObMoyimWfN1Q==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1737283024; bh=ty8nrulJ1Dq0Y6etSSeAkRq lvwgYHCIIwE2pDq3tbzs=; b=XLOUk+8Xs6/GB0ZY3SYfXD12yz1X5iXRyNUd+gLsuSjefJniwq sKMmZU3DfEcVOJuDJLY/oITWTn/uiVfvTCDw==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Jan 2025 19:36:23 +0900 Message-ID: <20250119103640.1224690-5-dev@lynne.ee> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250119103640.1224690-1-dev@lynne.ee> References: <20250119103640.1224690-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/12] ffv1dec: move slice decoding into a separate function 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 Cc: Lynne Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This simply movies all slice decoding code from decode_frame to decode_slices; nothing more. --- libavcodec/ffv1dec.c | 106 ++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 46 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 68a233932d..83c5975550 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -941,54 +941,16 @@ static int decode_header(AVCodecContext *avctx, RangeCoder *c, return 0; } -static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, - int *got_frame, AVPacket *avpkt) +static int decode_slices(AVCodecContext *avctx, RangeCoder c, + AVPacket *avpkt) { - uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; - FFV1Context *f = avctx->priv_data; - int ret; - uint8_t *buf_end; - AVFrame *p; - - /* This is copied onto the first slice's range coder context */ - RangeCoder c; - - ff_progress_frame_unref(&f->last_picture); - FFSWAP(ProgressFrame, f->picture, f->last_picture); - - - f->avctx = avctx; - f->frame_damaged = 0; - - ret = decode_header(avctx, &c, avpkt->data, avpkt->size); - if (ret < 0) - return ret; - - ret = ff_progress_frame_get_buffer(avctx, &f->picture, - AV_GET_BUFFER_FLAG_REF); - if (ret < 0) - return ret; - - p = f->picture.f; - - p->pict_type = AV_PICTURE_TYPE_I; //FIXME I vs. P - p->flags = (p->flags & ~AV_FRAME_FLAG_KEY) | f->key_frame; - - if (f->version < 3 && avctx->field_order > AV_FIELD_PROGRESSIVE) { - /* we have interlaced material flagged in container */ - p->flags |= AV_FRAME_FLAG_INTERLACED; - if (avctx->field_order == AV_FIELD_TT || avctx->field_order == AV_FIELD_TB) - p->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; - } - - if (avctx->debug & FF_DEBUG_PICT_INFO) - av_log(avctx, AV_LOG_DEBUG, "ver:%d keyframe:%d coder:%d ec:%d slices:%d bps:%d\n", - f->version, !!(p->flags & AV_FRAME_FLAG_KEY), f->ac, f->ec, f->slice_count, f->avctx->bits_per_raw_sample); + FFV1Context *f = avctx->priv_data; + AVFrame *p = f->picture.f; - ff_thread_finish_setup(avctx); + uint8_t *buf = avpkt->data; + size_t buf_size = avpkt->size; + uint8_t *buf_end = buf + buf_size; - buf_end = buf + buf_size; for (int i = f->slice_count - 1; i >= 0; i--) { FFV1SliceContext *sc = &f->slices[i]; @@ -1065,6 +1027,58 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, f->slice_damaged[i] = 1; } } + + return 0; +} + +static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, + int *got_frame, AVPacket *avpkt) +{ + FFV1Context *f = avctx->priv_data; + int ret; + AVFrame *p; + + /* This is copied onto the first slice's range coder context */ + RangeCoder c; + + ff_progress_frame_unref(&f->last_picture); + FFSWAP(ProgressFrame, f->picture, f->last_picture); + + + f->avctx = avctx; + f->frame_damaged = 0; + + ret = decode_header(avctx, &c, avpkt->data, avpkt->size); + if (ret < 0) + return ret; + + ret = ff_progress_frame_get_buffer(avctx, &f->picture, + AV_GET_BUFFER_FLAG_REF); + if (ret < 0) + return ret; + + p = f->picture.f; + + p->pict_type = AV_PICTURE_TYPE_I; //FIXME I vs. P + p->flags = (p->flags & ~AV_FRAME_FLAG_KEY) | f->key_frame; + + if (f->version < 3 && avctx->field_order > AV_FIELD_PROGRESSIVE) { + /* we have interlaced material flagged in container */ + p->flags |= AV_FRAME_FLAG_INTERLACED; + if (avctx->field_order == AV_FIELD_TT || avctx->field_order == AV_FIELD_TB) + p->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; + } + + if (avctx->debug & FF_DEBUG_PICT_INFO) + av_log(avctx, AV_LOG_DEBUG, "ver:%d keyframe:%d coder:%d ec:%d slices:%d bps:%d\n", + f->version, !!(p->flags & AV_FRAME_FLAG_KEY), f->ac, f->ec, f->slice_count, f->avctx->bits_per_raw_sample); + + ff_thread_finish_setup(avctx); + + ret = decode_slices(avctx, c, avpkt); + if (ret < 0) + return ret; + ff_progress_frame_report(&f->picture, INT_MAX); ff_progress_frame_unref(&f->last_picture); @@ -1073,7 +1087,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, *got_frame = 1; - return buf_size; + return avpkt->size; } #if HAVE_THREADS -- 2.47.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".