Merge lp:~siegfried-winter/me-tv/just_a_test into lp:~lamothe-deactivatedaccount-deactivatedaccount/me-tv/stable

[siggi]

[siggi (siegfried-winter)]

The parser of the service description section now only scans for services of the actual transport stream, indicated by tableID 0x42.

[Michael Lamothe (lamothe-deactivatedaccount-deactivatedaccount)]

I can see what you are doing here and it is a very practical approach. However, I think that there's a better way to get around this issue. What you are asking for is only tables that are only 0x42. There's a way to tell the DVB API to wait until you get one of these rather than looping.

See line 58 of dvb_scanner.cc of the current stable branch:

  demuxer_sds.set_filter(SDT_PID, SDT_ID);

Change it to,

  demuxer_sds.set_filter(SDT_PID, SDT_ID, 0xFF);

This tells the filter that you are only interested in tables of STD_ID (0x42). This should really be the default behaviour for the set_filter function but I have no testing team to check if this will break people in other places. But that's another discussion. Can you please test this for me?

review: Disapprove (final)

[siggi (siegfried-winter)]

Thank you Michael,

you see that am not familiar with DVB-technic and need your help.
I'll test your proposal this evening

Siegfried

Am Donnerstag, den 14.01.2010, 01:58 +0000 schrieb Michael Lamothe:
> Review: Disapprove final
> I can see what you are doing here and it is a very practical approach. However, I think that there's a better way to get around this issue. What you are asking for is only tables that are only 0x42. There's a way to tell the DVB API to wait until you get one of these rather than looping.
>
> See line 58 of dvb_scanner.cc of the current stable branch:
>
> demuxer_sds.set_filter(SDT_PID, SDT_ID);
>
> Change it to,
>
> demuxer_sds.set_filter(SDT_PID, SDT_ID, 0xFF);
>
> This tells the filter that you are only interested in tables of STD_ID (0x42). This should really be the default behaviour for the set_filter function but I have no testing team to check if this will break people in other places. But that's another discussion. Can you please test this for me?

[siggi (siegfried-winter)]

Michael,

I verified that your proposed modification is ok.
With the filter settings the demuxer only deliveres data sets beginning with 0x42. That 's what I need.
Could you please merge it to the oficial release.

Perhaps it could be useful to have a more sophisticated scan-algorithm. On ASTRA 19,2E I receive more than 1100 channels. It seems, that sometimes not all channels of a tranponder are sent with each dataset. It could be necessary to read more than one table to gather all programs.
It also might be useful to filter for tv or radio, scrambeld or free-to-air, different languages etc. ..
Would it be worth to think about such features?

Besides, if you need help for other test feel free to ask. I have Ubuntu 9.04, a skystar budget DVB-S card and receive Astra 19.2E.

Best regards

Siegfried

----- Original Nachricht ----
Von: Michael Lamothe <email address hidden>
An: <email address hidden>
Datum: 14.01.2010 02:58
Betreff: Re: [Merge] lp:~siegfried-winter/me-tv/just_a_test into lp:me-tv

> Review: Disapprove final
> I can see what you are doing here and it is a very practical approach.
> However, I think that there's a better way to get around this issue. What
> you are asking for is only tables that are only 0x42. There's a way to tell
> the DVB API to wait until you get one of these rather than looping.
>
> See line 58 of dvb_scanner.cc of the current stable branch:
>
> demuxer_sds.set_filter(SDT_PID, SDT_ID);
>
> Change it to,
>
> demuxer_sds.set_filter(SDT_PID, SDT_ID, 0xFF);
>
> This tells the filter that you are only interested in tables of STD_ID
> (0x42). This should really be the default behaviour for the set_filter
> function but I have no testing team to check if this will break people in
> other places. But that's another discussion. Can you please test this for
> me?
> --
> https://code.launchpad.net/~siegfried-winter/me-tv/just_a_test/+merge/17162
> You are the owner of lp:~siegfried-winter/me-tv/just_a_test.
>

Schluss mit teuer - her mit den Schnäppchen!
Jetzt alle Discounter-Angebote von Aldi über Douglas bis Schlecker übersichtlich für Sie geordnet - jetzt klicken und sparen!
http://www.arcor.de/rd/footer.discounto

Unmerged revisions

291. By Siegfried Winter <swinter@x24> on 2010-01-11

while scannig skip service IDs of wrong transponders

=== modified file 'src/dvb_si.cc'
--- src/dvb_si.cc	2010-01-11 14:22:54 +0000
+++ src/dvb_si.cc	2010-01-11 21:24:13 +0000
@@ -76,37 +76,45 @@
 void SectionParser::parse_sds (Demuxer& demuxer, ServiceDescriptionSection& section)
 {
 	Buffer buffer;
-	demuxer.read_section(buffer);
-	gsize section_length = buffer.get_length();
-	
-	guint offset = 3;
-	section.transport_stream_id = buffer.get_bits(offset, 0, 16);
-	offset += 8;
-	
-	while (offset < section_length - 4)
+	guint loop_counter = 0;
+	do
 	{
-		Service service;
-		service.id = buffer.get_bits(offset, 0, 16);
-		offset += 3;
-		guint descriptors_loop_length = buffer.get_bits(offset, 4, 12);
-		offset += 2;
-		guint descriptors_end_offset = offset + descriptors_loop_length;
-		while (offset < descriptors_end_offset)
+		demuxer.read_section(buffer);
+		gsize section_length = buffer.get_length();
+		if (buffer[0] == 0x42)
 		{
-			guint descriptor_tag = buffer[offset];
-			guint descriptor_length = buffer[offset + 1];
-			if (descriptor_tag == 0x48)
+			loop_counter = 10;
+			guint offset = 3;
+			section.transport_stream_id = buffer.get_bits(offset, 0, 16);
+			offset += 8;
+			
+			while (offset < section_length - 4)
 			{
-				service.type = buffer[offset + 2];
-				guint service_provider_name_length = get_text(service.provider_name, buffer.get_buffer() + offset + 3);
-				get_text(service.name, buffer.get_buffer() + offset + 3 + service_provider_name_length);
+				Service service;
+				service.id = buffer.get_bits(offset, 0, 16);
+				offset += 3;
+				guint descriptors_loop_length = buffer.get_bits(offset, 4, 12);
+				offset += 2;
+				guint descriptors_end_offset = offset + descriptors_loop_length;
+				while (offset < descriptors_end_offset)
+				{
+					guint descriptor_tag = buffer[offset];
+					guint descriptor_length = buffer[offset + 1];
+					if (descriptor_tag == 0x48)
+					{
+						service.type = buffer[offset + 2];
+						guint service_provider_name_length = get_text(service.provider_name, buffer.get_buffer() + offset + 3);
+						get_text(service.name, buffer.get_buffer() + offset + 3 + service_provider_name_length);
+					}
+		
+					offset += descriptor_length + 2;
+				}
+				
+				section.services.push_back(service);
 			}
-
-			offset += descriptor_length + 2;
 		}
-		
-		section.services.push_back(service);
 	}
+	while (loop_counter++ < 10) ;
 }
 
 void SectionParser::parse_nis (Demuxer& demuxer, NetworkInformationSection& section)