diff --git a/src/Common/MediaSink.h b/src/Common/MediaSink.h
index a15c3db7..7874092e 100644
--- a/src/Common/MediaSink.h
+++ b/src/Common/MediaSink.h
@@ -113,8 +113,8 @@ private:
     void checkTrackIfReady_l(const Track::Ptr &track);
 private:
     mutable recursive_mutex _mtx;
-    map<int,Track::Ptr> _track_map;
-    map<int,function<void()> > _trackReadyCallback;
+    unordered_map<int,Track::Ptr> _track_map;
+    unordered_map<int,function<void()> > _trackReadyCallback;
     bool _allTrackReady = false;
     Ticker _ticker;
     int _max_track_size = 2;
diff --git a/src/Rtp/RtpProcess.h b/src/Rtp/RtpProcess.h
index 852fbb7c..50f0a6bb 100644
--- a/src/Rtp/RtpProcess.h
+++ b/src/Rtp/RtpProcess.h
@@ -39,8 +39,6 @@ protected:
     void onRtpSorted(const RtpPacket::Ptr &rtp, int track_index) override ;
     void onRtpDecode(const uint8_t *packet, int bytes, uint32_t timestamp, int flags) override;
     void onDecode(int stream,int codecid,int flags,int64_t pts,int64_t dts, const void *data,int bytes);
-private:
-    void getNextRtpType();
 private:
     std::shared_ptr<FILE> _save_file_rtp;
     std::shared_ptr<FILE> _save_file_ps;
@@ -54,7 +52,7 @@ private:
     MultiMediaSourceMuxer::Ptr _muxer;
     std::shared_ptr<FrameMerger> _merger;
     Ticker _last_rtp_time;
-    map<int,Stamp> _stamps;
+    unordered_map<int,Stamp> _stamps;
     uint32_t _dts = 0;
     Decoder::Ptr _decoder;
 };