mirror of
				https://github.com/rofafor/vdr-plugin-femon.git
				synced 2023-10-10 11:36:53 +00:00 
			
		
		
		
	Added "Stream Information" display mode.
Toggle between different modes with 'OK' key: .-> basic -> transponder -> stream -. `-----------------------------------´ Added missing german translations (Thanks to Peter Marquardt).
This commit is contained in:
		
							
								
								
									
										18
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								HISTORY
									
									
									
									
									
								
							@@ -43,9 +43,23 @@ VDR Plugin 'femon' Revision History
 | 
			
		||||
 | 
			
		||||
2004-04-04: Version 0.0.3c
 | 
			
		||||
 | 
			
		||||
- Fixed minor bitrate calculation errors
 | 
			
		||||
- Added russian translation (Thanks to Vyacheslav Dikonov)
 | 
			
		||||
- Fixed minor bitrate calculation errors.
 | 
			
		||||
- Added russian translation (Thanks to Vyacheslav Dikonov).
 | 
			
		||||
 | 
			
		||||
2004-05-31: Version 0.0.4
 | 
			
		||||
 | 
			
		||||
- Backported "stream information" feature (from version 0.1.1).
 | 
			
		||||
 | 
			
		||||
-------------------------
 | 
			
		||||
 | 
			
		||||
2004-05-18: Version 0.1.0
 | 
			
		||||
 | 
			
		||||
- Updated for vdr-1.3.7 and removed compability with older versions.
 | 
			
		||||
 | 
			
		||||
2004-05-30: Version 0.1.1
 | 
			
		||||
 | 
			
		||||
- Added "Stream Information" display mode.
 | 
			
		||||
  Toggle between different modes with 'OK' key:
 | 
			
		||||
  .-> basic -> transponder -> stream -.
 | 
			
		||||
  `-----------------------------------<2D>
 | 
			
		||||
- Added missing german translations (Thanks to Peter Marquardt).
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										23
									
								
								README
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								README
									
									
									
									
									
								
							@@ -12,34 +12,31 @@ Requirements:
 | 
			
		||||
 | 
			
		||||
Ph.D. in Astro Physics and preferably a six-pack waiting in a fridge.
 | 
			
		||||
Never trust a Klingon. "Qu'vaD lI' De'vam". Beam me up, Scotty!
 | 
			
		||||
You're number six!
 | 
			
		||||
You're number six! I'm number two.
 | 
			
		||||
 | 
			
		||||
Description:
 | 
			
		||||
 | 
			
		||||
DVB Frontend Status Monitor is a plugin that displays some signal information
 | 
			
		||||
parameters of the current tuned channel on OSD. You can zap through all your
 | 
			
		||||
channels and the plugin should be monitoring always the right frontend. The
 | 
			
		||||
transponder information is also available in advanced display mode. User can
 | 
			
		||||
switch between simple and advanced display modes by pressing 'OK' key.
 | 
			
		||||
transponder and stream information are also available in advanced display modes.
 | 
			
		||||
User can switch between different display modes by pressing 'OK' key.
 | 
			
		||||
 | 
			
		||||
The plugin is based on a neat console frontend status monitor application called 
 | 
			
		||||
'femon' by Johannes Stezenbach <js@convergence.de> (see DVB-apps/szap/femon.c
 | 
			
		||||
for further information). The other parts of plugin code are borrowed from the 
 | 
			
		||||
excellent 'OSD Picture-In-Picture' plugin by Sascha Volkenandt <sascha@akv-soft.de>
 | 
			
		||||
and Andreas Regel <andreas.regel@powarman.de>. The bitrate calculation algorithm
 | 
			
		||||
originates from the 'dvbstream' application by Dave Chapman <dave@dchapman.com>.
 | 
			
		||||
excellent 'OSD Picture-In-Picture' plugin by Sascha Volkenandt and Andreas Regel.
 | 
			
		||||
The bitrate calculation algorithm originates from the 'dvbstream' application by
 | 
			
		||||
Dave Chapman and the stream information routines from the 'libdvb' library by
 | 
			
		||||
Metzler Brothers.
 | 
			
		||||
 | 
			
		||||
Shortcomings / Todo list / Notes:
 | 
			
		||||
Shortcomings / Todo list / Important Notes:
 | 
			
		||||
 | 
			
		||||
- The current version is a kind of Proof In Concept to replace the old 'tech
 | 
			
		||||
  patch', and it's now eating many unnecessary cpu clock cycles - this will be
 | 
			
		||||
  fixed later...
 | 
			
		||||
- The plugin supports only those DVB cards with _one_ frontend (do any cards
 | 
			
		||||
  with multiple frontends even exist?), because I haven't yet figured howto do
 | 
			
		||||
  it without patching the VDR core.
 | 
			
		||||
- Sometimes (read always) ttxtsubs plugin messes up the OSD - user should disable
 | 
			
		||||
  ttxtsubs, but closing and reopening the femon plugin might help temporarily as
 | 
			
		||||
  well. Btw., this same thing happens with OSDTeletext plugin too :)
 | 
			
		||||
- The stream information is still missing.
 | 
			
		||||
- Disable bitrate calculation to speed up heavy zapping sessions.
 | 
			
		||||
- If you're using VDR version 1.3.6 or older, you'll have to stick with femon-0.0.3c.
 | 
			
		||||
- Disable the stream analyze to speed up heavy zapping sessions.
 | 
			
		||||
- If you're using VDR version 1.3.6 or older, you'll have to stick with femon-0.0.4!
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										34
									
								
								femon.c
									
									
									
									
									
								
							
							
						
						
									
										34
									
								
								femon.c
									
									
									
									
									
								
							@@ -12,7 +12,7 @@
 | 
			
		||||
#include "femonosd.h"
 | 
			
		||||
#include "femon.h"
 | 
			
		||||
 | 
			
		||||
#if (VDRVERSNUM < 10307)
 | 
			
		||||
#if VDRVERSNUM < 10307
 | 
			
		||||
#error "You don't exist! Go away!"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
@@ -74,16 +74,20 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value)
 | 
			
		||||
  else if (!strcasecmp(Name, "RedLimit"))       femonConfig.redlimit       = atoi(Value);
 | 
			
		||||
  else if (!strcasecmp(Name, "GreenLimit"))     femonConfig.greenlimit     = atoi(Value);
 | 
			
		||||
  else if (!strcasecmp(Name, "UpdateInterval")) femonConfig.updateinterval = atoi(Value);
 | 
			
		||||
  else if (!strcasecmp(Name, "ShowBitRate"))    femonConfig.showbitrate    = atoi(Value);
 | 
			
		||||
  else if (!strcasecmp(Name, "AnalStream"))     femonConfig.analyzestream  = atoi(Value);
 | 
			
		||||
  else if (!strcasecmp(Name, "CalcInterval"))   femonConfig.calcinterval   = atoi(Value);
 | 
			
		||||
  else
 | 
			
		||||
    return false;
 | 
			
		||||
  if (femonConfig.displaymode < 0 || femonConfig.displaymode >= modeMaxNumber) femonConfig.displaymode = 0;
 | 
			
		||||
 | 
			
		||||
  return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
cMenuFemonSetup::cMenuFemonSetup(void)
 | 
			
		||||
{
 | 
			
		||||
  dispmodes[0] = tr("basic");
 | 
			
		||||
  dispmodes[1] = tr("transponder");
 | 
			
		||||
  dispmodes[2] = tr("stream");
 | 
			
		||||
  Setup();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -92,16 +96,16 @@ void cMenuFemonSetup::Setup(void)
 | 
			
		||||
  int current = Current();
 | 
			
		||||
 | 
			
		||||
  Clear();
 | 
			
		||||
  Add(new cMenuEditBoolItem(  tr("Hide Mainmenu Entry"),         &femonConfig.hidemenu,       tr("no"),     tr("yes")));
 | 
			
		||||
  Add(new cMenuEditBoolItem(  tr("Use Syslog Output"),           &femonConfig.syslogoutput,   tr("no"),     tr("yes")));
 | 
			
		||||
  Add(new cMenuEditBoolItem(  tr("Default Display Mode"),        &femonConfig.displaymode,    tr("simple"), tr("advanced")));
 | 
			
		||||
  Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"), tr("top")));
 | 
			
		||||
  Add(new cMenuEditIntItem(   tr("Red Limit [%]"),               &femonConfig.redlimit,       1,            50));
 | 
			
		||||
  Add(new cMenuEditIntItem(   tr("Green Limit [%]"),             &femonConfig.greenlimit,     51,           100));
 | 
			
		||||
  Add(new cMenuEditIntItem(   tr("OSD Update Interval [0.1s]"),  &femonConfig.updateinterval, 1,            100));
 | 
			
		||||
  Add(new cMenuEditBoolItem(  tr("Bitrate Calculation"),         &femonConfig.showbitrate,    tr("no"),     tr("yes")));
 | 
			
		||||
  if (femonConfig.showbitrate)
 | 
			
		||||
     Add(new cMenuEditIntItem(tr("Calculation Interval [0.1s]"), &femonConfig.calcinterval,   1,            100));
 | 
			
		||||
  Add(new cMenuEditBoolItem(  tr("Hide Mainmenu Entry"),         &femonConfig.hidemenu,       tr("no"),      tr("yes")));
 | 
			
		||||
  Add(new cMenuEditBoolItem(  tr("Use Syslog Output"),           &femonConfig.syslogoutput,   tr("no"),      tr("yes")));
 | 
			
		||||
  Add(new cMenuEditStraItem(  tr("Default Display Mode"),        &femonConfig.displaymode,    modeMaxNumber, dispmodes));
 | 
			
		||||
  Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"),  tr("top")));
 | 
			
		||||
  Add(new cMenuEditIntItem(   tr("Red Limit [%]"),               &femonConfig.redlimit,       1,             50));
 | 
			
		||||
  Add(new cMenuEditIntItem(   tr("Green Limit [%]"),             &femonConfig.greenlimit,     51,            100));
 | 
			
		||||
  Add(new cMenuEditIntItem(   tr("OSD Update Interval [0.1s]"),  &femonConfig.updateinterval, 1,             100));
 | 
			
		||||
  Add(new cMenuEditBoolItem(  tr("Analyze Stream"),              &femonConfig.analyzestream,  tr("no"),      tr("yes")));
 | 
			
		||||
  if (femonConfig.analyzestream)
 | 
			
		||||
     Add(new cMenuEditIntItem(tr("Calculation Interval [0.1s]"), &femonConfig.calcinterval,   1,             100));
 | 
			
		||||
 | 
			
		||||
  SetCurrent(Get(current));
 | 
			
		||||
  Display();
 | 
			
		||||
@@ -116,17 +120,17 @@ void cMenuFemonSetup::Store(void)
 | 
			
		||||
  SetupStore("RedLimit",       femonConfig.redlimit);
 | 
			
		||||
  SetupStore("GreenLimit",     femonConfig.greenlimit);
 | 
			
		||||
  SetupStore("UpdateInterval", femonConfig.updateinterval);
 | 
			
		||||
  SetupStore("ShowBitRate",    femonConfig.showbitrate);
 | 
			
		||||
  SetupStore("AnalStream",     femonConfig.analyzestream);
 | 
			
		||||
  SetupStore("CalcInterval",   femonConfig.calcinterval);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
eOSState cMenuFemonSetup::ProcessKey(eKeys Key)
 | 
			
		||||
{
 | 
			
		||||
  int oldShowbitrate = femonConfig.showbitrate;
 | 
			
		||||
  int oldAnalyzestream = femonConfig.analyzestream;
 | 
			
		||||
 | 
			
		||||
  eOSState state = cMenuSetupPage::ProcessKey(Key);
 | 
			
		||||
 | 
			
		||||
  if (Key != kNone && (femonConfig.showbitrate != oldShowbitrate)) {
 | 
			
		||||
  if (Key != kNone && (femonConfig.analyzestream != oldAnalyzestream)) {
 | 
			
		||||
     Setup();
 | 
			
		||||
     }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										3
									
								
								femon.h
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								femon.h
									
									
									
									
									
								
							@@ -11,7 +11,7 @@
 | 
			
		||||
 | 
			
		||||
#include <vdr/plugin.h>
 | 
			
		||||
 | 
			
		||||
static const char *VERSION        = "0.1.0";
 | 
			
		||||
static const char *VERSION        = "0.1.1";
 | 
			
		||||
static const char *DESCRIPTION    = "DVB Signal Information Monitor (OSD)";
 | 
			
		||||
static const char *MAINMENUENTRY  = "Signal Information";
 | 
			
		||||
 | 
			
		||||
@@ -36,6 +36,7 @@ public:
 | 
			
		||||
 | 
			
		||||
class cMenuFemonSetup : public cMenuSetupPage {
 | 
			
		||||
  private:
 | 
			
		||||
    const char *dispmodes[modeMaxNumber];
 | 
			
		||||
    virtual void Setup(void);
 | 
			
		||||
  protected:
 | 
			
		||||
    virtual eOSState ProcessKey(eKeys Key);
 | 
			
		||||
 
 | 
			
		||||
@@ -18,7 +18,7 @@ cFemonConfig::cFemonConfig(void)
 | 
			
		||||
  redlimit       = 33;
 | 
			
		||||
  greenlimit     = 66;
 | 
			
		||||
  updateinterval = 5;
 | 
			
		||||
  showbitrate    = 1;
 | 
			
		||||
  analyzestream  = 1;
 | 
			
		||||
  calcinterval   = 20;
 | 
			
		||||
  syslogoutput   = 0;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -9,6 +9,13 @@
 | 
			
		||||
#ifndef __FEMONCFG_H
 | 
			
		||||
#define __FEMONCFG_H
 | 
			
		||||
 | 
			
		||||
enum dispModes {
 | 
			
		||||
  modeBasic,
 | 
			
		||||
  modeTransponder,
 | 
			
		||||
  modeStream,
 | 
			
		||||
  modeMaxNumber
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
struct cFemonConfig
 | 
			
		||||
{
 | 
			
		||||
public:
 | 
			
		||||
@@ -19,7 +26,7 @@ public:
 | 
			
		||||
  int redlimit;
 | 
			
		||||
  int greenlimit;
 | 
			
		||||
  int updateinterval;
 | 
			
		||||
  int showbitrate;
 | 
			
		||||
  int analyzestream;
 | 
			
		||||
  int calcinterval;
 | 
			
		||||
  int syslogoutput;
 | 
			
		||||
};
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										393
									
								
								femoni18n.c
									
									
									
									
									
								
							
							
						
						
									
										393
									
								
								femoni18n.c
									
									
									
									
									
								
							@@ -85,15 +85,15 @@ const tI18nPhrase Phrases[] = {
 | 
			
		||||
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "simple", // English
 | 
			
		||||
    "einfach", // Deutsch
 | 
			
		||||
  { "basic", // English
 | 
			
		||||
    "Standard", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "semplice", // Italiano
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais 
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "suppea", // suomi
 | 
			
		||||
    "perus", // suomi
 | 
			
		||||
    "", // Polski   
 | 
			
		||||
    "", // Espa<70>ol  
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
@@ -101,18 +101,18 @@ const tI18nPhrase Phrases[] = {
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar  
 | 
			
		||||
    "", // Catal<61>  
 | 
			
		||||
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "advanced", // English
 | 
			
		||||
    "fortgeschritten", // Deutsch
 | 
			
		||||
  { "transponder", // English
 | 
			
		||||
    "Transponder", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "avanzato", // Italiano
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais 
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "laaja", // suomi
 | 
			
		||||
    "transponderi", // suomi
 | 
			
		||||
    "", // Polski   
 | 
			
		||||
    "", // Espa<70>ol  
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
@@ -120,7 +120,26 @@ const tI18nPhrase Phrases[] = {
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar  
 | 
			
		||||
    "", // Catal<61>  
 | 
			
		||||
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "stream", // English
 | 
			
		||||
    "Stream", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais 
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "l<EFBFBD>hete", // suomi
 | 
			
		||||
    "", // Polski   
 | 
			
		||||
    "", // Espa<70>ol  
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar  
 | 
			
		||||
    "", // Catal<61>  
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "Hide Mainmenu Entry", // English
 | 
			
		||||
@@ -161,15 +180,15 @@ const tI18nPhrase Phrases[] = {
 | 
			
		||||
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0,1 <20><><EFBFBD>)", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "Bitrate Calculation", // English
 | 
			
		||||
    "Bitratenberechnung", // Deutsch
 | 
			
		||||
  { "Analyze Stream", // English
 | 
			
		||||
    "Stream analysieren", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "Calcolo Bitrate", // Italiano
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "Bittinopeuden laskenta", // suomi
 | 
			
		||||
    "L<EFBFBD>hetteen analysointi", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
@@ -435,7 +454,7 @@ const tI18nPhrase Phrases[] = {
 | 
			
		||||
    "Audio", // Portugu<67>s
 | 
			
		||||
    "Audio", // Fran<61>ais
 | 
			
		||||
    "Audio", // Norsk
 | 
			
		||||
    "Audio", // suomi
 | 
			
		||||
    "<EFBFBD><EFBFBD>ni", // suomi
 | 
			
		||||
    "Audio", // Polski
 | 
			
		||||
    "Audio", // Espa<70>ol
 | 
			
		||||
    "Audio", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
@@ -454,7 +473,7 @@ const tI18nPhrase Phrases[] = {
 | 
			
		||||
    "Video", // Portugu<67>s
 | 
			
		||||
    "Video", // Fran<61>ais
 | 
			
		||||
    "Video", // Norsk
 | 
			
		||||
    "Video", // suomi
 | 
			
		||||
    "Kuva", // suomi
 | 
			
		||||
    "Video", // Polski
 | 
			
		||||
    "Video", // Espa<70>ol
 | 
			
		||||
    "Video", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
@@ -598,5 +617,347 @@ const tI18nPhrase Phrases[] = {
 | 
			
		||||
    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "kbit/s", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "Stream Information", // English
 | 
			
		||||
    "Streaminformation", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "L<EFBFBD>hetteen tiedot", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "MPEG Layer", // English
 | 
			
		||||
    "MPEG Layer", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "MPEG-taso", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "Video Stream", // English
 | 
			
		||||
    "Video Stream", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "Kuvaraita", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "Bitrate", // English
 | 
			
		||||
    "Bitrate", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "Bittinopeus", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar 
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "Frame Rate", // English
 | 
			
		||||
    "Bildrate", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "Ruudunp<EFBFBD>ivitysnopeus", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "Hz", // English
 | 
			
		||||
    "Hz", // Deutsch
 | 
			
		||||
    "Hz", // Slovenski
 | 
			
		||||
    "Hz", // Italiano
 | 
			
		||||
    "Hz", // Nederlands
 | 
			
		||||
    "Hz", // Portugu<67>s
 | 
			
		||||
    "Hz", // Fran<61>ais
 | 
			
		||||
    "Hz", // Norsk
 | 
			
		||||
    "Hz", // suomi
 | 
			
		||||
    "Hz", // Polski
 | 
			
		||||
    "Hz", // Espa<70>ol
 | 
			
		||||
    "Hz", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "Hz", // Svenska
 | 
			
		||||
    "Hz", // Romaneste
 | 
			
		||||
    "Hz", // Magyar
 | 
			
		||||
    "Hz", // Catal<61>
 | 
			
		||||
    "Hz", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "Hz", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "Aspect Ratio", // English
 | 
			
		||||
    "Seitenverh<EFBFBD>ltnis", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "Kuvasuhde", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "reserved", // English
 | 
			
		||||
    "belegt", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "varattu", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "free", // English
 | 
			
		||||
    "frei", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "vapaa", // suomi
 | 
			
		||||
    "", // Polski   
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "Video Format", // English
 | 
			
		||||
    "Bildformat", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "Kuvaformaatti", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "PAL", // English
 | 
			
		||||
    "PAL", // Deutsch
 | 
			
		||||
    "PAL", // Slovenski
 | 
			
		||||
    "PAL", // Italiano
 | 
			
		||||
    "PAL", // Nederlands
 | 
			
		||||
    "PAL", // Portugu<67>s
 | 
			
		||||
    "PAL", // Fran<61>ais
 | 
			
		||||
    "PAL", // Norsk
 | 
			
		||||
    "PAL", // suomi
 | 
			
		||||
    "PAL", // Polski
 | 
			
		||||
    "PAL", // Espa<70>ol
 | 
			
		||||
    "PAL", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "PAL", // Svenska
 | 
			
		||||
    "PAL", // Romaneste
 | 
			
		||||
    "PAL", // Magyar
 | 
			
		||||
    "PAL", // Catal<61>
 | 
			
		||||
    "PAL", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "PAL", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "NTSC", // English
 | 
			
		||||
    "NTSC", // Deutsch
 | 
			
		||||
    "NTSC", // Slovenski
 | 
			
		||||
    "NTSC", // Italiano
 | 
			
		||||
    "NTSC", // Nederlands
 | 
			
		||||
    "NTSC", // Portugu<67>s
 | 
			
		||||
    "NTSC", // Fran<61>ais
 | 
			
		||||
    "NTSC", // Norsk
 | 
			
		||||
    "NTSC", // suomi
 | 
			
		||||
    "NTSC", // Polski
 | 
			
		||||
    "NTSC", // Espa<70>ol
 | 
			
		||||
    "NTSC", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "NTSC", // Svenska
 | 
			
		||||
    "NTSC", // Romaneste
 | 
			
		||||
    "NTSC", // Magyar
 | 
			
		||||
    "NTSC", // Catal<61>
 | 
			
		||||
    "NTSC", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "NTSC", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "unknown", // English
 | 
			
		||||
    "unbekannt", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "tuntematon", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "Resolution", // English
 | 
			
		||||
    "Aufl<EFBFBD>sung", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "Resoluutio", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "Audio Stream", // English
 | 
			
		||||
    "Audio Stream", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "<EFBFBD><EFBFBD>niraita", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "Sampling Frequency", // English
 | 
			
		||||
    "Abtastrate", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "N<EFBFBD>ytteenottotaajuus", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "kHz", // English
 | 
			
		||||
    "kHz", // Deutsch
 | 
			
		||||
    "kHz", // Slovenski
 | 
			
		||||
    "kHz", // Italiano
 | 
			
		||||
    "kHz", // Nederlands
 | 
			
		||||
    "kHz", // Portugu<67>s
 | 
			
		||||
    "kHz", // Fran<61>ais
 | 
			
		||||
    "kHz", // Norsk
 | 
			
		||||
    "kHz", // suomi
 | 
			
		||||
    "kHz", // Polski   
 | 
			
		||||
    "kHz", // Espa<70>ol
 | 
			
		||||
    "kHz", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "kHz", // Svenska
 | 
			
		||||
    "kHz", // Romaneste
 | 
			
		||||
    "kHz", // Magyar
 | 
			
		||||
    "kHz", // Catal<61>
 | 
			
		||||
    "kHz", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "kHz", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { "MPEG Layer", // English
 | 
			
		||||
    "MPEG Layer", // Deutsch
 | 
			
		||||
    "", // Slovenski
 | 
			
		||||
    "", // Italiano
 | 
			
		||||
    "", // Nederlands
 | 
			
		||||
    "", // Portugu<67>s
 | 
			
		||||
    "", // Fran<61>ais
 | 
			
		||||
    "", // Norsk
 | 
			
		||||
    "MPEG-kerros", // suomi
 | 
			
		||||
    "", // Polski
 | 
			
		||||
    "", // Espa<70>ol
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
 | 
			
		||||
    "", // Svenska
 | 
			
		||||
    "", // Romaneste
 | 
			
		||||
    "", // Magyar
 | 
			
		||||
    "", // Catal<61>
 | 
			
		||||
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
 | 
			
		||||
    "", // Hrvatski (Croatian)
 | 
			
		||||
  },
 | 
			
		||||
  { NULL }
 | 
			
		||||
};
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										161
									
								
								femonosd.c
									
									
									
									
									
								
							
							
						
						
									
										161
									
								
								femonosd.c
									
									
									
									
									
								
							@@ -12,24 +12,24 @@
 | 
			
		||||
#include "femonreceiver.h"
 | 
			
		||||
#include "femonosd.h"
 | 
			
		||||
 | 
			
		||||
#define FRONTEND_DEVICE        "/dev/dvb/adapter%d/frontend%d"
 | 
			
		||||
#define CHANNELINPUT_TIMEOUT   1000
 | 
			
		||||
#define FRONTEND_DEVICE          "/dev/dvb/adapter%d/frontend%d"
 | 
			
		||||
#define CHANNELINPUT_TIMEOUT     1000
 | 
			
		||||
 | 
			
		||||
#define SCREENWIDTH            720 // in pixels
 | 
			
		||||
#define SCREENHEIGHT           576 // in pixels
 | 
			
		||||
#define OSDWIDTH               600 // in pixels
 | 
			
		||||
#define OSDHEIGHT              480 // in pixels
 | 
			
		||||
#define OSDINFOHEIGHT          (m_Font->Height() * 11) // in pixels (11 rows)
 | 
			
		||||
#define OSDSTATUSHEIGHT        (m_Font->Height() * 6)  // in pixels (6 rows)
 | 
			
		||||
#define SCREENWIDTH              720 // in pixels
 | 
			
		||||
#define SCREENHEIGHT             576 // in pixels
 | 
			
		||||
#define OSDWIDTH                 600 // in pixels
 | 
			
		||||
#define OSDHEIGHT                480 // in pixels
 | 
			
		||||
#define OSDINFOHEIGHT            (m_Font->Height() * 11) // in pixels (11 rows)
 | 
			
		||||
#define OSDSTATUSHEIGHT          (m_Font->Height() * 6)  // in pixels (6 rows)
 | 
			
		||||
 | 
			
		||||
#define OSDINFOWIN_Y(offset)   (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset)
 | 
			
		||||
#define OSDINFOWIN_X(col)      ((col == 4) ? 470 : (col == 3) ? 300 : (col==2) ? 180 : 15)
 | 
			
		||||
#define OSDSTATUSWIN_Y(offset) (femonConfig.position ? offset : (OSDHEIGHT - OSDSTATUSHEIGHT + offset))
 | 
			
		||||
#define OSDSTATUSWIN_X(col)    ((col == 4) ? 410 : (col == 3) ? 220 : (col==2) ? 125 : 15)
 | 
			
		||||
#define OSDSTATUSWIN_X2(col)   ((col == 5) ? 520 : (col == 4) ? 390 : (col==3) ? 250 : (col==2) ? 115 : 15)
 | 
			
		||||
#define BARWIDTH(x)            (OSDWIDTH * x / 100)
 | 
			
		||||
#define OSDINFOWIN_Y(offset)     (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset)
 | 
			
		||||
#define OSDINFOWIN_X(col)        ((col == 4) ? 470 : (col == 3) ? 300 : (col==2) ? 180 : 15)
 | 
			
		||||
#define OSDSTATUSWIN_Y(offset)   (femonConfig.position ? offset : (OSDHEIGHT - OSDSTATUSHEIGHT + offset))
 | 
			
		||||
#define OSDSTATUSWIN_X(col)      ((col == 7) ? 475 : (col == 6) ? 410 : (col == 5) ? 275 : (col == 4) ? 220 : (col == 3) ? 125 : (col==2) ? 70 : 15)
 | 
			
		||||
#define OSDSTATUSWIN_XC(col,txt) (((col - 1) * SCREENWIDTH / 6) + ((SCREENWIDTH / 6 - m_Font->Width(txt)) / 2))
 | 
			
		||||
#define BARWIDTH(x)              (OSDWIDTH * x / 100)
 | 
			
		||||
 | 
			
		||||
#define clrBackground          clrGray50 // this should be tied somehow into current theme
 | 
			
		||||
#define clrBackground            clrGray50 // this should be tied somehow into current theme
 | 
			
		||||
 | 
			
		||||
cFemonOsd::cFemonOsd(void)
 | 
			
		||||
:cOsdObject(true), cThread("femon osd")
 | 
			
		||||
@@ -102,31 +102,39 @@ void cFemonOsd::DrawStatusWindow(void)
 | 
			
		||||
           }
 | 
			
		||||
        }
 | 
			
		||||
     offset += m_Font->Height();
 | 
			
		||||
     snprintf(buf, sizeof(buf), "STR: %04x", m_Signal);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "STR:", clrWhite, clrBackground, m_Font);
 | 
			
		||||
     snprintf(buf, sizeof(buf), "%04x", m_Signal);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     snprintf(buf, sizeof(buf), "(%2d%%)", m_Signal / 655);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite /*signal < femonConfig.redlimit ? clrRed : signal < femonConfig.greenlimit ? clrYellow : clrGreen*/, clrBackground, m_Font);
 | 
			
		||||
     snprintf(buf, sizeof(buf), "BER: %08x", m_BER);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     if (m_Receiver) snprintf(buf, sizeof(buf), "%s: %.2f %s", tr("Video"), m_Receiver->VideoBitrate(), tr("Mbit/s"));
 | 
			
		||||
     else            snprintf(buf, sizeof(buf), "%s: --- %s", tr("Video"), tr("Mbit/s"));
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "BER:", clrWhite, clrBackground, m_Font);
 | 
			
		||||
     snprintf(buf, sizeof(buf), "%08x", m_BER);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     snprintf(buf, sizeof(buf), "%s:", tr("Video"));
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     if (m_Receiver) snprintf(buf, sizeof(buf), "%.2f %s", m_Receiver->VideoBitrate(), tr("Mbit/s"));
 | 
			
		||||
     else            snprintf(buf, sizeof(buf), "--- %s", tr("Mbit/s"));
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     offset += m_Font->Height();
 | 
			
		||||
     snprintf(buf, sizeof(buf), "SNR: %04x", m_SNR);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "SNR:", clrWhite, clrBackground, m_Font);
 | 
			
		||||
     snprintf(buf, sizeof(buf), "%04x", m_SNR);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     snprintf(buf, sizeof(buf), "(%2d%%)", m_SNR / 655);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite /*snr < femonConfig.redlimit ? clrRed : snr < femonConfig.greenlimit ? clrYellow : clrGreen*/, clrBackground, m_Font);
 | 
			
		||||
     snprintf(buf, sizeof(buf), "UNC: %08x", m_UNC);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     if (m_Receiver) snprintf(buf, sizeof(buf), "%s: %.0f %s", tr("Audio"), m_Receiver->AudioBitrate(), tr("kbit/s"));
 | 
			
		||||
     else            snprintf(buf, sizeof(buf), "%s: --- %s", tr("Audio"), tr("kbit/s"));
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "UNC:", clrWhite, clrBackground, m_Font);
 | 
			
		||||
     snprintf(buf, sizeof(buf), "%08x", m_UNC);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     snprintf(buf, sizeof(buf), "%s:", tr("Audio"));
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     if (m_Receiver) snprintf(buf, sizeof(buf), "%.0f %s", m_Receiver->AudioBitrate(), tr("kbit/s"));
 | 
			
		||||
     else            snprintf(buf, sizeof(buf), "--- %s", tr("kbit/s"));
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
 | 
			
		||||
     offset += m_Font->Height();
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X2(1), OSDSTATUSWIN_Y(offset), tr("LOCK"),   (m_FrontendStatus & FE_HAS_LOCK)   ? clrYellow : clrBlack, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X2(2), OSDSTATUSWIN_Y(offset), tr("SIGNAL"), (m_FrontendStatus & FE_HAS_SIGNAL) ? clrYellow : clrBlack, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X2(3), OSDSTATUSWIN_Y(offset), tr("CARRIER"),(m_FrontendStatus & FE_HAS_CARRIER)? clrYellow : clrBlack, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X2(4), OSDSTATUSWIN_Y(offset), tr("VITERBI"),(m_FrontendStatus & FE_HAS_VITERBI)? clrYellow : clrBlack, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_X2(5), OSDSTATUSWIN_Y(offset), tr("SYNC"),   (m_FrontendStatus & FE_HAS_SYNC)   ? clrYellow : clrBlack, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_XC(1,tr("LOCK")),    OSDSTATUSWIN_Y(offset), tr("LOCK"),   (m_FrontendStatus & FE_HAS_LOCK)   ? clrYellow : clrBlack, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_XC(2,tr("SIGNAL")),  OSDSTATUSWIN_Y(offset), tr("SIGNAL"), (m_FrontendStatus & FE_HAS_SIGNAL) ? clrYellow : clrBlack, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_XC(3,tr("CARRIER")), OSDSTATUSWIN_Y(offset), tr("CARRIER"),(m_FrontendStatus & FE_HAS_CARRIER)? clrYellow : clrBlack, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_XC(4,tr("VITERBI")), OSDSTATUSWIN_Y(offset), tr("VITERBI"),(m_FrontendStatus & FE_HAS_VITERBI)? clrYellow : clrBlack, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->DrawText(OSDSTATUSWIN_XC(5,tr("SYNC")),    OSDSTATUSWIN_Y(offset), tr("SYNC"),   (m_FrontendStatus & FE_HAS_SYNC)   ? clrYellow : clrBlack, clrBackground, m_Font);
 | 
			
		||||
     m_Osd->Flush();
 | 
			
		||||
     }
 | 
			
		||||
}
 | 
			
		||||
@@ -139,10 +147,11 @@ void cFemonOsd::DrawInfoWindow(void)
 | 
			
		||||
  char buf2[20];
 | 
			
		||||
  int offset = 0;
 | 
			
		||||
  int value = 0;
 | 
			
		||||
  double dvalue = 0.0;
 | 
			
		||||
  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
 | 
			
		||||
 | 
			
		||||
  if (m_Osd) {
 | 
			
		||||
     if (m_DisplayMode) {
 | 
			
		||||
     if (m_DisplayMode == modeTransponder) {
 | 
			
		||||
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground);
 | 
			
		||||
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+m_Font->Height()-1), clrWhite);
 | 
			
		||||
        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Transponder Information"), clrBackground, clrWhite, m_Font);
 | 
			
		||||
@@ -361,7 +370,81 @@ void cFemonOsd::DrawInfoWindow(void)
 | 
			
		||||
               break;
 | 
			
		||||
          }
 | 
			
		||||
        }
 | 
			
		||||
     else {
 | 
			
		||||
     else if (m_DisplayMode == modeStream) {
 | 
			
		||||
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground);
 | 
			
		||||
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+m_Font->Height()-1), clrWhite);
 | 
			
		||||
        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Stream Information"), clrBackground, clrWhite, m_Font);
 | 
			
		||||
        offset += m_Font->Height();
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Stream"), clrYellow, clrBackground, m_Font);
 | 
			
		||||
        snprintf(buf, sizeof(buf), "#%d", channel->Vpid());
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
 | 
			
		||||
        offset += m_Font->Height();
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_Font);
 | 
			
		||||
        if (m_Receiver) snprintf(buf, sizeof(buf), "%.2f %s (%.2f %s)", m_Receiver->VideoStreamBitrate(), tr("Mbit/s"), m_Receiver->VideoBitrate(), tr("Mbit/s"));
 | 
			
		||||
        else            snprintf(buf, sizeof(buf), "---");
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
 | 
			
		||||
        offset += m_Font->Height();
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Aspect Ratio"), clrWhite, clrBackground, m_Font);
 | 
			
		||||
        if (m_Receiver) {
 | 
			
		||||
           value =  m_Receiver->VideoAspectRatio();
 | 
			
		||||
           if      (value == 100) snprintf(buf, sizeof(buf), "1:1");
 | 
			
		||||
           else if (value == 133) snprintf(buf, sizeof(buf), "4:3");
 | 
			
		||||
           else if (value == 177) snprintf(buf, sizeof(buf), "16:9");
 | 
			
		||||
           else if (value == 233) snprintf(buf, sizeof(buf), "2.21:1");
 | 
			
		||||
           else                   snprintf(buf, sizeof(buf), "%s", tr("reserved"));
 | 
			
		||||
           }
 | 
			
		||||
        else                      snprintf(buf, sizeof(buf), "---");
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
 | 
			
		||||
        offset += m_Font->Height();
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Rate"), clrWhite, clrBackground, m_Font);
 | 
			
		||||
        if (m_Receiver) snprintf(buf, sizeof(buf), "%.2f %s", m_Receiver->VideoFrameRate(), tr("Hz"));
 | 
			
		||||
        else            snprintf(buf, sizeof(buf), "---");
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
 | 
			
		||||
        offset += m_Font->Height();
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Format"), clrWhite, clrBackground, m_Font);
 | 
			
		||||
        if (m_Receiver) {
 | 
			
		||||
           value =  m_Receiver->VideoFormat();
 | 
			
		||||
           if      (value == 1) snprintf(buf, sizeof(buf), "%s", tr("PAL"));
 | 
			
		||||
           else if (value == 2) snprintf(buf, sizeof(buf), "%s", tr("NTSC"));
 | 
			
		||||
           else                 snprintf(buf, sizeof(buf), "%s", tr("unknown"));
 | 
			
		||||
           }
 | 
			
		||||
        else                    snprintf(buf, sizeof(buf), "---");
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
 | 
			
		||||
        offset += m_Font->Height();
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Resolution"), clrWhite, clrBackground, m_Font);
 | 
			
		||||
        if (m_Receiver) snprintf(buf, sizeof(buf), "%d x %d", m_Receiver->VideoHorizontalSize(), m_Receiver->VideoVerticalSize());
 | 
			
		||||
        else            snprintf(buf, sizeof(buf), "---");
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
 | 
			
		||||
        offset += m_Font->Height();
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Stream"), clrYellow, clrBackground, m_Font);
 | 
			
		||||
        snprintf(buf, sizeof(buf), "#%d", channel->Apid1());
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
 | 
			
		||||
        offset += m_Font->Height();
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_Font);
 | 
			
		||||
        dvalue = m_Receiver->AudioStreamBitrate();
 | 
			
		||||
        if (m_Receiver) {
 | 
			
		||||
            if      (dvalue == -1.0) snprintf(buf, sizeof(buf), "%s (%.0f %s)", tr("reserved"), m_Receiver->AudioBitrate(), tr("kbit/s"));
 | 
			
		||||
            else if (dvalue == -2.0) snprintf(buf, sizeof(buf), "%s (%.0f %s)", tr("free"), m_Receiver->AudioBitrate(), tr("kbit/s"));
 | 
			
		||||
            else                     snprintf(buf, sizeof(buf), "%.0f %s (%.0f %s)", dvalue, tr("kbit/s"), m_Receiver->AudioBitrate(), tr("kbit/s"));
 | 
			
		||||
            }
 | 
			
		||||
        else                         snprintf(buf, sizeof(buf), "---");
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
 | 
			
		||||
        offset += m_Font->Height();
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("MPEG Layer"), clrWhite, clrBackground, m_Font);
 | 
			
		||||
        if (m_Receiver) snprintf(buf, sizeof(buf), "%d", m_Receiver->AudioMPEGLayer());
 | 
			
		||||
        else            snprintf(buf, sizeof(buf), "---");
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
 | 
			
		||||
        offset += m_Font->Height();
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sampling Frequency"), clrWhite, clrBackground, m_Font);
 | 
			
		||||
        if (m_Receiver) {
 | 
			
		||||
           value =  m_Receiver->AudioSamplingFreq();
 | 
			
		||||
           if      (value == -1) snprintf(buf, sizeof(buf), "%s", tr("reserved"));
 | 
			
		||||
           else                  snprintf(buf, sizeof(buf), "%.1f %s", (value / 1000.0), tr("kHz"));
 | 
			
		||||
           }
 | 
			
		||||
        else                     snprintf(buf, sizeof(buf), "---");
 | 
			
		||||
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
 | 
			
		||||
        }
 | 
			
		||||
     else /* modeBasic */ {
 | 
			
		||||
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent);
 | 
			
		||||
        }
 | 
			
		||||
     m_Osd->Flush();
 | 
			
		||||
@@ -423,7 +506,7 @@ void cFemonOsd::Show(void)
 | 
			
		||||
     m_Osd->Flush();
 | 
			
		||||
     if (m_Receiver)
 | 
			
		||||
        delete m_Receiver;
 | 
			
		||||
     if (femonConfig.showbitrate) {
 | 
			
		||||
     if (femonConfig.analyzestream) {
 | 
			
		||||
        int channelNumber = cDevice::CurrentChannel();
 | 
			
		||||
        m_Receiver = new cFemonReceiver(Channels.GetByNumber(channelNumber)->Ca(), Channels.GetByNumber(channelNumber)->Vpid(), Channels.GetByNumber(channelNumber)->Apid1());
 | 
			
		||||
        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
 | 
			
		||||
@@ -453,7 +536,7 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
 | 
			
		||||
     }
 | 
			
		||||
  if (m_Receiver)
 | 
			
		||||
     delete m_Receiver;
 | 
			
		||||
  if (femonConfig.showbitrate) {
 | 
			
		||||
  if (femonConfig.analyzestream) {
 | 
			
		||||
     channelNumber = cDevice::CurrentChannel();
 | 
			
		||||
     m_Receiver = new cFemonReceiver(Channels.GetByNumber(channelNumber)->Ca(), Channels.GetByNumber(channelNumber)->Vpid(), Channels.GetByNumber(channelNumber)->Apid1());
 | 
			
		||||
     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
 | 
			
		||||
@@ -526,7 +609,7 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
 | 
			
		||||
               }
 | 
			
		||||
            break;
 | 
			
		||||
       case kOk:
 | 
			
		||||
            m_DisplayMode ^= 1; // toggle between advanced and simple display mode
 | 
			
		||||
            if (++m_DisplayMode >= modeMaxNumber) m_DisplayMode = 0; // toggle between display modes
 | 
			
		||||
            DrawInfoWindow();
 | 
			
		||||
            break;
 | 
			
		||||
       default:
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										162
									
								
								femonreceiver.c
									
									
									
									
									
								
							
							
						
						
									
										162
									
								
								femonreceiver.c
									
									
									
									
									
								
							@@ -10,6 +10,12 @@
 | 
			
		||||
#include "femoncfg.h"
 | 
			
		||||
#include "femonreceiver.h"
 | 
			
		||||
 | 
			
		||||
#define TS_SIZE       188
 | 
			
		||||
#define PAY_START     0x40
 | 
			
		||||
#define ADAPT_FIELD   0x20
 | 
			
		||||
#define PAYLOAD       0x10
 | 
			
		||||
#define PTS_DTS_FLAGS 0xC0
 | 
			
		||||
 | 
			
		||||
cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid)
 | 
			
		||||
:cReceiver(Ca, -1, 2, Vpid, Apid), cThread("femon receiver")
 | 
			
		||||
{
 | 
			
		||||
@@ -18,9 +24,20 @@ cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid)
 | 
			
		||||
  m_VideoPid = Vpid;
 | 
			
		||||
  m_AudioPid = Apid;
 | 
			
		||||
  m_VideoPacketCount = 0;
 | 
			
		||||
  m_AudioPacketCount = 0;
 | 
			
		||||
  m_VideoHorizontalSize = 0;
 | 
			
		||||
  m_VideoVerticalSize = 0;
 | 
			
		||||
  m_VideoAspectRatio = 0;
 | 
			
		||||
  m_VideoFormat = 0;
 | 
			
		||||
  m_VideoFrameRate = 0.0;
 | 
			
		||||
  m_VideoStreamBitrate = 0.0;
 | 
			
		||||
  m_VideoBitrate = 0.0;
 | 
			
		||||
  m_AudioPacketCount = 0;
 | 
			
		||||
  m_AudioStreamBitrate = -2.0;
 | 
			
		||||
  m_AudioBitrate = 0.0;
 | 
			
		||||
  m_AudioSamplingFreq = -1;
 | 
			
		||||
  m_AudioMPEGLayer = 0;
 | 
			
		||||
  m_AudioBitrate = 0.0;
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
cFemonReceiver::~cFemonReceiver(void)
 | 
			
		||||
@@ -32,6 +49,123 @@ cFemonReceiver::~cFemonReceiver(void)
 | 
			
		||||
     }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* the following function originates from libdvbmpeg: */
 | 
			
		||||
void cFemonReceiver::GetVideoInfo(uint8_t *mbuf, int count)
 | 
			
		||||
{
 | 
			
		||||
  //printf("cFemonReceiver::GetVideoInfo()\n");
 | 
			
		||||
  uint8_t *headr;
 | 
			
		||||
  int found = 0;
 | 
			
		||||
  int c = 0;
 | 
			
		||||
  while (found < 4 && c + 4 < count) {
 | 
			
		||||
    uint8_t *b;
 | 
			
		||||
    b = mbuf + c;
 | 
			
		||||
    if (b[0] == 0x00 && b[1] == 0x00 && b[2] == 0x01 && b[3] == 0xb3)
 | 
			
		||||
       found = 4;
 | 
			
		||||
    else
 | 
			
		||||
       c++;
 | 
			
		||||
    }
 | 
			
		||||
  if (!found) return;
 | 
			
		||||
  c += 4;
 | 
			
		||||
  if (c + 12 >= count) return;
 | 
			
		||||
  headr = mbuf + c;
 | 
			
		||||
  m_VideoHorizontalSize = ((headr[1] &0xF0) >> 4) | (headr[0] << 4);
 | 
			
		||||
  m_VideoVerticalSize = ((headr[1] &0x0F) << 8) | (headr[2]);
 | 
			
		||||
  int sw = (int)((headr[3] & 0xF0) >> 4);
 | 
			
		||||
  switch( sw ){
 | 
			
		||||
    case 1:
 | 
			
		||||
      m_VideoAspectRatio = 100;
 | 
			
		||||
      break;
 | 
			
		||||
    case 2:
 | 
			
		||||
      m_VideoAspectRatio = 133;
 | 
			
		||||
      break;
 | 
			
		||||
    case 3:
 | 
			
		||||
      m_VideoAspectRatio = 177;
 | 
			
		||||
      break;
 | 
			
		||||
    case 4:
 | 
			
		||||
      m_VideoAspectRatio = 221;
 | 
			
		||||
      break;
 | 
			
		||||
    case 5 ... 15:
 | 
			
		||||
      m_VideoAspectRatio = 0;
 | 
			
		||||
      break;
 | 
			
		||||
    default:
 | 
			
		||||
      return;
 | 
			
		||||
    }
 | 
			
		||||
  sw = (int)(headr[3] & 0x0F);
 | 
			
		||||
  switch ( sw ) {
 | 
			
		||||
    case 1:
 | 
			
		||||
      m_VideoFrameRate = 24000/1001.0;
 | 
			
		||||
      m_VideoFormat = 0;
 | 
			
		||||
      break;
 | 
			
		||||
    case 2:
 | 
			
		||||
      m_VideoFrameRate = 24.0;
 | 
			
		||||
      m_VideoFormat = 0;
 | 
			
		||||
      break;
 | 
			
		||||
    case 3:
 | 
			
		||||
      m_VideoFrameRate = 25.0;
 | 
			
		||||
      m_VideoFormat = 1;
 | 
			
		||||
      break;
 | 
			
		||||
    case 4:
 | 
			
		||||
      m_VideoFrameRate = 30000/1001.0;
 | 
			
		||||
      m_VideoFormat = 2;
 | 
			
		||||
      break;
 | 
			
		||||
    case 5:
 | 
			
		||||
      m_VideoFrameRate = 30.0;
 | 
			
		||||
      m_VideoFormat = 2;
 | 
			
		||||
      break;
 | 
			
		||||
    case 6:
 | 
			
		||||
      m_VideoFrameRate = 50.0;
 | 
			
		||||
      m_VideoFormat = 1;
 | 
			
		||||
      break;
 | 
			
		||||
    case 7:
 | 
			
		||||
      m_VideoFrameRate = 60.0;
 | 
			
		||||
      m_VideoFormat = 2;
 | 
			
		||||
      break;
 | 
			
		||||
    }
 | 
			
		||||
  m_VideoStreamBitrate = 400 * (((headr[4] << 10) & 0x0003FC00UL) | ((headr[5] << 2) & 0x000003FCUL) | (((headr[6] & 0xC0) >> 6) & 0x00000003UL)) / 1000000.0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static unsigned int bitrates[3][16] =
 | 
			
		||||
{
 | 
			
		||||
  {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0},
 | 
			
		||||
  {0, 32, 48, 56, 64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 0},
 | 
			
		||||
  {0, 32, 40, 48, 56,  64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 0}
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
static unsigned int samplerates[4] = {441, 480, 320, 0};
 | 
			
		||||
 | 
			
		||||
/* the following function originates from libdvbmpeg: */
 | 
			
		||||
void cFemonReceiver::GetAudioInfo(uint8_t *mbuf, int count)
 | 
			
		||||
{
 | 
			
		||||
  //printf("cFemonReceiver::GetAudioInfo()\n");
 | 
			
		||||
  uint8_t *headr;
 | 
			
		||||
  int found = 0;
 | 
			
		||||
  int c = 0;
 | 
			
		||||
  int tmp = 0;
 | 
			
		||||
  while (!found && c < count) {
 | 
			
		||||
    uint8_t *b = mbuf + c;
 | 
			
		||||
    if (b[0] == 0xff && (b[1] & 0xf8) == 0xf8)
 | 
			
		||||
       found = 1;
 | 
			
		||||
    else
 | 
			
		||||
       c++;
 | 
			
		||||
    }	
 | 
			
		||||
  if (!found) return;
 | 
			
		||||
  if (c + 3 >= count) return;
 | 
			
		||||
  headr = mbuf + c;
 | 
			
		||||
  m_AudioMPEGLayer = 4 - ((headr[1] & 0x06) >> 1);
 | 
			
		||||
  tmp = bitrates[(3 - ((headr[1] & 0x06) >> 1))][(headr[2] >> 4)] * 1000;
 | 
			
		||||
  if (tmp == 0)
 | 
			
		||||
     m_AudioStreamBitrate = -2.0; // free
 | 
			
		||||
  else if (tmp == 0xf)
 | 
			
		||||
     m_AudioStreamBitrate = -1.0; // reserved
 | 
			
		||||
  else
 | 
			
		||||
     m_AudioStreamBitrate = tmp / 1000.0;
 | 
			
		||||
  tmp = samplerates[((headr[2] & 0x0c) >> 2)] * 100;
 | 
			
		||||
  if (tmp == 3)
 | 
			
		||||
     m_AudioSamplingFreq = -1; // reserved
 | 
			
		||||
  else
 | 
			
		||||
     m_AudioSamplingFreq = tmp;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void cFemonReceiver::Activate(bool On)
 | 
			
		||||
{
 | 
			
		||||
  //printf("cFemonReceiver::Activate()\n");
 | 
			
		||||
@@ -41,8 +175,8 @@ void cFemonReceiver::Activate(bool On)
 | 
			
		||||
void cFemonReceiver::Receive(uchar *Data, int Length)
 | 
			
		||||
{
 | 
			
		||||
  //printf("cFemonReceiver::Receive()\n");
 | 
			
		||||
  // TS packet length: 188
 | 
			
		||||
  if (Length == 188) {
 | 
			
		||||
  // TS packet length: TS_SIZE
 | 
			
		||||
  if (Length == TS_SIZE) {
 | 
			
		||||
     int pid = ((Data[1] & 0x1f) << 8) | (Data[2]);
 | 
			
		||||
     if (pid == m_VideoPid) {
 | 
			
		||||
        m_VideoPacketCount++;
 | 
			
		||||
@@ -50,6 +184,28 @@ void cFemonReceiver::Receive(uchar *Data, int Length)
 | 
			
		||||
     else if (pid == m_AudioPid) {
 | 
			
		||||
        m_AudioPacketCount++;
 | 
			
		||||
        }
 | 
			
		||||
     /* the following originates from libdvbmpeg: */
 | 
			
		||||
     if (!(Data[3] & PAYLOAD)) {
 | 
			
		||||
        return;
 | 
			
		||||
        }
 | 
			
		||||
     uint8_t off = 0;
 | 
			
		||||
     if (Data[3] & ADAPT_FIELD) {
 | 
			
		||||
        off = Data[4] + 1;
 | 
			
		||||
        }
 | 
			
		||||
     if (Data[1] & PAY_START) {
 | 
			
		||||
        uint8_t *sb = Data + 4 + off;
 | 
			
		||||
        if (sb[7] & PTS_DTS_FLAGS) {
 | 
			
		||||
           uint8_t *pay = sb + sb[8] + 9; 
 | 
			
		||||
           int l = TS_SIZE - 13 - off - sb[8];
 | 
			
		||||
           if (pid == m_VideoPid) {
 | 
			
		||||
              GetVideoInfo(pay, l);
 | 
			
		||||
              }
 | 
			
		||||
           if (pid == m_AudioPid) {
 | 
			
		||||
              GetAudioInfo(pay, l);
 | 
			
		||||
              }
 | 
			
		||||
           }
 | 
			
		||||
        }
 | 
			
		||||
     /* end */
 | 
			
		||||
     }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -18,9 +18,20 @@ private:
 | 
			
		||||
  int m_VideoPid;
 | 
			
		||||
  int m_AudioPid;
 | 
			
		||||
  int m_VideoPacketCount;
 | 
			
		||||
  int m_AudioPacketCount;
 | 
			
		||||
  int m_VideoHorizontalSize;
 | 
			
		||||
  int m_VideoVerticalSize;
 | 
			
		||||
  int m_VideoAspectRatio;
 | 
			
		||||
  int m_VideoFormat;
 | 
			
		||||
  double m_VideoFrameRate;
 | 
			
		||||
  double m_VideoStreamBitrate;
 | 
			
		||||
  double m_VideoBitrate;
 | 
			
		||||
  int m_AudioPacketCount;
 | 
			
		||||
  double m_AudioStreamBitrate;
 | 
			
		||||
  double m_AudioBitrate;
 | 
			
		||||
  int m_AudioSamplingFreq;
 | 
			
		||||
  int m_AudioMPEGLayer;
 | 
			
		||||
  void GetVideoInfo(uint8_t *mbuf, int count);
 | 
			
		||||
  void GetAudioInfo(uint8_t *mbuf, int count);
 | 
			
		||||
 | 
			
		||||
protected:
 | 
			
		||||
  virtual void Activate(bool On);
 | 
			
		||||
@@ -31,8 +42,18 @@ public:
 | 
			
		||||
  cFemonReceiver(int Ca, int Vpid, int Apid);
 | 
			
		||||
  virtual ~cFemonReceiver();
 | 
			
		||||
 | 
			
		||||
  double VideoBitrate(void) { return m_VideoBitrate; }; // Mbit/s
 | 
			
		||||
  double AudioBitrate(void) { return m_AudioBitrate; }; // kbit/s
 | 
			
		||||
  int VideoHorizontalSize(void)   { return m_VideoHorizontalSize; }; // pixels
 | 
			
		||||
  int VideoVerticalSize(void)     { return m_VideoVerticalSize; };   // pixels
 | 
			
		||||
  int VideoAspectRatio(void)      { return m_VideoAspectRatio; };    // 4:3 == 133, ...
 | 
			
		||||
  int VideoFormat(void)           { return m_VideoFormat; };         // 0 == unknown, 1 == PAL, 2 == NTSC
 | 
			
		||||
  double VideoFrameRate(void)     { return m_VideoFrameRate; };      // Hz
 | 
			
		||||
  double VideoStreamBitrate(void) { return m_VideoStreamBitrate; };  // Mbit/s
 | 
			
		||||
  double VideoBitrate(void)       { return m_VideoBitrate; };        // Mbit/s
 | 
			
		||||
 | 
			
		||||
  int AudioMPEGLayer(void)        { return m_AudioMPEGLayer; };      // number
 | 
			
		||||
  int AudioSamplingFreq(void)     { return m_AudioSamplingFreq; };   // Hz
 | 
			
		||||
  double AudioStreamBitrate(void) { return m_AudioStreamBitrate; };  // kbit/s
 | 
			
		||||
  double AudioBitrate(void)       { return m_AudioBitrate; };        // kbit/s
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
#endif //__FEMONRECEIVER_H
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user