Author: dmeyer
Date: Fri Feb 23 13:54:26 2007
New Revision: 2512
Modified:
trunk/WIP/record/src/channel.py
trunk/WIP/record/src/gstdvbsrc.py
trunk/WIP/record/src/gstdvbtuner.c
Log:
make DVB-S work
Modified: trunk/WIP/record/src/channel.py
==============================================================================
--- trunk/WIP/record/src/channel.py (original)
+++ trunk/WIP/record/src/channel.py Fri Feb 23 13:54:26 2007
@@ -160,9 +160,9 @@
if param[0]=='Y':
self.config['hierarchy'] = param[1:]
if param[0]=='H':
- self.config['horizontal_polarization'] = param[1:]
+ self.config['horizontal_polarization'] = True
if param[0]=='V':
- self.config['vertical_polarization'] = param[1:]
+ self.config['horizontal_polarization'] = False
if param[0]=='R':
self.config['circular_polarization_right'] = param[1:]
if param[0]=='L':
Modified: trunk/WIP/record/src/gstdvbsrc.py
==============================================================================
--- trunk/WIP/record/src/gstdvbsrc.py (original)
+++ trunk/WIP/record/src/gstdvbsrc.py Fri Feb 23 13:54:26 2007
@@ -28,11 +28,20 @@
channel = value
frontendtype = self._tuner.get_property('frontendtype')
if frontendtype == 0:
- # TODO FIXME broken --> fixme
- DVBS
+ # TODO FIXME I have to fix parser and tuner! -
+ # they should use the same keywords
+ channel.config['symbol-rate'] =
int(channel.config['symbolrate'])
+ # Note from Dischi: for some reason we need the not, took me
some time
+ # to find this. BTW, polarisation vs. polarization.
+ channel.config['polarisation'] = not
channel.config['horizontal_polarization']
+
+ for cfgitem in [ 'frequency', 'symbol-rate', 'polarisation' ]:
+ print '%s ==> %s' % (cfgitem, channel.config[ cfgitem ])
+ self._tuner.set_property( cfgitem, channel.config[ cfgitem
] )
+
elif frontendtype == 1:
- # TODO FIXME broken --> fixme
- DVBC
+ raise AttributeError('FIXME: DVB-C tuning unsupported')
+
elif frontendtype == 2:
# TODO FIXME I have to fix parser and tuner! -
# they should use the same keywords
@@ -46,8 +55,8 @@
self._tuner.set_property( cfgitem, channel.config[ cfgitem
] )
elif frontendtype == 3:
- # TODO FIXME broken --> fixme
- ATSC
+ raise AttributeError('FIXME: ATSC tuning unsupported')
+
else:
print 'OH NO! Please fix this code!'
Modified: trunk/WIP/record/src/gstdvbtuner.c
==============================================================================
--- trunk/WIP/record/src/gstdvbtuner.c (original)
+++ trunk/WIP/record/src/gstdvbtuner.c Fri Feb 23 13:54:26 2007
@@ -609,11 +609,11 @@
case PROP_FREQUENCY:
{
filter->feparam.frequency = g_value_get_uint(value);
- if(filter->feparam.frequency > 11700) {
- filter->feparam.frequency = (filter->feparam.frequency -
10600)*1000;
+ if(filter->feparam.frequency > 11700000) {
+ filter->feparam.frequency = (filter->feparam.frequency -
10600000);
filter->tone = 1;
} else {
- filter->feparam.frequency = (filter->feparam.frequency -
9750)*1000;
+ filter->feparam.frequency = (filter->feparam.frequency -
9750000);
filter->tone = 0;
}
filter->feparam.inversion = INVERSION_AUTO;
@@ -1285,18 +1285,29 @@
}
}
- if (filter->feinfo.type==FE_OFDM) {
- DEBUGf( "front_param.frequency = %d", filter->feparam.frequency);
- DEBUGf( "front_param.inversion = %d", filter->feparam.inversion);
- DEBUGf( "front_param.ofdm.bandwidth = %d",
filter->feparam.u.ofdm.bandwidth );
- DEBUGf( "front_param.ofdm.code_rate_HP = %d",
filter->feparam.u.ofdm.code_rate_HP );
- DEBUGf( "front_param.ofdm.code_rate_LP = %d",
filter->feparam.u.ofdm.code_rate_LP );
- DEBUGf( "front_param.ofdm.constellation = %d",
filter->feparam.u.ofdm.constellation );
- DEBUGf( "front_param.ofdm.transmission_m= %d",
filter->feparam.u.ofdm.transmission_mode );
- DEBUGf( "front_param.ofdm.guard_interval= %d",
filter->feparam.u.ofdm.guard_interval );
- DEBUGf( "front_param.ofdm.hierarchy_info= %d",
filter->feparam.u.ofdm.hierarchy_information );
- } else {
- DEBUGf( "FIXME: print debug output" );
+ switch (filter->feinfo.type) {
+
+ case FE_QPSK:
+ DEBUGf( "front_param.frequency = %d",
filter->feparam.frequency);
+ DEBUGf( "front_param.inversion = %d",
filter->feparam.inversion);
+ DEBUGf( "front_param.qpsk.symbol_rate = %d",
filter->feparam.u.qpsk.symbol_rate );
+ DEBUGf( "front_param.qpsk.fec_inner = %d",
filter->feparam.u.qpsk.fec_inner );
+ break;
+
+ case FE_OFDM:
+ DEBUGf( "front_param.frequency = %d",
filter->feparam.frequency);
+ DEBUGf( "front_param.inversion = %d",
filter->feparam.inversion);
+ DEBUGf( "front_param.ofdm.bandwidth = %d",
filter->feparam.u.ofdm.bandwidth );
+ DEBUGf( "front_param.ofdm.code_rate_HP = %d",
filter->feparam.u.ofdm.code_rate_HP );
+ DEBUGf( "front_param.ofdm.code_rate_LP = %d",
filter->feparam.u.ofdm.code_rate_LP );
+ DEBUGf( "front_param.ofdm.constellation = %d",
filter->feparam.u.ofdm.constellation );
+ DEBUGf( "front_param.ofdm.transmission_m= %d",
filter->feparam.u.ofdm.transmission_mode );
+ DEBUGf( "front_param.ofdm.guard_interval= %d",
filter->feparam.u.ofdm.guard_interval );
+ DEBUGf( "front_param.ofdm.hierarchy_info= %d",
filter->feparam.u.ofdm.hierarchy_information );
+ break;
+
+ default:
+ DEBUGf( "FIXME: print debug output" );
}
/* discard stale events */
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
