Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits: 2350fa6d by Lyndon Brown at 2022-01-06T07:27:13+00:00 rawaud: use config range enforcement for --rawaud-channels and --rawaud-samplerate - places helpful bounds on controls in gui prefs that prevent cycling out of range. - results in range hints being given in help output. - avoids unnecessary module code. - - - - - 1 changed file: - modules/demux/rawaud.c Changes: ===================================== modules/demux/rawaud.c ===================================== @@ -43,7 +43,7 @@ static void Close( vlc_object_t * ); #define SAMPLERATE_LONGTEXT N_("Audio sample rate in Hertz. Default is 48000 Hz.") #define CHANNELS_TEXT N_("Audio channels") -#define CHANNELS_LONGTEXT N_("Audio channels in input stream. Numeric value >0. Default is 2.") +#define CHANNELS_LONGTEXT N_("Audio channels in input stream. Default is 2 (stereo).") #define FOURCC_TEXT N_("FOURCC code of raw input format") #define FOURCC_LONGTEXT N_( \ @@ -65,9 +65,9 @@ vlc_module_begin(); set_subcategory( SUBCAT_INPUT_DEMUX ); set_callbacks( Open, Close ); add_shortcut( "rawaud" ); - add_integer( "rawaud-channels", 2, CHANNELS_TEXT, CHANNELS_LONGTEXT ); + add_integer_with_range( "rawaud-channels", 2, 1, 32, CHANNELS_TEXT, CHANNELS_LONGTEXT ) change_safe() - add_integer( "rawaud-samplerate", 48000, SAMPLERATE_TEXT, SAMPLERATE_LONGTEXT ); + add_integer_with_range( "rawaud-samplerate", 48000, 1, 384000, SAMPLERATE_TEXT, SAMPLERATE_LONGTEXT ) change_safe() add_string( "rawaud-fourcc", FOURCC_DEFAULT, FOURCC_TEXT, FOURCC_LONGTEXT ); @@ -164,22 +164,6 @@ static int Open( vlc_object_t * p_this ) p_sys->fmt.audio.i_channels = var_CreateGetInteger( p_demux, "rawaud-channels" ); p_sys->fmt.audio.i_rate = var_CreateGetInteger( p_demux, "rawaud-samplerate" ); - if( p_sys->fmt.audio.i_rate == 0 || p_sys->fmt.audio.i_rate > 384000 ) - { - msg_Err( p_demux, "invalid sample rate"); - es_format_Clean( &p_sys->fmt ); - free( p_sys ); - return VLC_EGENERIC; - } - - if( p_sys->fmt.audio.i_channels == 0 || p_sys->fmt.audio.i_channels > 32 ) - { - msg_Err( p_demux, "invalid number of channels"); - es_format_Clean( &p_sys->fmt ); - free( p_sys ); - return VLC_EGENERIC; - } - p_sys->fmt.i_bitrate = p_sys->fmt.audio.i_rate * p_sys->fmt.audio.i_channels * p_sys->fmt.audio.i_bitspersample; View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/2350fa6d97f9a1941804c8fd7d166177967d8cfb -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/2350fa6d97f9a1941804c8fd7d166177967d8cfb You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits