mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

eitd/dmx.cpp: lock whole DMX::getSection

Browse Source
This commit is contained in:
[CST] Focus
2012-02-27 20:39:18 +04:00
parent b0f20009be
commit cb3b4f96f6
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/eitd/dmx.cpp
View File

@@ -208,7 +208,7 @@ inline sections_id_t create_sections_id(const uint8_t table_id, const uint16_t e
bool DMX::check_complete(sections_id_t s_id, uint8_t number, uint8_t last, uint8_t segment_last) bool DMX::check_complete(sections_id_t s_id, uint8_t number, uint8_t last, uint8_t segment_last)
{ {
bool ret = false; bool ret = false;
lock(); //lock();
section_map_t::iterator it = seenSections.find(s_id); section_map_t::iterator it = seenSections.find(s_id);
if (it == seenSections.end()) if (it == seenSections.end())
@@ -258,7 +258,7 @@ printf(" [%s cache] old section for table 0x%02x sid 0x%04x section 0x%02x last
if(seenSections.size() > 10) if(seenSections.size() > 10)
ret = true; ret = true;
} }
unlock(); //unlock();
return ret; return ret;
} }
@@ -342,19 +342,22 @@ int DMX::getSection(uint8_t *buf, const unsigned timeoutInMSeconds, int &timeout
} }
/* there are channels with very low rate, neutrino change filter on timeouts while data not complete */ /* there are channels with very low rate, neutrino change filter on timeouts while data not complete */
seen_section = true; seen_section = true;
unlock(); //unlock();
// skip sections which are too short // skip sections which are too short
if ((section_length < 5) || if ((section_length < 5) ||
(table_id >= 0x4e && table_id <= 0x6f && section_length < 14)) (table_id >= 0x4e && table_id <= 0x6f && section_length < 14))
{ {
dprintf("section too short: table %x, length: %d\n", table_id, section_length); dprintf("section too short: table %x, length: %d\n", table_id, section_length);
unlock();
return -1; return -1;
} }
// check if it's extended syntax, e.g. NIT, BAT, SDT, EIT, only current sections // check if it's extended syntax, e.g. NIT, BAT, SDT, EIT, only current sections
if (!section.getSectionSyntaxIndicator() || !section.getCurrentNextIndicator()) if (!section.getSectionSyntaxIndicator() || !section.getCurrentNextIndicator()) {
unlock();
return rc; return rc;
}
uint16_t eh_tbl_extension_id = section.getTableIdExtension(); uint16_t eh_tbl_extension_id = section.getTableIdExtension();
uint8_t version_number = section.getVersionNumber(); uint8_t version_number = section.getVersionNumber();
@@ -450,15 +453,16 @@ int DMX::getSection(uint8_t *buf, const unsigned timeoutInMSeconds, int &timeout
} }
if(complete) { if(complete) {
lock(); //lock();
seenSections.clear(); seenSections.clear();
calcedSections.clear(); calcedSections.clear();
timeouts = -2; timeouts = -2;
unlock(); //unlock();
} }
if(rc > 0) if(rc > 0)
first_skipped = 0; first_skipped = 0;
unlock();
return rc; return rc;
} }