- streaminfo: port from TangoCash

Conflicts:
	src/gui/streaminfo2.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>

data/locale/deutsch.locale

@@ -2291,6 +2291,7 @@ streaminfo.audiotype Audiotyp
 streaminfo.audiotype_unknown unbekannt
 streaminfo.average_bitrate Durchschnitt
 streaminfo.bitrate Bitrate
+streaminfo.casystems Cryptsysteme
 streaminfo.framerate Bildrate
 streaminfo.framerate_unknown unbekannt
 streaminfo.head Tech. Information

data/locale/english.locale

@@ -2291,6 +2291,7 @@ streaminfo.audiotype Audiotype
 streaminfo.audiotype_unknown unknown
 streaminfo.average_bitrate Average
 streaminfo.bitrate Bitrate
+streaminfo.casystems Conditional access systems
 streaminfo.framerate Framerate
 streaminfo.framerate_unknown unknown
 streaminfo.head Stream-Information

src/gui/streaminfo2.h

@@ -28,18 +28,21 @@
 #include <gui/components/cc.h>
 #include <gui/movieplayer.h>
 #include <zapit/femanager.h>
+#include <vector>
+#include <map>
 
+struct AVFormatContext;
+ 
 class CFrameBuffer;
-class COSDFader;
 class CStreamInfo2 : public CMenuTarget
 {
 	private:
 
 		CFrameBuffer	*frameBuffer;
 		CFrontend	*frontend;
-		CComponentsPIP  * pip;
+		CComponentsPIP  *pip;
 		CMoviePlayerGui *mp;
-		COSDFader	fader;
+		COSDFader       fader;
 		int x;
 		int y;
 		int width;
@@ -67,7 +70,11 @@ class CStreamInfo2 : public CMenuTarget
 		int   sig_text_snr_x;
 		int   sig_text_rate_x;
 		int   average_bitrate_pos;
-		int   average_bitrate_offset;
+
+		int   techinfo_xpos, techinfo_ypos;
+		int   box_width;
+
+		int   spaceoffset;
 		unsigned int scaling;
 		unsigned int pmt_version;
 		int box_h,box_h2;
@@ -81,6 +88,8 @@ class CStreamInfo2 : public CMenuTarget
 			unsigned int short_average, max_short_average, min_short_average;
 		} rate;
 
+		std::vector<std::map<std::string,std::string> > streamdata;
+
 		int  doSignalStrengthLoop();
 
 		struct timeval tv, last_tv, first_tv;
@@ -88,9 +97,21 @@ class CStreamInfo2 : public CMenuTarget
 		uint64_t abit_s;
 		uint64_t b_total;
 		unsigned char *dmxbuf;
-		int update_rate();
+		unsigned char *probebuf;
-		int ts_setup();
+		unsigned int probebuf_off;
+		unsigned int probebuf_size;
+		unsigned int probebuf_length;
+		OpenThreads::Mutex probe_mutex;
+		pthread_t probe_thread;
+		bool probed;
+
+		bool update_rate();
+		bool ts_setup();
 		int ts_close();
+		static void *probeStreams(void *arg);
+		void probeStreams();
+		void analyzeStreams(AVFormatContext *avfc);
+		void analyzeStream(AVFormatContext *avfc, unsigned int i);
 
 		void paint(int mode);
 		void paint_techinfo(int x, int y);
@@ -103,6 +124,7 @@ class CStreamInfo2 : public CMenuTarget
 
 		void showSNR ();
 	public:
+		bool abort_probing;
 
 		CStreamInfo2();
 		~CStreamInfo2();
@@ -110,6 +132,7 @@ class CStreamInfo2 : public CMenuTarget
 		void hide();
 		int exec(CMenuTarget* parent, const std::string & actionKey);
 
+		int readPacket(uint8_t *buf, int buf_size);
 };
 #endif
 

src/system/locals.h

@@ -2318,6 +2318,7 @@ typedef enum
 	LOCALE_STREAMINFO_AUDIOTYPE_UNKNOWN,
 	LOCALE_STREAMINFO_AVERAGE_BITRATE,
 	LOCALE_STREAMINFO_BITRATE,
+	LOCALE_STREAMINFO_CASYSTEMS,
 	LOCALE_STREAMINFO_FRAMERATE,
 	LOCALE_STREAMINFO_FRAMERATE_UNKNOWN,
 	LOCALE_STREAMINFO_HEAD,

src/system/locals_intern.h

@@ -2318,6 +2318,7 @@ const char * locale_real_names[] =
 	"streaminfo.audiotype_unknown",
 	"streaminfo.average_bitrate",
 	"streaminfo.bitrate",
+	"streaminfo.casystems",
 	"streaminfo.framerate",
 	"streaminfo.framerate_unknown",
 	"streaminfo.head",