This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 093bc1ae444304e9ddaae3fa6e1582fd4a8f1611 Author: Jun Zhao <[email protected]> AuthorDate: Sat Sep 12 11:36:47 2026 +0800 Commit: Jun Zhao <[email protected]> CommitDate: Mon Sep 14 12:44:07 2026 +0000 doc: add ASTC and KTX muxer/demuxer documentation Document the KTX 1.0 muxer: it writes a single image, takes the ASTC block size and dimensions from the encoder's extradata, and records the stored row order in a KTXorientation key. Its srgb option follows the encoder's color profile by default, and an explicit value that contradicts a known profile is rejected instead of silently relabelling the texture; a stream without profile information falls back to sRGB. Document the .astc muxer and the .astc and KTX demuxers, and list both containers in the supported file formats table. Signed-off-by: Jun Zhao <[email protected]> --- doc/demuxers.texi | 16 ++++++++++++++++ doc/general_contents.texi | 4 ++++ doc/muxers.texi | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index cd3e88f59e..82c36a4594 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -66,6 +66,13 @@ This demuxer is used to demux ASF files and MMS network streams. Do not try to resynchronize by looking for a certain optional start code. @end table +@section astc + +ASTC (Adaptive Scalable Texture Compression) demuxer. + +This demuxer reads the 16-byte @file{.astc} header, hands it to the decoder as +extradata, and emits the compressed image as a single packet. + @anchor{concat} @section concat @@ -730,6 +737,15 @@ ffmpeg -framerate 10 -pattern_type glob -i "*.png" out.mkv @end example @end itemize +@section ktx + +Khronos Texture 1.0 demuxer for ASTC textures. + +This demuxer reads the KTX 1.0 header and maps the ASTC GL internal format to +the block footprint the decoder needs, so only files using the ASTC formats +are accepted. A @code{KTXorientation} key is preserved as stream display +metadata, and the texture is emitted as a single packet. + @section libgme The Game Music Emu library is a collection of video game music file emulators. diff --git a/doc/general_contents.texi b/doc/general_contents.texi index f1696d6ea3..b041518093 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -521,6 +521,8 @@ library: @item ADS/SS2 @tab @tab X @tab Audio format used on the PS2. @item APNG @tab X @tab X +@item .astc @tab X @tab X + @tab Raw ASTC texture container. @item ASF @tab X @tab X @tab Advanced / Active Streaming Format. @item AST @tab X @tab X @@ -856,6 +858,8 @@ library: @tab Multimedia format used in Westwood Studios games. @item Wideband Single-bit Data (WSD) @tab @tab X @item WVE @tab @tab X +@item KTX @tab X @tab X + @tab Khronos Texture 1.0 container for ASTC. @item Konami XMD @tab @tab X @item XMV @tab @tab X @tab Microsoft video container used in Xbox games. diff --git a/doc/muxers.texi b/doc/muxers.texi index c28a94c57f..95f7ea33a7 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -900,6 +900,17 @@ Specify loop end position expressed in milliseconds, from @code{0} to assumes the total stream duration. @end table +@section astc +ASTC (Adaptive Scalable Texture Compression) muxer. + +This muxer accepts a single @samp{libastcenc} video stream and writes one +image: the 16-byte @file{.astc} header, taken from the encoder's extradata, +followed by the raw ASTC bitstream. The block footprint and the image +dimensions come from the same extradata, and a second packet is rejected. + +Use the @file{.ktx} container for a texture that also needs its color space +or row order recorded. + @section au SUN AU audio muxer. @@ -2815,6 +2826,36 @@ This muxer accepts a single @samp{jacosub} subtitles stream. For more information about the format, see @url{http://unicorn.us.com/jacosub/jscripts.html}. +@section ktx +Khronos Texture 1.0 muxer for ASTC textures. + +This muxer accepts a single @samp{libastcenc} video stream and writes one +image: the ASTC block size and the image dimensions are taken from the +encoder's extradata, and a second packet is rejected. The stored row order +is recorded in a @code{KTXorientation} key. + +@subsection Options + +@table @option + +@item srgb @var{integer} +Select the GL internal format color space. Possible values: +@table @samp +@item auto +Use the color profile published by the encoder, which is the default. +@item linear +Write the linear ASTC format. +@item srgb +Write the sRGB ASTC format. +@end table + +An explicit value that contradicts a known encoder profile is rejected. +A raw @file{.astc} input does not carry a color profile, so remuxing it to +@file{.ktx} with @code{auto} writes the sRGB format; pass +@option{-srgb linear} to keep a linear texture. + +@end table + @section kvag Simon & Schuster Interactive VAG muxer. -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
