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 2B6E140DE9 for ; Sat, 18 Jan 2025 05:00:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D484D68B829; Sat, 18 Jan 2025 07:00:11 +0200 (EET) Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C98D168B7AE for ; Sat, 18 Jan 2025 07:00:03 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3E5C960006 for ; Sat, 18 Jan 2025 05:00:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1737176403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0lB0bNsWZkI92H6W4FLYZI7kHtKT/VatuU1+dla+Lxw=; b=LCvfiMIBXzMy9WQiXIhPL1DhiZLFO708slUSDc37bQYSxUR3RqpxXnbS9XC6/p9Wf8JPpb 62yb6XaLRBwiz0ZIyHWncp+okjWO34CGm73qNBK01XMNJwvAl344iXiknPgYItt2Eh1LtY 4Se23aRBCV+vDmXwqMPKqZbVCvHxXyU3u4V2ohGtWFN5D1Zo2KmvKZZH22I+B+SxYwZ1fu kRerVnKQobHFX2CwszBzHjtCFZFu+A2ohtCavbNkEU3Z2FWY2FUxwtkRIuJtf435xh+5ER rxKCKGffVGFi+QHZ1sG218tW+MB2meSWqzp88AISZqgS0F+6MSu8sirdmgVTvQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 Jan 2025 05:59:59 +0100 Message-ID: <20250118050001.1809058-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250118050001.1809058-1-michael@niedermayer.cc> References: <20250118050001.1809058-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/ffv1: Basic float16 support 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 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 can be used as a reference for bitstream and compression improvements Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/ffv1.h | 2 ++ libavcodec/ffv1dec.c | 12 ++++++++++-- libavcodec/ffv1enc.c | 9 ++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index 576769ae1e0..2c2df154037 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -132,6 +132,8 @@ typedef struct FFV1Context { uint8_t state_transition[256]; uint8_t (*initial_states[MAX_QUANT_TABLES])[32]; int colorspace; + int flt; + int use32bit; diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 5aec6cdce26..def95ff411f 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -508,6 +508,8 @@ static int read_extra_header(FFV1Context *f) f->crcref = 0x7a8c4079; if (f->combined_version >= 0x30003) f->intra = get_symbol(&c, state, 0); + if (f->combined_version >= 0x40004) + f->flt = get_symbol(&c, state, 0); } if (f->version > 2) { @@ -738,11 +740,17 @@ static int read_header(FFV1Context *f) else if (f->avctx->bits_per_raw_sample == 14 && f->transparency) f->avctx->pix_fmt = AV_PIX_FMT_GBRAP14; else if (f->avctx->bits_per_raw_sample == 16 && !f->transparency) { - f->avctx->pix_fmt = AV_PIX_FMT_GBRP16; + if (f->flt) { + f->avctx->pix_fmt = AV_PIX_FMT_GBRPF16; + } else + f->avctx->pix_fmt = AV_PIX_FMT_GBRP16; f->use32bit = 1; } else if (f->avctx->bits_per_raw_sample == 16 && f->transparency) { - f->avctx->pix_fmt = AV_PIX_FMT_GBRAP16; + if (f->flt) { + f->avctx->pix_fmt = AV_PIX_FMT_GBRAPF16; + } else + f->avctx->pix_fmt = AV_PIX_FMT_GBRAP16; f->use32bit = 1; } } else { diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index c952065e443..8e9f41fea8f 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -419,7 +419,7 @@ av_cold int ff_ffv1_write_extradata(AVCodecContext *avctx) if (f->version == 3) { f->micro_version = 4; } else if (f->version == 4) - f->micro_version = 3; + f->micro_version = 4; f->combined_version += f->micro_version; put_symbol(&c, state, f->micro_version, 0); } @@ -867,6 +867,8 @@ av_cold int ff_ffv1_encode_setup_plane_info(AVCodecContext *avctx, s->bits_per_raw_sample = 14; case AV_PIX_FMT_GBRP16: case AV_PIX_FMT_GBRAP16: + case AV_PIX_FMT_GBRPF16: + case AV_PIX_FMT_GBRAPF16: if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) s->bits_per_raw_sample = 16; else if (!s->bits_per_raw_sample) @@ -877,7 +879,11 @@ av_cold int ff_ffv1_encode_setup_plane_info(AVCodecContext *avctx, if (s->bits_per_raw_sample >= 16) { s->use32bit = 1; } + s->flt = !!(desc->flags & AV_PIX_FMT_FLAG_FLOAT); s->version = FFMAX(s->version, 1); + + if (s->flt) + s->version = FFMAX(s->version, 4); break; default: av_log(avctx, AV_LOG_ERROR, "format %s not supported\n", @@ -1398,6 +1404,7 @@ const FFCodec ff_ffv1_encoder = { AV_PIX_FMT_GRAY9, AV_PIX_FMT_YUV420P14, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV444P14, AV_PIX_FMT_YUV440P10, AV_PIX_FMT_YUV440P12, + AV_PIX_FMT_GBRPF16, AV_PIX_FMT_NONE }, -- 2.48.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".