Skip to content

V
vlc
Commit c7fd60df authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Mark as safe v4l2 options already allowed by ParseMRL()

parent 9a35916b
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 0 deletions
modules/access/v4l2.c
View file @ c7fd60df
...@@ -309,25 +309,34 @@ vlc_module_begin () ...@@ -309,25 +309,34 @@ vlc_module_begin ()
set_section( N_( "Video input" ), NULL ) set_section( N_( "Video input" ), NULL )
add_string( CFG_PREFIX "dev", "/dev/video0", DEVICE_TEXT, DEVICE_LONGTEXT, add_string( CFG_PREFIX "dev", "/dev/video0", DEVICE_TEXT, DEVICE_LONGTEXT,
false ) false )
change_safe()
add_string( CFG_PREFIX "standard", "", add_string( CFG_PREFIX "standard", "",
STANDARD_TEXT, STANDARD_LONGTEXT, false ) STANDARD_TEXT, STANDARD_LONGTEXT, false )
change_string_list( standards_vlc, standards_user, NULL ) change_string_list( standards_vlc, standards_user, NULL )
change_safe()
add_string( CFG_PREFIX "chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, add_string( CFG_PREFIX "chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
true ) true )
change_safe()
add_integer( CFG_PREFIX "input", 0, INPUT_TEXT, INPUT_LONGTEXT, add_integer( CFG_PREFIX "input", 0, INPUT_TEXT, INPUT_LONGTEXT,
true ) true )
change_integer_range( 0, 0xFFFFFFFE ) change_integer_range( 0, 0xFFFFFFFE )
change_safe()
add_integer( CFG_PREFIX "audio-input", 0, AUDIO_INPUT_TEXT, add_integer( CFG_PREFIX "audio-input", 0, AUDIO_INPUT_TEXT,
AUDIO_INPUT_LONGTEXT, true ) AUDIO_INPUT_LONGTEXT, true )
change_integer_range( 0, 0xFFFFFFFE ) change_integer_range( 0, 0xFFFFFFFE )
change_safe()
add_obsolete_integer( CFG_PREFIX "io" ) /* since 1.2.0 */ add_obsolete_integer( CFG_PREFIX "io" ) /* since 1.2.0 */
add_integer( CFG_PREFIX "width", DEFAULT_WIDTH, WIDTH_TEXT, add_integer( CFG_PREFIX "width", DEFAULT_WIDTH, WIDTH_TEXT,
WIDTH_LONGTEXT, true ) WIDTH_LONGTEXT, true )
change_safe()
add_integer( CFG_PREFIX "height", DEFAULT_HEIGHT, HEIGHT_TEXT, add_integer( CFG_PREFIX "height", DEFAULT_HEIGHT, HEIGHT_TEXT,
HEIGHT_LONGTEXT, true ) HEIGHT_LONGTEXT, true )
change_safe()
add_string( CFG_PREFIX "aspect-ratio", "4:3", ASPECT_TEXT, add_string( CFG_PREFIX "aspect-ratio", "4:3", ASPECT_TEXT,
ASPECT_LONGTEXT, true ) ASPECT_LONGTEXT, true )
change_safe()
add_float( CFG_PREFIX "fps", 0, FPS_TEXT, FPS_LONGTEXT, true ) add_float( CFG_PREFIX "fps", 0, FPS_TEXT, FPS_LONGTEXT, true )
change_safe()
#ifdef HAVE_LIBV4L2 #ifdef HAVE_LIBV4L2
add_bool( CFG_PREFIX "use-libv4l2", false, LIBV4L2_TEXT, LIBV4L2_LONGTEXT, true ); add_bool( CFG_PREFIX "use-libv4l2", false, LIBV4L2_TEXT, LIBV4L2_LONGTEXT, true );
#endif #endif
...@@ -336,17 +345,21 @@ vlc_module_begin () ...@@ -336,17 +345,21 @@ vlc_module_begin ()
add_integer( CFG_PREFIX "tuner", 0, TUNER_TEXT, TUNER_LONGTEXT, add_integer( CFG_PREFIX "tuner", 0, TUNER_TEXT, TUNER_LONGTEXT,
true ) true )
change_integer_range( 0, 0xFFFFFFFE ) change_integer_range( 0, 0xFFFFFFFE )
change_safe()
add_integer( CFG_PREFIX "tuner-frequency", -1, FREQUENCY_TEXT, add_integer( CFG_PREFIX "tuner-frequency", -1, FREQUENCY_TEXT,
FREQUENCY_LONGTEXT, true ) FREQUENCY_LONGTEXT, true )
change_safe()
add_integer( CFG_PREFIX "tuner-audio-mode", -1, TUNER_AUDIO_MODE_TEXT, add_integer( CFG_PREFIX "tuner-audio-mode", -1, TUNER_AUDIO_MODE_TEXT,
TUNER_AUDIO_MODE_LONGTEXT, true ) TUNER_AUDIO_MODE_LONGTEXT, true )
change_integer_list( i_tuner_audio_modes_list, change_integer_list( i_tuner_audio_modes_list,
psz_tuner_audio_modes_list_text ) psz_tuner_audio_modes_list_text )
change_safe()
set_section( N_( "Controls" ), set_section( N_( "Controls" ),
N_( "v4l2 driver controls, if supported by your v4l2 driver." ) ) N_( "v4l2 driver controls, if supported by your v4l2 driver." ) )
add_bool( CFG_PREFIX "controls-reset", false, CTRL_RESET_TEXT, add_bool( CFG_PREFIX "controls-reset", false, CTRL_RESET_TEXT,
CTRL_RESET_LONGTEXT, true ) CTRL_RESET_LONGTEXT, true )
change_safe()
add_integer( CFG_PREFIX "brightness", -1, BRIGHTNESS_TEXT, add_integer( CFG_PREFIX "brightness", -1, BRIGHTNESS_TEXT,
BRIGHTNESS_LONGTEXT, true ) BRIGHTNESS_LONGTEXT, true )
add_integer( CFG_PREFIX "contrast", -1, CONTRAST_TEXT, add_integer( CFG_PREFIX "contrast", -1, CONTRAST_TEXT,
...@@ -395,6 +408,7 @@ vlc_module_begin () ...@@ -395,6 +408,7 @@ vlc_module_begin ()
AUDIO_LOUDNESS_LONGTEXT, true ) AUDIO_LOUDNESS_LONGTEXT, true )
add_string( CFG_PREFIX "set-ctrls", NULL, S_CTRLS_TEXT, add_string( CFG_PREFIX "set-ctrls", NULL, S_CTRLS_TEXT,
S_CTRLS_LONGTEXT, true ) S_CTRLS_LONGTEXT, true )
change_safe()
add_obsolete_string( CFG_PREFIX "adev" ) add_obsolete_string( CFG_PREFIX "adev" )
add_obsolete_integer( CFG_PREFIX "audio-method" ) add_obsolete_integer( CFG_PREFIX "audio-method" )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment