RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-02 21:21:33 +00:00
Code Issues Releases Wiki Activity

fixed bogus overloaded "q" parameter for lame mp3 encoding

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5923 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rfelker 2002-05-01 14:42:42 +00:00
parent 46a390a588
commit 9adb881e61
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cfg-mencoder.h
View File

@ -23,6 +23,7 @@ extern struct config divx4opts_conf[];
#ifdef HAVE_MP3LAME #ifdef HAVE_MP3LAME
struct config lameopts_conf[]={ struct config lameopts_conf[]={
{"q", &lame_param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL}, {"q", &lame_param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
{"aq", &lame_param_algqual, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
{"vbr", &lame_param_vbr, CONF_TYPE_INT, CONF_RANGE, 0, vbr_max_indicator, NULL}, {"vbr", &lame_param_vbr, CONF_TYPE_INT, CONF_RANGE, 0, vbr_max_indicator, NULL},
{"cbr", &lame_param_vbr, CONF_TYPE_FLAG, 0, 0, 0, NULL}, {"cbr", &lame_param_vbr, CONF_TYPE_FLAG, 0, 0, 0, NULL},
{"abr", &lame_param_vbr, CONF_TYPE_FLAG, 0, 0, vbr_abr, NULL}, {"abr", &lame_param_vbr, CONF_TYPE_FLAG, 0, 0, vbr_abr, NULL},

3
mencoder.c
View File

@ -181,6 +181,7 @@ float sub_last_pts = -303;
#ifdef HAVE_MP3LAME #ifdef HAVE_MP3LAME
int lame_param_quality=0; // best int lame_param_quality=0; // best
int lame_param_algqual=5; // same as old default
int lame_param_vbr=vbr_default; int lame_param_vbr=vbr_default;
int lame_param_mode=-1; // unset int lame_param_mode=-1; // unset
int lame_param_padding=-1; // unset int lame_param_padding=-1; // unset
@ -749,12 +750,12 @@ lame_set_bWriteVbrTag(lame,0);
lame_set_in_samplerate(lame,sh_audio->samplerate); lame_set_in_samplerate(lame,sh_audio->samplerate);
lame_set_num_channels(lame,mux_a->wf->nChannels); lame_set_num_channels(lame,mux_a->wf->nChannels);
lame_set_out_samplerate(lame,mux_a->wf->nSamplesPerSec); lame_set_out_samplerate(lame,mux_a->wf->nSamplesPerSec);
lame_set_quality(lame,lame_param_algqual); // 0 = best q
if(lame_param_vbr){ // VBR: if(lame_param_vbr){ // VBR:
lame_set_VBR(lame,lame_param_vbr); // vbr mode lame_set_VBR(lame,lame_param_vbr); // vbr mode
lame_set_VBR_q(lame,lame_param_quality+1); // 1 = best vbr q 6=~128k lame_set_VBR_q(lame,lame_param_quality+1); // 1 = best vbr q 6=~128k
if(lame_param_br>0) lame_set_VBR_mean_bitrate_kbps(lame,lame_param_br); if(lame_param_br>0) lame_set_VBR_mean_bitrate_kbps(lame,lame_param_br);
} else { // CBR: } else { // CBR:
lame_set_quality(lame,lame_param_quality); // 0 = best q
if(lame_param_br>0) lame_set_brate(lame,lame_param_br); if(lame_param_br>0) lame_set_brate(lame,lame_param_br);
} }
if(lame_param_mode>=0) lame_set_mode(lame,lame_param_mode); // j-st if(lame_param_mode>=0) lame_set_mode(lame,lame_param_mode); // j-st