Skip to content

V
vlc-1.1
Commit 51c3cea1 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

* more cleanup

parent f404f6c0
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 28 deletions
modules/access/dvb/access.c
View file @ 51c3cea1
...@@ -124,7 +124,7 @@ int E_(Open) ( vlc_object_t *p_this ) ...@@ -124,7 +124,7 @@ int E_(Open) ( vlc_object_t *p_this )
} }
else /* no frontend probing is done so use default border values. */ else /* no frontend probing is done so use default border values. */
{ {
msg_Dbg( p_input, "using default bvalues for frontend info" ); msg_Dbg( p_input, "using default values for frontend info" );
i_len = sizeof(FRONTEND); i_len = sizeof(FRONTEND);
if (snprintf(frontend, sizeof(FRONTEND), FRONTEND, u_adapter, u_device) >= i_len) if (snprintf(frontend, sizeof(FRONTEND), FRONTEND, u_adapter, u_device) >= i_len)
{ {
...@@ -145,8 +145,8 @@ int E_(Open) ( vlc_object_t *p_this ) ...@@ -145,8 +145,8 @@ int E_(Open) ( vlc_object_t *p_this )
frontend_info.frequency_max = 12999 * 1000; frontend_info.frequency_max = 12999 * 1000;
frontend_info.frequency_min = 9750 * 1000; frontend_info.frequency_min = 9750 * 1000;
frontend_info.symbol_rate_max = 30000; frontend_info.symbol_rate_max = 30000 * 1000;
frontend_info.symbol_rate_min = 1000; frontend_info.symbol_rate_min = 1000 * 1000;
} }
/* Register Callback functions */ /* Register Callback functions */
...@@ -179,6 +179,7 @@ int E_(Open) ( vlc_object_t *p_this ) ...@@ -179,6 +179,7 @@ int E_(Open) ( vlc_object_t *p_this )
{ {
msg_Warn( p_input, "invalid frequency %d (kHz), using default one", u_freq ); msg_Warn( p_input, "invalid frequency %d (kHz), using default one", u_freq );
u_freq = config_GetInt( p_input, "frequency" ); u_freq = config_GetInt( p_input, "frequency" );
u_freq *= 1000;
if ( ((u_freq) > frontend_info.frequency_max) || if ( ((u_freq) > frontend_info.frequency_max) ||
((u_freq) < frontend_info.frequency_min) ) ((u_freq) < frontend_info.frequency_min) )
{ {
...@@ -187,11 +188,13 @@ int E_(Open) ( vlc_object_t *p_this ) ...@@ -187,11 +188,13 @@ int E_(Open) ( vlc_object_t *p_this )
} }
} }
u_srate *= 1000;
if ( ((u_srate) > frontend_info.symbol_rate_max) || if ( ((u_srate) > frontend_info.symbol_rate_max) ||
((u_srate) < frontend_info.symbol_rate_min) ) ((u_srate) < frontend_info.symbol_rate_min) )
{ {
msg_Warn( p_input, "invalid symbol rate, using default one" ); msg_Warn( p_input, "invalid symbol rate, using default one" );
u_srate = config_GetInt( p_input, "symbol-rate" ); u_srate = config_GetInt( p_input, "symbol-rate" );
u_srate *= 1000;
if ( ((u_srate) > frontend_info.symbol_rate_max) || if ( ((u_srate) > frontend_info.symbol_rate_max) ||
((u_srate) < frontend_info.symbol_rate_min) ) ((u_srate) < frontend_info.symbol_rate_min) )
{ {
...@@ -235,7 +238,7 @@ int E_(Open) ( vlc_object_t *p_this ) ...@@ -235,7 +238,7 @@ int E_(Open) ( vlc_object_t *p_this )
case FE_QPSK: case FE_QPSK:
fep.frequency = u_freq; fep.frequency = u_freq;
fep.inversion = dvb_DecodeInversion(p_input, (int) b_polarisation); fep.inversion = dvb_DecodeInversion(p_input, (int) b_polarisation);
fep.u.qpsk.symbol_rate = u_srate * 1000; fep.u.qpsk.symbol_rate = u_srate;
fep.u.qpsk.fec_inner = dvb_DecodeFEC(p_input, i_fec); fep.u.qpsk.fec_inner = dvb_DecodeFEC(p_input, i_fec);
msg_Dbg( p_input, "satellite (QPSK) frontend found on %s", frontend_info.name ); msg_Dbg( p_input, "satellite (QPSK) frontend found on %s", frontend_info.name );
break; break;
...@@ -246,7 +249,7 @@ int E_(Open) ( vlc_object_t *p_this ) ...@@ -246,7 +249,7 @@ int E_(Open) ( vlc_object_t *p_this )
fep.frequency = u_freq; fep.frequency = u_freq;
fep.inversion = dvb_DecodeInversion(p_input, (int) b_polarisation); fep.inversion = dvb_DecodeInversion(p_input, (int) b_polarisation);
fep.u.qam.symbol_rate = u_srate * 1000; fep.u.qam.symbol_rate = u_srate;
fep.u.qam.fec_inner = dvb_DecodeFEC(p_input, i_fec); fep.u.qam.fec_inner = dvb_DecodeFEC(p_input, i_fec);
fep.u.qam.modulation = dvb_DecodeModulation(p_input, i_modulation); fep.u.qam.modulation = dvb_DecodeModulation(p_input, i_modulation);
msg_Dbg( p_input, "cable (QAM) frontend found on %s", frontend_info.name ); msg_Dbg( p_input, "cable (QAM) frontend found on %s", frontend_info.name );
...@@ -347,7 +350,7 @@ int E_(Open) ( vlc_object_t *p_this ) ...@@ -347,7 +350,7 @@ int E_(Open) ( vlc_object_t *p_this )
msg_Dbg( p_input, "setting filter on PAT" ); msg_Dbg( p_input, "setting filter on PAT" );
if ( ioctl_SetDMXFilter(p_input, 0, &i_fd, 3, u_adapter, u_device ) < 0 ) if ( ioctl_SetDMXFilter(p_input, 0, &i_fd, 21, u_adapter, u_device ) < 0 )
{ {
# ifdef HAVE_ERRNO_H # ifdef HAVE_ERRNO_H
msg_Err( p_input, "an error occured when setting filter on PAT (%s)", strerror(errno) ); msg_Err( p_input, "an error occured when setting filter on PAT (%s)", strerror(errno) );
...@@ -432,7 +435,7 @@ static ssize_t SatelliteRead( input_thread_t * p_input, byte_t * p_buffer, ...@@ -432,7 +435,7 @@ static ssize_t SatelliteRead( input_thread_t * p_input, byte_t * p_buffer,
{ {
ioctl_SetDMXFilter(p_input, p_input->stream.pp_programs[i]->pp_es[0]->i_id, ioctl_SetDMXFilter(p_input, p_input->stream.pp_programs[i]->pp_es[0]->i_id,
&p_input->stream.pp_programs[i]->pp_es[0]->i_demux_fd, &p_input->stream.pp_programs[i]->pp_es[0]->i_demux_fd,
3, u_adapter, u_device ); 21, u_adapter, u_device );
} }
} }
...@@ -509,7 +512,7 @@ int SatelliteSetProgram( input_thread_t * p_input, ...@@ -509,7 +512,7 @@ int SatelliteSetProgram( input_thread_t * p_input,
{ {
ioctl_SetDMXFilter(p_input, p_es->i_id, &p_es->i_demux_fd, u_video_type, ioctl_SetDMXFilter(p_input, p_es->i_id, &p_es->i_demux_fd, u_video_type,
u_adapter, u_device); u_adapter, u_device);
u_video_type += 3; u_video_type += 5;
} }
break; break;
case MPEG1_AUDIO_ES: case MPEG1_AUDIO_ES:
...@@ -519,12 +522,13 @@ int SatelliteSetProgram( input_thread_t * p_input, ...@@ -519,12 +522,13 @@ int SatelliteSetProgram( input_thread_t * p_input,
ioctl_SetDMXFilter(p_input, p_es->i_id, &p_es->i_demux_fd, u_audio_type, ioctl_SetDMXFilter(p_input, p_es->i_id, &p_es->i_demux_fd, u_audio_type,
u_adapter, u_device); u_adapter, u_device);
input_SelectES( p_input , p_es ); input_SelectES( p_input , p_es );
u_audio_type += 3; u_audio_type += 5;
} }
break; break;
default: default:
ioctl_SetDMXFilter(p_input, p_es->i_id, &p_es->i_demux_fd, 3, u_adapter, u_device); ioctl_SetDMXFilter(p_input, p_es->i_id, &p_es->i_demux_fd, 21, u_adapter, u_device);
input_SelectES( p_input , p_es ); input_SelectES( p_input , p_es );
msg_Dbg(p_input, "Warning ES streamtype 0x%d found used as DMX_PES_OTHER !!",(int) p_es->i_cat);
break; break;
#undef p_es #undef p_es
} }
......
modules/access/dvb/dvb.c
View file @ 51c3cea1
...@@ -488,45 +488,96 @@ int ioctl_SetDMXFilter(input_thread_t * p_input, int i_pid, int * pi_fd , int i_ ...@@ -488,45 +488,96 @@ int ioctl_SetDMXFilter(input_thread_t * p_input, int i_pid, int * pi_fd , int i_
s_filter_params.input = DMX_IN_FRONTEND; s_filter_params.input = DMX_IN_FRONTEND;
s_filter_params.output = DMX_OUT_TS_TAP; s_filter_params.output = DMX_OUT_TS_TAP;
switch ( i_type ) switch ( i_type )
{ { /* First device */
case 1: case 1:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_VIDEO for PMT %d", i_pid); msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_VIDEO0 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_VIDEO; s_filter_params.pes_type = DMX_PES_VIDEO0;
break; break;
case 2: case 2:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_AUDIO for PMT %d", i_pid); msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_AUDIO0 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_AUDIO; s_filter_params.pes_type = DMX_PES_AUDIO0;
break; break;
case 3: case 3:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_OTHER for PMT %d", i_pid); msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_TELETEXT0 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_OTHER; s_filter_params.pes_type = DMX_PES_TELETEXT0;
break; break;
case 4: case 4:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_SUBTITLE0 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_SUBTITLE0;
break;
case 5:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_PCR0 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_PCR0;
break;
/* Second device */
case 6:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_VIDEO1 for PMT %d", i_pid); msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_VIDEO1 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_VIDEO1; s_filter_params.pes_type = DMX_PES_VIDEO1;
break; break;
case 5: case 7:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_AUDIO1 for PMT %d", i_pid); msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_AUDIO1 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_AUDIO1; s_filter_params.pes_type = DMX_PES_AUDIO1;
break; break;
case 8:
case 7: msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_TELETEXT1 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_TELETEXT1;
break;
case 9:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_SUBTITLE1 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_SUBTITLE1;
break;
case 10:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_PCR1 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_PCR1;
break;
/* Third device */
case 11:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_VIDEO2 for PMT %d", i_pid); msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_VIDEO2 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_VIDEO2; s_filter_params.pes_type = DMX_PES_VIDEO2;
break; break;
case 8: case 12:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_AUDIO2 for PMT %d", i_pid); msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_AUDIO2 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_AUDIO2; s_filter_params.pes_type = DMX_PES_AUDIO2;
break; break;
case 13:
case 10: msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_TELETEXT2 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_TELETEXT2;
break;
case 14:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_SUBTITLE2 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_SUBTITLE2;
break;
case 15:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_PCR2 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_PCR2;
break;
/* Forth device */
case 16:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_VIDEO3 for PMT %d", i_pid); msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_VIDEO3 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_VIDEO3; s_filter_params.pes_type = DMX_PES_VIDEO3;
break; break;
case 11: case 17:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_AUDIO3 for PMT %d", i_pid); msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_AUDIO3 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_AUDIO3; s_filter_params.pes_type = DMX_PES_AUDIO3;
break; break;
case 18:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_TELETEXT3 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_TELETEXT3;
break;
case 19:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_SUBTITLE3 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_SUBTITLE3;
break;
case 20:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_PCR3 for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_PCR3;
break;
/* Usually used by Nova cards */
case 21:
msg_Dbg(p_input, "ioctl_SetDMXFilter: DMX_PES_OTHER for PMT %d", i_pid);
s_filter_params.pes_type = DMX_PES_OTHER;
break;
/* What to do with i? */
default: default:
msg_Err(p_input, "trying to set PMT id to=%d for unknown type %d", i_pid, i_type ); msg_Err(p_input, "trying to set PMT id to=%d for unknown type %d", i_pid, i_type );
break; break;
......
modules/access/dvb/qpsk.c
View file @ 51c3cea1
...@@ -99,7 +99,7 @@ void E_(Close) ( vlc_object_t * ); ...@@ -99,7 +99,7 @@ void E_(Close) ( vlc_object_t * );
vlc_module_begin(); vlc_module_begin();
add_category_hint( N_("Input"), NULL, VLC_FALSE ); add_category_hint( N_("Input"), NULL, VLC_FALSE );
add_integer( "adapter", 1, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT, VLC_FALSE ); add_integer( "adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT, VLC_FALSE );
add_integer( "device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT, VLC_FALSE ); add_integer( "device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT, VLC_FALSE );
add_integer( "frequency", 11954, NULL, FREQ_TEXT, FREQ_LONGTEXT, VLC_FALSE ); add_integer( "frequency", 11954, NULL, FREQ_TEXT, FREQ_LONGTEXT, VLC_FALSE );
add_integer( "polarization", 0, NULL, POL_TEXT, POL_LONGTEXT, VLC_FALSE ); add_integer( "polarization", 0, NULL, POL_TEXT, POL_LONGTEXT, VLC_FALSE );
......
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