aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2013-11-15 01:09:06 +0000
committerMichael Niedermayer <michaelni@gmx.at>2014-03-07 04:04:07 +0100
commitaeccfca26842402304dedb985f1d1955f2fa8e7d (patch)
tree1faaa71feec7c687359080a6d6d9493a3fc886e6
parent15d96c605bf213b4e07c6b8d08cebf8595832f9f (diff)
downloadffmpeg-aeccfca26842402304dedb985f1d1955f2fa8e7d.tar.gz
avcodec/libopusenc: change default frame duration to 20 ms
20 ms is used by libopus encoder. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 74906d3727ec3bd9b7b28dfa7a98ff6e8cf8b6d7) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/encoders.texi2
-rw-r--r--libavcodec/libopusenc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/encoders.texi b/doc/encoders.texi
index 32d77ee43d..22c125743a 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -749,7 +749,7 @@ Set maximum frame size, or duration of a frame in milliseconds. The
argument must be exactly the following: 2.5, 5, 10, 20, 40, 60. Smaller
frame sizes achieve lower latency but less quality at a given bitrate.
Sizes greater than 20ms are only interesting at fairly low bitrates.
-The default of FFmpeg is 10ms, but is 20ms in @command{opusenc}.
+The default is 20ms.
@item packet_loss (@emph{expect-loss})
Set expected packet loss percentage. The default is 0.
diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c
index d198798929..b34bd836ac 100644
--- a/libavcodec/libopusenc.c
+++ b/libavcodec/libopusenc.c
@@ -375,7 +375,7 @@ static const AVOption libopus_options[] = {
{ "voip", "Favor improved speech intelligibility", 0, AV_OPT_TYPE_CONST, { .i64 = OPUS_APPLICATION_VOIP }, 0, 0, FLAGS, "application" },
{ "audio", "Favor faithfulness to the input", 0, AV_OPT_TYPE_CONST, { .i64 = OPUS_APPLICATION_AUDIO }, 0, 0, FLAGS, "application" },
{ "lowdelay", "Restrict to only the lowest delay modes", 0, AV_OPT_TYPE_CONST, { .i64 = OPUS_APPLICATION_RESTRICTED_LOWDELAY }, 0, 0, FLAGS, "application" },
- { "frame_duration", "Duration of a frame in milliseconds", OFFSET(frame_duration), AV_OPT_TYPE_FLOAT, { .dbl = 10.0 }, 2.5, 60.0, FLAGS },
+ { "frame_duration", "Duration of a frame in milliseconds", OFFSET(frame_duration), AV_OPT_TYPE_FLOAT, { .dbl = 20.0 }, 2.5, 60.0, FLAGS },
{ "packet_loss", "Expected packet loss percentage", OFFSET(packet_loss), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 100, FLAGS },
{ "vbr", "Variable bit rate mode", OFFSET(vbr), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 2, FLAGS, "vbr" },
{ "off", "Use constant bit rate", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FLAGS, "vbr" },