rework streaming part1

Origin commit data
------------------
Branch: ni/coolstream
Commit: 878418d988
Author: TangoCash <eric@loxat.de>
Date: 2022-10-05 (Wed, 05 Oct 2022)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2022-10-05 21:48:04 +02:00
committed by vanhofen
parent 5ccb63ec43
commit 2d0e407438
6 changed files with 118 additions and 84 deletions

View File

@@ -54,14 +54,13 @@ class CStreamInstance : public OpenThreads::Thread
t_channel_id channel_id;
stream_pids_t pids;
stream_fds_t fds;
bool send_raw;
virtual bool Send(ssize_t r, unsigned char * _buf = NULL);
virtual void Close();
virtual void run();
friend class CStreamManager;
public:
CStreamInstance(int clientfd, t_channel_id chid, stream_pids_t &pids, bool send_raw);
CStreamInstance(int clientfd, t_channel_id chid, stream_pids_t &pids);
virtual ~CStreamInstance();
virtual bool Open();
virtual bool Start();
@@ -71,6 +70,7 @@ class CStreamInstance : public OpenThreads::Thread
bool HasFd(int fd);
stream_fds_t & GetFds() { return fds; }
t_channel_id GetChannelId() { return channel_id; }
bool is_e2_stream;
};
class CStreamStream : public CStreamInstance
@@ -121,8 +121,8 @@ class CStreamManager : public OpenThreads::Thread
streammap_t streams;
bool Listen();
bool Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFrontend * &frontend, bool &send_raw);
void AddPids(int fd, CZapitChannel * channel, stream_pids_t &pids, bool send_raw);
bool Parse(int fd, stream_pids_t &pids, t_channel_id &chid, CFrontend * &frontend, bool &is_e2);
void PreparePids(CZapitChannel * channel, stream_pids_t &pids);
void CheckStandby(bool enter);
CFrontend * FindFrontend(CZapitChannel * channel);
bool StopAll();