The branch, master has been updated
       via  f283750ba83d1bfb80d3c6f1d1c0639f161dd885 (commit)
       via  4e556b0c0c5b152832ca059d88c654787fca585d (commit)
      from  b39989604613b376dab969973e66c7230317926f (commit)


- Log -----------------------------------------------------------------
commit f283750ba83d1bfb80d3c6f1d1c0639f161dd885
Author:     GyanD <[email protected]>
AuthorDate: Sat Nov 15 08:26:46 2025 +0000
Commit:     Gyan Doshi <[email protected]>
CommitDate: Wed Nov 19 04:48:11 2025 +0000

    doc/encoders: minor mediafoundation encoders updates

diff --git a/doc/encoders.texi b/doc/encoders.texi
index 56e2f9008a..f29086df2d 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -3413,9 +3413,8 @@ Maximum quantization parameter for B frame.
 
 @section MediaFoundation
 
-This provides wrappers to encoders (both audio and video) in the
-MediaFoundation framework. It supports both software and hardware encoders
-through the following codecs:
+The following wrappers for encoders in the MediaFoundation framework are
+available:
 
 @itemize
 @item h264_mf
@@ -3423,15 +3422,17 @@ through the following codecs:
 @item av1_mf
 @end itemize
 
+These support both software and hardware encoding.
+
 Video encoders can take input in either of nv12 or yuv420p form
 (some encoders support both, some support only either - in practice,
 nv12 is the safer choice, especially among HW encoders).
 
-Hardware-accelerated encoding is supported via D3D11, including hardware
+Hardware-accelerated encoding requires D3D11, including hardware
 scaling capabilities through the scale_d3d11 filter.
 
 To list all available options for the MediaFoundation encoders, use:
-@command{ffmpeg -h encoder=h264_mf}
+@command{ffmpeg -h encoder=<encoder>} e.g. @command{ffmpeg -h encoder=h264_mf}
 
 @subsection Options
 
@@ -3498,14 +3499,9 @@ Hardware-accelerated decoding with hardware encoding:
 ffmpeg -hwaccel d3d11va -i input.mp4 -c:v h264_mf -hw_encoding 1 output.mp4
 @end example
 
-Hardware-accelerated decoding and encoding with scaling:
-@example
-ffmpeg -hwaccel d3d11va -hwaccel_output_format d3d11 -i input.mp4 -c:v h264_mf 
-hw_encoding 1 -vf scale_d3d11=1920:1080 output.mp4
-@end example
-
-Hardware decoding and encoding with quality setting:
+Hardware-accelerated decoding, HW scaling and encoding with quality setting:
 @example
-ffmpeg -hwaccel d3d11va -hwaccel_output_format d3d11 -i input.mp4 -c:v hevc_mf 
-hw_encoding 1 -quality 80 output.mp4
+ffmpeg -hwaccel d3d11va -hwaccel_output_format d3d11 -i input.mp4 -vf 
scale_d3d11=1920:1080 -c:v hevc_mf -hw_encoding 1 -quality 80 output.mp4
 @end example
 
 @section Microsoft RLE

commit 4e556b0c0c5b152832ca059d88c654787fca585d
Author:     Harshitha <[email protected]>
AuthorDate: Fri Nov 14 01:45:44 2025 -0800
Commit:     Gyan Doshi <[email protected]>
CommitDate: Wed Nov 19 04:48:11 2025 +0000

    doc/encoders: Document MediaFoundation encoders

diff --git a/doc/encoders.texi b/doc/encoders.texi
index b24f98946a..56e2f9008a 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -3414,11 +3414,100 @@ Maximum quantization parameter for B frame.
 @section MediaFoundation
 
 This provides wrappers to encoders (both audio and video) in the
-MediaFoundation framework. It can access both SW and HW encoders.
+MediaFoundation framework. It supports both software and hardware encoders
+through the following codecs:
+
+@itemize
+@item h264_mf
+@item hevc_mf
+@item av1_mf
+@end itemize
+
 Video encoders can take input in either of nv12 or yuv420p form
 (some encoders support both, some support only either - in practice,
 nv12 is the safer choice, especially among HW encoders).
 
+Hardware-accelerated encoding is supported via D3D11, including hardware
+scaling capabilities through the scale_d3d11 filter.
+
+To list all available options for the MediaFoundation encoders, use:
+@command{ffmpeg -h encoder=h264_mf}
+
+@subsection Options
+
+@table @option
+@item rate_control
+Select rate control mode. Available modes:
+
+@table @samp
+@item default
+Default mode
+@item cbr
+CBR mode
+@item pc_vbr
+Peak constrained VBR mode
+@item u_vbr
+Unconstrained VBR mode
+@item quality
+Quality mode
+@item ld_vbr
+Low delay VBR mode (requires Windows 8+)
+@item g_vbr
+Global VBR mode (requires Windows 8+)
+@item gld_vbr
+Global low delay VBR mode (requires Windows 8+)
+@end table
+
+@item scenario
+Select usage scenario. Available scenarios:
+
+@table @samp
+@item default
+Default scenario
+@item display_remoting
+Display remoting scenario
+@item video_conference
+Video conference scenario
+@item archive
+Archive scenario
+@item live_streaming
+Live streaming scenario
+@item camera_record
+Camera record scenario
+@item display_remoting_with_feature_map
+Display remoting with feature map scenario
+@end table
+
+@item quality
+Set encoding quality (0-100). -1 means default quality.
+
+@item hw_encoding
+Force hardware encoding (0-1). Default is 0 (disabled).
+
+@end table
+
+@subsection Examples
+
+Hardware encoding:
+@example
+ffmpeg -i input.mp4 -c:v h264_mf -hw_encoding 1 output.mp4
+@end example
+
+Hardware-accelerated decoding with hardware encoding:
+@example
+ffmpeg -hwaccel d3d11va -i input.mp4 -c:v h264_mf -hw_encoding 1 output.mp4
+@end example
+
+Hardware-accelerated decoding and encoding with scaling:
+@example
+ffmpeg -hwaccel d3d11va -hwaccel_output_format d3d11 -i input.mp4 -c:v h264_mf 
-hw_encoding 1 -vf scale_d3d11=1920:1080 output.mp4
+@end example
+
+Hardware decoding and encoding with quality setting:
+@example
+ffmpeg -hwaccel d3d11va -hwaccel_output_format d3d11 -i input.mp4 -c:v hevc_mf 
-hw_encoding 1 -quality 80 output.mp4
+@end example
+
 @section Microsoft RLE
 
 Microsoft RLE aka MSRLE encoder.

-----------------------------------------------------------------------

Summary of changes:
 doc/encoders.texi | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 87 insertions(+), 2 deletions(-)


hooks/post-receive
-- 

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to