Ticket #6045: dvbrecorder_maps.diff

dvbrecorder.h

@@ -117 +117 @@
     bool                     _has_no_av;
 
     // TS recorder stuff
-    unsigned char   _stream_id[0x1fff + 1];
-    unsigned char   _pid_status[0x1fff + 1];
-    unsigned char   _continuity_counter[0x1fff + 1];
+    std::map<uint, unsigned char> _stream_id;
+    std::map<uint, unsigned char> _pid_status;
+    std::map<uint, unsigned char> _continuity_counter;
 
     // Statistics
     mutable uint        _continuity_error_count;
@@ -137 +137 @@
 
 inline bool DVBRecorder::CheckCC(uint pid, uint new_cnt)
 {
-    bool ok = ((((_continuity_counter[pid] + 1) & 0xf) == new_cnt) ||
-               (_continuity_counter[pid] == 0xFF));
+    bool ok = _continuity_counter.count(pid) == 0 ||
+        ((_continuity_counter[pid] + 1) & 0xf) == new_cnt;
 
     _continuity_counter[pid] = new_cnt & 0xf;
 

dvbrecorder.cpp

@@ -314 +314 @@
     if (videodevice.isEmpty())
         return false;
 
-    bzero(_stream_id,  sizeof(_stream_id));
-    bzero(_pid_status, sizeof(_pid_status));
-    memset(_continuity_counter, 0xff, sizeof(_continuity_counter));
+    _stream_id.clear(); 
+    _pid_status.clear();
+    _continuity_counter.clear();
 
     _stream_handler = DVBStreamHandler::Get(videodevice);
 
@@ -432 +432 @@
 {
     DTVRecorder::ResetForNewFile();
 
-    bzero(_stream_id,  sizeof(_stream_id));
-    bzero(_pid_status, sizeof(_pid_status));
-    memset(_continuity_counter, 0xff, sizeof(_continuity_counter));
+    _stream_id.clear(); 
+    _pid_status.clear();
+    _continuity_counter.clear();
 }
 
 void DVBRecorder::StopRecording(void)