diff mbox

[FFmpeg-devel,V3,3/3] Add docs and Changelog

Message ID eac23b95-bb59-df50-8f0c-ac6c647ccc58@mail.de
State New
Headers show

Commit Message

Thilo Borgmann April 22, 2018, 9:16 p.m. UTC
From 49c6fa2051f2c1d2955405df938d930313b8f2a2 Mon Sep 17 00:00:00 2001
From: Thilo Borgmann <thilo.borgmann@mail.de>
Date: Tue, 17 Apr 2018 22:55:29 +0200
Subject: [PATCH 3/3] Add docs and Changelog

 Changelog         |  2 ++
 doc/encoders.texi | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/general.texi  |  7 +++++
 3 files changed, 101 insertions(+)


Carl Eugen Hoyos April 23, 2018, 12:18 p.m. UTC | #1
2018-04-22 23:16 GMT+02:00, Thilo Borgmann <thilo.borgmann@mail.de>:

Why is this a separate patch?

Carl Eugen
Thilo Borgmann April 23, 2018, 6:41 p.m. UTC | #2
Am 23.04.18 um 14:18 schrieb Carl Eugen Hoyos:
> 2018-04-22 23:16 GMT+02:00, Thilo Borgmann <thilo.borgmann@mail.de>:
> Why is this a separate patch?

To make the git-work a bit easier - do you want it to be merged into the others, would it be sufficient to do that before pushing?

diff mbox


diff --git a/Changelog b/Changelog
index 7df4513..b740322 100644
--- a/Changelog
+++ b/Changelog
@@ -54,6 +54,8 @@  version <next>:
 - Haivision SRT protocol via libsrt
 - segafilm muxer
 - vfrdet filter
+- RMHD Muxer/Demuxer
+- RealVideo 11 support via librv11
 version 3.4:
diff --git a/doc/encoders.texi b/doc/encoders.texi
index 7b09575..5818514 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -1457,6 +1457,98 @@  Set maximum NAL size in bytes.
 Allow skipping frames to hit the target bitrate if set to 1.
 @end table
+@section librv11
+RealVideo 11 (RV60) codec wrapper.
+Requires the presence of the librv11 SDK headers and
+libraries during configuration. The library is detected using
+For more information about the library see
+@subsection Options
+The following FFmpeg global options affect the configurations of the
+librv11 encoder.
+@table @option
+@item b
+Set the bitrate (as a number of bits per second).
+@item is_lossprotect
+Enable loss protection feature
+@item output_width
+Video encoded frame output width
+@item output_height
+Video encoded frame output height
+@item rc_strategy
+Which ratecontrol method to be used (default: bitrate)
+@table @samp
+@item bitrate
+@item quality
+@end table
+@item complexity
+Encoding complexity (default: medium)
+@table @samp
+@item verylow
+@item low
+@item medium
+@item high
+@end table
+@item framerate
+Max frame rate value
+@item resize_quality
+Video encoded frame resize quality (default: 1),
+@table @samp
+@item high
+@item fast
+@end table
+@item video_mode
+Motion quality (default: 50)
+@table @samp
+@item normal
+@item sharp
+@item smooth
+@end table
+@item max_keyint
+Max keyframe interval (default: 5),
+@item max_latency
+Max video latency on start (default: 4.0)
+@item vbrquality
+Vbr quality value (default: 60)
+@item passlogfile
+Filename for 2 pass encoding stats (default: rv11passstats.log)
+@item pon
+Picture order number (default: 0)
+@item vbr_opt (default: false)
+Vbr enabled
+@table @samp
+@item true
+@item false
+@end table
+@end table
 @section libtheora
 libtheora Theora encoder wrapper.
diff --git a/doc/general.texi b/doc/general.texi
index 2583006..5af6585 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -263,6 +263,12 @@  Create an @code{AMF/} directory in the system include path.
 Copy the contents of @code{AMF/amf/public/include/} into that directory.
 Then configure FFmpeg with @code{--enable-amf}.
+@section RealVideo11 (RV60)
+FFmpeg can make use of the RV11 codec libraries for encoding and decoding.
+Go to @url{http://www.rmhd.io/} and download the SDK installer.
 @chapter Supported File Formats, Codecs or Features
@@ -542,6 +548,7 @@  library:
 @item REDCODE R3D               @tab   @tab X
     @tab File format used by RED Digital cameras, contains JPEG 2000 frames and PCM audio.
 @item RealMedia                 @tab X @tab X
+@item RealMedia HD              @tab X @tab X
 @item Redirector                @tab   @tab X
 @item RedSpark                  @tab   @tab X
 @item Renderware TeXture Dictionary @tab   @tab X