Added cMtdCamSlot::TsPostProcess()

This commit is contained in:
Klaus Schmidinger 2020-06-16 14:25:43 +02:00
parent 1e1cd4554e
commit 67ea2163f4
5 changed files with 14 additions and 4 deletions

View File

@ -3597,6 +3597,7 @@ Helmut Binder <cco@aon.at>
for suggesting to check and report whether the given value is valid when setting the for suggesting to check and report whether the given value is valid when setting the
override character table override character table
for adding codes for more languages and special audio tracks for adding codes for more languages and special audio tracks
for adding cMtdCamSlot::TsPostProcess()
Ulrich Eckhardt <uli@uli-eckhardt.de> Ulrich Eckhardt <uli@uli-eckhardt.de>
for reporting a problem with shutdown after user inactivity in case a plugin is for reporting a problem with shutdown after user inactivity in case a plugin is

View File

@ -9453,7 +9453,7 @@ Video Disk Recorder Revision History
The version numbers (both VDRVERSNUM and APIVERSNUM) have been bumped to 2.4.2, so The version numbers (both VDRVERSNUM and APIVERSNUM) have been bumped to 2.4.2, so
that plugins can detect the presence of the new cControl::Control(). that plugins can detect the presence of the new cControl::Control().
2020-06-15: Version 2.4.3 2020-06-16: Version 2.4.3
- Added a missing '-D' to the 'plugins' target of the Makefile (thanks to Johann - Added a missing '-D' to the 'plugins' target of the Makefile (thanks to Johann
Friedrichs). Friedrichs).
@ -9469,3 +9469,4 @@ Video Disk Recorder Revision History
- Added failsafe defaults for 'make LCLBLD=1' to the Makefile (thanks to Stefan - Added failsafe defaults for 'make LCLBLD=1' to the Makefile (thanks to Stefan
Herdler). Herdler).
- Added codes for more languages and special audio tracks (thanks to Helmut Binder). - Added codes for more languages and special audio tracks (thanks to Helmut Binder).
- Added cMtdCamSlot::TsPostProcess() (thanks to Helmut Binder).

4
ci.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: ci.c 4.26 2019/05/28 15:01:29 kls Exp $ * $Id: ci.c 4.27 2020/06/16 14:25:43 kls Exp $
*/ */
#include "ci.h" #include "ci.h"
@ -587,6 +587,7 @@ uint8_t cTPDU::Status(void)
class cCiTransportConnection { class cCiTransportConnection {
private: private:
enum eState { stIDLE, stCREATION, stACTIVE, stDELETION }; enum eState { stIDLE, stCREATION, stACTIVE, stDELETION };
cMutex mutex;
cCamSlot *camSlot; cCamSlot *camSlot;
uint8_t tcid; uint8_t tcid;
eState state; eState state;
@ -1811,6 +1812,7 @@ void cCiTransportConnection::SetTsPostProcessor(cCiSession *CiSession)
bool cCiTransportConnection::TsPostProcess(uint8_t *TsPacket) bool cCiTransportConnection::TsPostProcess(uint8_t *TsPacket)
{ {
cMutexLock MutexLock(&mutex);
if (tsPostProcessor) if (tsPostProcessor)
return tsPostProcessor->TsPostProcess(TsPacket); return tsPostProcessor->TsPostProcess(TsPacket);
return false; return false;

7
mtd.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: mtd.c 1.14 2019/05/28 14:59:47 kls Exp $ * $Id: mtd.c 1.15 2020/06/16 14:25:43 kls Exp $
*/ */
#include "mtd.h" #include "mtd.h"
@ -337,6 +337,11 @@ uchar *cMtdCamSlot::Decrypt(uchar *Data, int &Count)
return d; return d;
} }
bool cMtdCamSlot::TsPostProcess(uchar *Data)
{
return MasterSlot()->TsPostProcess(Data);
}
void cMtdCamSlot::InjectEit(int Sid) void cMtdCamSlot::InjectEit(int Sid)
{ {
MasterSlot()->InjectEit(mtdMapper->RealToUniqSid(Sid)); MasterSlot()->InjectEit(mtdMapper->RealToUniqSid(Sid));

3
mtd.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: mtd.h 1.9 2019/05/28 15:00:10 kls Exp $ * $Id: mtd.h 1.10 2020/06/16 14:25:43 kls Exp $
*/ */
#ifndef __MTD_H #ifndef __MTD_H
@ -172,6 +172,7 @@ public:
virtual void StartDecrypting(void); virtual void StartDecrypting(void);
virtual void StopDecrypting(void); virtual void StopDecrypting(void);
virtual uchar *Decrypt(uchar *Data, int &Count); virtual uchar *Decrypt(uchar *Data, int &Count);
virtual bool TsPostProcess(uchar *Data);
virtual void InjectEit(int Sid); virtual void InjectEit(int Sid);
int PutData(const uchar *Data, int Count); int PutData(const uchar *Data, int Count);
int PutCat(const uchar *Data, int Count); int PutCat(const uchar *Data, int Count);