Ticket #6340: MPEGStreamData_replaceQMap.diff

mythtv/libs/libmythtv/channelscan/channelscan_sm.h

@@ -57 +57 @@
 class DVBSignalMonitor;
 
 typedef vector<const ProgramMapTable*>  pmt_vec_t;
-typedef QMap<uint, pmt_vec_t>           pmt_map_t;
+typedef QHash<uint, pmt_vec_t>           pmt_map_t;
 class ScannedChannelInfo;
 typedef QMap<transport_scan_items_it_t,ScannedChannelInfo*> ChannelMap;
 

mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -1603 +1603 @@
     //        QString("Tearing down up decryption monitoring "
     //                "for program %1").arg(pnum));
 
-    QMap<uint, uint_vec_t>::iterator list;
+    QHash<uint, uint_vec_t>::iterator list;
     uint_vec_t::iterator it;
 
     uint_vec_t pids = _encryption_pnum_to_pids[pnum];
@@ -1639 +1639 @@
 {
     QMutexLocker locker(&_encryption_lock);
 
-    QMap<uint, CryptInfo>::const_iterator it =
+    QHash<uint, CryptInfo>::const_iterator it =
         _encryption_pid_to_info.find(pid);
 
     return it != _encryption_pid_to_info.end();

mythtv/libs/libmythtv/mpeg/mpegstreamdata.h

@@ -6 +6 @@
 #include <vector>
 using namespace std;
 
-#include <qmap.h>
+#include <QHash>
+
 #include <stdint.h>  // uint64_t
+
 #include "tspacket.h"
 #include "util.h"
 #include "streamlisteners.h"
@@ -20 +22 @@
 
 typedef vector<uint>                    uint_vec_t;
 
-typedef QMap<unsigned int, PESPacket*>  pid_pes_map_t;
-typedef QMap<const PSIPTable*, int>     psip_refcnt_map_t;
+typedef QHash<unsigned int, PESPacket*>  pid_pes_map_t;
+typedef QHash<const PSIPTable*, int>     psip_refcnt_map_t;
 
 typedef ProgramAssociationTable*               pat_ptr_t;
 typedef vector<const ProgramAssociationTable*> pat_vec_t;
-typedef QMap<uint, pat_vec_t>                  pat_map_t;
-typedef QMap<uint, ProgramAssociationTable*>   pat_cache_t;
+typedef QHash<uint, pat_vec_t>                 pat_map_t;
+typedef QHash<uint, ProgramAssociationTable*>  pat_cache_t;
 
 typedef ProgramMapTable*                pmt_ptr_t;
 typedef vector<const ProgramMapTable*>  pmt_vec_t;
-typedef QMap<uint, pmt_vec_t>           pmt_map_t;
-typedef QMap<uint, ProgramMapTable*>    pmt_cache_t;
+typedef QHash<uint, pmt_vec_t>          pmt_map_t;
+typedef QHash<uint, ProgramMapTable*>   pmt_cache_t;
 
 typedef vector<unsigned char>           uchar_vec_t;
 typedef uchar_vec_t                     sections_t;
-typedef QMap<uint, sections_t>          sections_map_t;
+typedef QHash<uint, sections_t>         sections_map_t;
 
 typedef vector<MPEGStreamListener*>     mpeg_listener_vec_t;
 typedef vector<TSPacketListener*>       ts_listener_vec_t;
 typedef vector<TSPacketListenerAV*>     ts_av_listener_vec_t;
 typedef vector<MPEGSingleProgramStreamListener*> mpeg_sp_listener_vec_t;
 
+typedef QHash<uint, int> table_versions_map_t;
+
 typedef enum
 {
     kEncUnknown   = 0,
@@ -76 +80 @@
     kPIDPriorityNormal = 2,
     kPIDPriorityHigh   = 3,
 } PIDPriority;
-typedef QMap<uint, PIDPriority> pid_map_t;
+typedef QHash<uint, PIDPriority> pid_map_t;
 
 class MPEGStreamData : public EITSource
 {
@@ -158 +162 @@
     }
     int  VersionPAT(uint tsid) const
     {
-        const QMap<uint, int>::const_iterator it = _pat_version.find(tsid);
+        const table_versions_map_t::const_iterator it = _pat_version.find(tsid);
         if (it == _pat_version.end())
             return -1;
         return *it;
@@ -173 +177 @@
     }
     int  VersionPMT(uint prog_num) const
     {
-        const QMap<uint, int>::const_iterator it = _pmt_version.find(prog_num);
+        const table_versions_map_t::const_iterator it = _pmt_version.find(prog_num);
         if (it == _pmt_version.end())
             return -1;
         return *it;
@@ -328 +332 @@
 
     // Encryption monitoring
     mutable QMutex            _encryption_lock;
-    QMap<uint, CryptInfo>     _encryption_pid_to_info;
-    QMap<uint, uint_vec_t>    _encryption_pnum_to_pids;
-    QMap<uint, uint_vec_t>    _encryption_pid_to_pnums;
-    QMap<uint, CryptStatus>   _encryption_pnum_to_status;
+    QHash<uint, CryptInfo>    _encryption_pid_to_info;
+    QHash<uint, uint_vec_t>   _encryption_pnum_to_pids;
+    QHash<uint, uint_vec_t>   _encryption_pid_to_pnums;
+    QHash<uint, CryptStatus>  _encryption_pnum_to_status;
 
     // Signals
     mutable QMutex            _listener_lock;
@@ -341 +345 @@
     ts_av_listener_vec_t      _ts_av_listeners;
 
     // Table versions
-    QMap<uint, int>           _pat_version;
-    QMap<uint, int>           _pmt_version;
+    table_versions_map_t      _pat_version;
+    table_versions_map_t      _pmt_version;
 
     sections_map_t            _pat_section_seen;
     sections_map_t            _pmt_section_seen;

mythtv/libs/libmythtv/siscan.h

@@ -37 +37 @@
 } SCANMODE;
 
 typedef vector<const ProgramMapTable*>  pmt_vec_t;
-typedef QMap<uint, pmt_vec_t>           pmt_map_t;
+typedef QHash<uint, pmt_vec_t>           pmt_map_t;
 
 class SIScan : public QObject,
                public MPEGStreamListener,