diff options
author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-05-19 04:33:00 +0000 |
---|---|---|
committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-05-19 04:33:00 +0000 |
commit | 0e5425c2b9c000252e08810c1f73727594903a0f (patch) | |
tree | f35c7126622af0e2e0018a9ec825dd8350de13e0 | |
parent | ddc03e626ab681f85833e1e926a728656e74ba36 (diff) | |
download | mpv-0e5425c2b9c000252e08810c1f73727594903a0f.tar.bz2 mpv-0e5425c2b9c000252e08810c1f73727594903a0f.tar.xz |
more lame options
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12490 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | cfg-mencoder.h | 4 | ||||
-rw-r--r-- | mencoder.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index 56cc8ba92f..cc4260b147 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -35,6 +35,10 @@ m_option_t lameopts_conf[]={ {"vol", &lame_param_scale, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10, NULL}, {"lowpassfreq",&lame_param_lowpassfreq, CONF_TYPE_INT, CONF_RANGE, -1, 48000,0}, {"highpassfreq",&lame_param_highpassfreq, CONF_TYPE_INT, CONF_RANGE, -1, 48000,0}, + {"nofree", &lame_param_free_format, CONF_TYPE_FLAG, 0, 0, 0, NULL}, + {"free", &lame_param_free_format, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"br_min", &lame_param_br_min, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL}, + {"br_max", &lame_param_br_max, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL}, #if HAVE_MP3LAME >= 392 {"fast", &lame_param_fast, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"preset", &lame_param_preset, CONF_TYPE_STRING, 0, 0, 0, NULL}, diff --git a/mencoder.c b/mencoder.c index a41eaafda0..60ed44d9b0 100644 --- a/mencoder.c +++ b/mencoder.c @@ -224,6 +224,9 @@ int lame_param_ratio=-1; // unset float lame_param_scale=-1; // unset int lame_param_lowpassfreq = 0; //auto int lame_param_highpassfreq = 0; //auto +int lame_param_free_format = 0; //disabled +int lame_param_br_min = 0; //not specified +int lame_param_br_max = 0; //not specified #if HAVE_MP3LAME >= 392 int lame_param_fast=0; // unset @@ -1007,10 +1010,13 @@ lame_set_in_samplerate(lame,mux_a->wf->nSamplesPerSec); lame_set_num_channels(lame,mux_a->wf->nChannels); lame_set_out_samplerate(lame,mux_a->wf->nSamplesPerSec); lame_set_quality(lame,lame_param_algqual); // 0 = best q +if(lame_param_free_format) lame_set_free_format(lame,1); if(lame_param_vbr){ // VBR: lame_set_VBR(lame,lame_param_vbr); // vbr mode lame_set_VBR_q(lame,lame_param_quality); // 0 = best vbr q 5=~128k if(lame_param_br>0) lame_set_VBR_mean_bitrate_kbps(lame,lame_param_br); + if(lame_param_br_min>0) lame_set_VBR_min_bitrate_kbps(lame,lame_param_br_min); + if(lame_param_br_max>0) lame_set_VBR_max_bitrate_kbps(lame,lame_param_br_max); } else { // CBR: if(lame_param_br>0) lame_set_brate(lame,lame_param_br); } |