[vlc-commits] dvb-c: update frequency table

[Ilkka Ollakka]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Thu Mar 10 13:12:21 2011 +0200| [d1c615c1ad66056e14b40ec97a08b53bf6c92688] | committer: Ilkka Ollakka

dvb-c: update frequency table

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d1c615c1ad66056e14b40ec97a08b53bf6c92688
---

 modules/access/dvb/scan.c |   40 +++++++++++++++++++---------------------
 1 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/modules/access/dvb/scan.c b/modules/access/dvb/scan.c
index fe60a21..a39c4d5 100644
--- a/modules/access/dvb/scan.c
+++ b/modules/access/dvb/scan.c
@@ -358,32 +358,30 @@ static int ScanDvbCNextFast( scan_t *p_scan, scan_configuration_t *p_cfg, double
     msg_Dbg( p_scan->p_obj, "Scan index %"PRId64, p_scan->i_index );
     /* Values taken from dvb-scan utils frequency-files, sorted by how
      * often they appear. This hopefully speeds up finding services. */
-    static const unsigned short frequencies[] = {
-     410, 426, 418, 394, 402, 362,
-     370, 354, 346, 442, 434, 386,
-     378, 450, 306, 162, 154, 474,
-     466, 458, 338, 754, 714, 586,
-     562, 546, 514, 490, 314, 170,
-     113, 770, 762, 746, 738, 730,
-     722, 706, 690, 682, 674, 666,
-     650, 642, 634, 554, 538, 530,
-     506, 498, 330, 322, 283, 850,
-     842, 834, 818, 810, 802, 794,
-     786, 778, 748, 732, 728, 724,
-     720, 698, 660, 658, 656, 610,
-     594, 578, 570, 522, 482, 377,
-     372, 347, 339, 323, 315, 299,
-     298, 291, 275, 267, 259, 255,
-     251, 243, 235, 232, 227, 219,
-     211, 203, 195, 187, 179, 171,
-     163, 155, 147, 146, 143, 139,
-     131, 123, 121
+    static const unsigned int frequencies[] = { 41000, 39400, 40200,
+    38600, 41800, 36200, 44200, 43400, 37000, 35400, 42600, 37800,
+    34600, 45800, 45000, 46600, 32200, 51400, 49000, 33800, 31400,
+    30600, 47400, 71400, 69000, 68200, 58600, 56200, 54600, 49800,
+    48200, 33000, 79400, 72200, 69800, 67400, 66600, 65000, 64200,
+    61000, 55400, 53000, 52200, 50600, 29800, 16200, 15400, 11300,
+    78600, 77000, 76200, 75400, 74600, 73800, 73000, 70600, 57800,
+    57000, 53800, 12100, 81000, 77800, 65800, 63400, 61800, 29000,
+    17000, 85000, 84200, 83400, 81800, 80200, 59400, 36900, 28300,
+    26600, 25800, 25000, 24200, 23400, 85800, 74800, 73200, 72800,
+    72400, 72000, 66000, 65600, 60200, 42500, 41700, 40900, 40100,
+    39300, 38500, 37775, 37700, 37200, 36100, 35600, 35300, 34700,
+    34500, 33900, 33700, 32900, 32300, 32100, 31500, 31300, 30500,
+    29900, 29700, 29100, 28950, 28200, 28000, 27500, 27400, 27200,
+    26700, 25900, 25500, 25100, 24300, 24100, 23500, 23200, 22700,
+    22600, 21900, 21800, 21100, 20300, 19500, 18700, 17900, 17100,
+    16300, 15500, 14700, 14600, 14500, 14300, 13900, 13700, 13100,
+    12900, 12500, 12300
     };
     enum { num_frequencies = (sizeof(frequencies)/sizeof(*frequencies)) };
 
     if( p_scan->i_index < num_frequencies )
     {
-        p_cfg->i_frequency = 1000000 * ( frequencies[ p_scan->i_index ] );
+        p_cfg->i_frequency = 10000 * ( frequencies[ p_scan->i_index ] );
         *pf_pos = (double)(p_scan->i_index * 1000 +
                            p_scan->parameter.i_symbolrate * 100 +
                            (p_scan->parameter.i_modulation >> 4) )