From f9f68cae8d64f5c60ffaa34118b66f5ebab28506 Mon Sep 17 00:00:00 2001 From: louis Date: Sat, 1 Nov 2014 13:19:07 +0100 Subject: [PATCH] removed code for displaying bitrates in displaychannel again --- HISTORY | 1 + Makefile | 1 - config.c | 2 - config.h | 1 - displaychannel.c | 3 - dtd/displaychannel.dtd | 7 +- libcore/femonreceiver.c | 184 --------------------- libcore/femonreceiver.h | 53 ------ libtemplate/templateview.c | 6 - libtemplate/templateviewelement.h | 1 - skins/metrixhd/xmlfiles/displaychannel.xml | 18 +- skinskeleton/xmlfiles/displaychannel.xml | 9 - views/displaychannelview.c | 28 ---- views/displaychannelview.h | 2 - views/viewhelpers.c | 72 -------- views/viewhelpers.h | 13 +- 16 files changed, 5 insertions(+), 396 deletions(-) delete mode 100644 libcore/femonreceiver.c delete mode 100644 libcore/femonreceiver.h diff --git a/HISTORY b/HISTORY index ad4ef68..059fdcf 100644 --- a/HISTORY +++ b/HISTORY @@ -49,5 +49,6 @@ Version 0.0.3 in replay exactly hits the mark - added {channelname}, {channelid}, {channellogoexists} for all schedules list and current views - added printf function for , see Wiki for documentation +- removed code for displaying bitrates in displaychannel again because of incompatibility with dvbapi Plugin diff --git a/Makefile b/Makefile index 2160ae6..2be7976 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,6 @@ OBJS = $(PLUGIN).o \ libcore/recfolderinfo.o \ libcore/extrecinfo.o \ libcore/timers.o \ - libcore/femonreceiver.o \ libtemplate/globals.o \ libtemplate/parameter.o \ libtemplate/template.o \ diff --git a/config.c b/config.c index a3ec23d..4ef6964 100644 --- a/config.c +++ b/config.c @@ -23,8 +23,6 @@ cDesignerConfig::cDesignerConfig() { //menu display style, display menu items //one after each other or in one step blockFlush = 1; - //interval for femon receiver to recalculate bitrates in tenth of a second - bitrateCalcInterval = 10; //remember current skin and theme, osd size and osd fonts SetSkin(); SetOSDSize(); diff --git a/config.h b/config.h index 9c5429e..7773208 100644 --- a/config.h +++ b/config.h @@ -61,7 +61,6 @@ public: int rerunDistance; int rerunMaxChannel; int blockFlush; - int bitrateCalcInterval; }; #ifdef DEFINE_CONFIG diff --git a/displaychannel.c b/displaychannel.c index 5d2701a..607679b 100644 --- a/displaychannel.c +++ b/displaychannel.c @@ -159,7 +159,6 @@ void cSDDisplayChannel::SetMessage(eMessageType Type, const char *Text) { channelView->ClearSignalBackground(); channelView->ClearScraperContent(); channelView->ClearAudioInfo(); - channelView->ClearBitrates(); channelView->DisplayMessage(Type, Text); groupSep = true; } @@ -187,14 +186,12 @@ void cSDDisplayChannel::Flush(void) { channelView->DrawSignal(); channelView->DrawAudioInfo(); channelView->DrawDevices(initial); - channelView->DrawBitrates(); } else { channelView->ClearStatusIcons(); channelView->ClearScreenResolution(); channelView->ClearSignal(); channelView->ClearSignalBackground(); channelView->ClearDevices(); - channelView->DrawBitrates(); } if (initial) { diff --git a/dtd/displaychannel.dtd b/dtd/displaychannel.dtd index f3b76ab..a99e87e 100644 --- a/dtd/displaychannel.dtd +++ b/dtd/displaychannel.dtd @@ -4,7 +4,7 @@ - - - -#include "../config.h" -#include "femonreceiver.h" - -cFemonReceiver::cFemonReceiver(const cChannel *Channel, int ATrack, int DTrack) - : cReceiver(Channel), - cThread("femon receiver"), - m_Mutex(), - m_Sleep(), - m_Active(false), - m_VideoBuffer(KILOBYTE(512), TS_SIZE, false, "Femon video"), - m_VideoType(Channel ? Channel->Vtype(): 0), - m_VideoPid(Channel ? Channel->Vpid() : 0), - m_VideoPacketCount(0), - m_AudioBuffer(KILOBYTE(256), TS_SIZE, false, "Femon audio"), - m_AudioPid(Channel ? Channel->Apid(ATrack) : 0), - m_AudioPacketCount(0), - m_AC3Buffer(KILOBYTE(256), TS_SIZE, false, "Femon AC3"), - m_AC3Pid(Channel ? Channel->Dpid(DTrack) : 0), - m_AC3PacketCount(0) -{ - SetPids(NULL); - AddPid(m_VideoPid); - AddPid(m_AudioPid); - AddPid(m_AC3Pid); - - m_VideoBuffer.SetTimeouts(0, 100); - m_AudioBuffer.SetTimeouts(0, 100); - m_AC3Buffer.SetTimeouts(0, 100); - - m_VideoBitrate = 0.0; - m_AudioBitrate = 0.0; - m_AC3Bitrate = 0.0; -} - -cFemonReceiver::~cFemonReceiver(void) -{ - Deactivate(); -} - -void cFemonReceiver::Deactivate(void) -{ - Detach(); - if (m_Active) { - m_Active = false; - m_Sleep.Signal(); - if (Running()) - Cancel(3); - } -} - -void cFemonReceiver::Activate(bool On) -{ - if (On) - Start(); - else - Deactivate(); -} - -void cFemonReceiver::Receive(uchar *Data, int Length) -{ - // TS packet length: TS_SIZE - if (Running() && (*Data == TS_SYNC_BYTE) && (Length == TS_SIZE)) { - int len, pid = TsPid(Data); - if (pid == m_VideoPid) { - ++m_VideoPacketCount; - len = m_VideoBuffer.Put(Data, Length); - if (len != Length) { - m_VideoBuffer.ReportOverflow(Length - len); - m_VideoBuffer.Clear(); - } - } - else if (pid == m_AudioPid) { - ++m_AudioPacketCount; - len = m_AudioBuffer.Put(Data, Length); - if (len != Length) { - m_AudioBuffer.ReportOverflow(Length - len); - m_AudioBuffer.Clear(); - } - } - else if (pid == m_AC3Pid) { - ++m_AC3PacketCount; - len = m_AC3Buffer.Put(Data, Length); - if (len != Length) { - m_AC3Buffer.ReportOverflow(Length - len); - m_AC3Buffer.Clear(); - } - } - } -} - -void cFemonReceiver::Action(void) -{ - cTimeMs calcPeriod(0); - m_Active = true; - bool init = true; - while (Running() && m_Active) { - uint8_t *Data; - double timeout; - int Length; - bool processed = false; - - // process available video data - while ((Data = m_VideoBuffer.Get(Length))) { - if (!m_Active || (Length < TS_SIZE)) - break; - Length = TS_SIZE; - if (*Data != TS_SYNC_BYTE) { - for (int i = 1; i < Length; ++i) { - if (Data[i] == TS_SYNC_BYTE) { - Length = i; - break; - } - } - m_VideoBuffer.Del(Length); - continue; - } - processed = true; - if (TsPayloadStart(Data)) { - m_VideoAssembler.Reset(); - } - m_VideoAssembler.PutTs(Data, Length); - m_VideoBuffer.Del(Length); - } - - // process available audio data - while ((Data = m_AudioBuffer.Get(Length))) { - if (!m_Active || (Length < TS_SIZE)) - break; - Length = TS_SIZE; - if (*Data != TS_SYNC_BYTE) { - for (int i = 1; i < Length; ++i) { - if (Data[i] == TS_SYNC_BYTE) { - Length = i; - break; - } - } - m_AudioBuffer.Del(Length); - continue; - } - processed = true; - m_AudioAssembler.PutTs(Data, Length); - m_AudioBuffer.Del(Length); - } - - // process available dolby data - while ((Data = m_AC3Buffer.Get(Length))) { - if (!m_Active || (Length < TS_SIZE)) - break; - Length = TS_SIZE; - if (*Data != TS_SYNC_BYTE) { - for (int i = 1; i < Length; ++i) { - if (Data[i] == TS_SYNC_BYTE) { - Length = i; - break; - } - } - m_AC3Buffer.Del(Length); - continue; - } - processed = true; - m_AC3Assembler.PutTs(Data, Length); - m_AC3Buffer.Del(Length); - } - - // calculate bitrates - timeout = double(calcPeriod.Elapsed()); - if (m_Active && (init || (timeout >= (100.0 * config.bitrateCalcInterval )))) { - // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit - // PES headers should be compensated! - m_VideoBitrate = (1000.0 * 8.0 * 184.0 * m_VideoPacketCount) / timeout; - m_VideoPacketCount = 0; - m_AudioBitrate = (1000.0 * 8.0 * 184.0 * m_AudioPacketCount) / timeout; - m_AudioPacketCount = 0; - m_AC3Bitrate = (1000.0 * 8.0 * 184.0 * m_AC3PacketCount) / timeout; - m_AC3PacketCount = 0; - calcPeriod.Set(0); - init = false; - } - - if (!processed) - m_Sleep.Wait(10); // to avoid busy loop and reduce cpu load - } -} diff --git a/libcore/femonreceiver.h b/libcore/femonreceiver.h deleted file mode 100644 index 2720ff1..0000000 --- a/libcore/femonreceiver.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef __FEMONRECEIVER_H -#define __FEMONRECEIVER_H - -#include -#include - -class cFemonReceiver : public cReceiver, public cThread { - private: - cMutex m_Mutex; - cCondWait m_Sleep; - bool m_Active; - - cRingBufferLinear m_VideoBuffer; - cTsToPes m_VideoAssembler; - int m_VideoType; - int m_VideoPid; - int m_VideoPacketCount; - double m_VideoBitrate; - - cRingBufferLinear m_AudioBuffer; - cTsToPes m_AudioAssembler; - int m_AudioPid; - int m_AudioPacketCount; - double m_AudioBitrate; - bool m_AudioValid; - - cRingBufferLinear m_AC3Buffer; - cTsToPes m_AC3Assembler; - int m_AC3Pid; - int m_AC3PacketCount; - double m_AC3Bitrate; - bool m_AC3Valid; - - protected: - virtual void Activate(bool On); - virtual void Receive(uchar *Data, int Length); - virtual void Action(void); - - public: - cFemonReceiver(const cChannel* Channel, int ATrack, int DTrack); - virtual ~cFemonReceiver(); - void Deactivate(void); - - double VideoBitrate(void) { cMutexLock MutexLock(&m_Mutex); - return m_VideoBitrate; }; // bit/s - double AudioBitrate(void) { cMutexLock MutexLock(&m_Mutex); - return m_AudioBitrate; }; // bit/s - double AC3Bitrate(void) { cMutexLock MutexLock(&m_Mutex); - return m_AC3Bitrate; }; // bit/s -}; - -#endif //__FEMONRECEIVER_H - diff --git a/libtemplate/templateview.c b/libtemplate/templateview.c index a032349..f122732 100644 --- a/libtemplate/templateview.c +++ b/libtemplate/templateview.c @@ -613,7 +613,6 @@ void cTemplateViewChannel::SetViewElements(void) { viewElementsAllowed.insert("signalquality"); viewElementsAllowed.insert("signalqualityback"); viewElementsAllowed.insert("devices"); - viewElementsAllowed.insert("bitrate"); viewElementsAllowed.insert("scrapercontent"); viewElementsAllowed.insert("datetime"); viewElementsAllowed.insert("message"); @@ -656,9 +655,6 @@ string cTemplateViewChannel::GetViewElementName(eViewElement ve) { case veSignalQualityBack: name = "Signal Quality Background"; break; - case veBitRate: - name = "Bit Rate"; - break; case veDevices: name = "Devices"; break; @@ -706,8 +702,6 @@ void cTemplateViewChannel::AddPixmap(string sViewElement, cTemplatePixmap *pix, ve = veSignalQuality; } else if (!sViewElement.compare("signalqualityback")) { ve = veSignalQualityBack; - } else if (!sViewElement.compare("bitrate")) { - ve = veBitRate; } else if (!sViewElement.compare("devices")) { ve = veDevices; } else if (!sViewElement.compare("scrapercontent")) { diff --git a/libtemplate/templateviewelement.h b/libtemplate/templateviewelement.h index a2605ca..7fe78b9 100644 --- a/libtemplate/templateviewelement.h +++ b/libtemplate/templateviewelement.h @@ -37,7 +37,6 @@ enum eViewElement { veScreenResolution, veSignalQuality, veSignalQualityBack, - veBitRate, veScraperContent, //DisplayMenu ViewElements veHeader, diff --git a/skins/metrixhd/xmlfiles/displaychannel.xml b/skins/metrixhd/xmlfiles/displaychannel.xml index c182d21..d1148d5 100644 --- a/skins/metrixhd/xmlfiles/displaychannel.xml +++ b/skins/metrixhd/xmlfiles/displaychannel.xml @@ -164,9 +164,8 @@ {signalquality} SNR value of currently displayed channel --> - - - + + @@ -209,19 +208,6 @@ - - - - - - - - - - -