diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 13:51:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 13:52:06 +0200 |
| commit | 17a065cf204fb626b6940b1bc3df5d6ab9f4a468 (patch) | |
| tree | bfb481ba8df17aaf8bba25bdfcda02e1d8ad21c0 /libavcodec/mpegvideo.h | |
| parent | 74128352047ee3fb075b0f69ab16047f70b45a42 (diff) | |
| parent | 946f95354ba76ef73c9b66889d86ab5fba4fb486 (diff) | |
| download | ffmpeg-17a065cf204fb626b6940b1bc3df5d6ab9f4a468.tar.gz | |
Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'
* commit '946f95354ba76ef73c9b66889d86ab5fba4fb486':
lavc: make rc_qmod_* into private options of mpegvideo encoders
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 72e1b4db5a..7e3d35c50b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -28,6 +28,8 @@ #ifndef AVCODEC_MPEGVIDEO_H #define AVCODEC_MPEGVIDEO_H +#include <float.h> + #include "avcodec.h" #include "blockdsp.h" #include "error_resilience.h" @@ -655,6 +657,8 @@ typedef struct MpegEncContext { * 0-> clipping, 1-> use a nice continuous function to limit qscale within qmin/qmax. */ float rc_qsquish; + float rc_qmod_amp; + int rc_qmod_freq; /* temp buffers for rate control */ float *cplx_tab, *bits_tab; @@ -702,7 +706,9 @@ typedef struct MpegEncContext { { "error_rate", "Simulate errors in the bitstream to test error concealment.", \ FF_MPV_OFFSET(error_rate), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FF_MPV_OPT_FLAGS },\ {"qsquish", "how to keep quantizer between qmin and qmax (0 = clip, 1 = use differentiable function)", \ - FF_MPV_OFFSET(rc_qsquish), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, 0, 99, FF_MPV_OPT_FLAGS}, + FF_MPV_OFFSET(rc_qsquish), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, 0, 99, FF_MPV_OPT_FLAGS}, \ +{"rc_qmod_amp", "experimental quantizer modulation", FF_MPV_OFFSET(rc_qmod_amp), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, FF_MPV_OPT_FLAGS}, \ +{"rc_qmod_freq", "experimental quantizer modulation", FF_MPV_OFFSET(rc_qmod_freq), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS}, extern const AVOption ff_mpv_generic_options[]; |