mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
This commit is contained in:
vanhofen
2017-03-12 22:03:03 +01:00
parent 1f3de3b531 7dd5854d20
commit 9d255f3f05
32 changed files with 593 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/hardware/coolstream/hd2/libcoolstream/cs_api.h
View File

@@ -26,6 +26,7 @@ typedef void (*cs_messenger) (unsigned int msg, unsigned int data);
#define CS_CHIP_KRONOS_S 0x7540
#define CS_CHIP_KRONOS_C 0x7550
#define CS_CHIP_KRONOS_IP 0x7530
#define CS_CHIP_NEVIS 0x0000 /* workaround for nonexistant nevis chiptype */
enum CS_LOG_MODULE {
CS_LOG_CI = 0,
@@ -49,6 +50,7 @@ enum CS_LOG_MODULE {
// Initialization
void cs_api_init(void);
void cs_api_exit(void);
/* Preliminary function (for compatibility with older neutrino sources) */
void cs_new_auto_videosystem();
// Memory helpers
@@ -90,4 +92,25 @@ bool cs_box_has_ci(void);
unsigned int cs_get_chip_id(void);
unsigned int cs_get_chip_rev_id(void);
// library version functions
typedef struct cs_libversion_t
{
int vMajor;
int vMinor;
int vPatch;
char vStr[16];
char vGit[41];
char vGitDescribe[64];
time_t vGitTime;
} cs_libversion_struct_t;
void cs_get_lib_version(cs_libversion_t *ver);
/* return value:
-------------
1 Library version newer than given version
0 library version equals given version
-1 Library version older than given version */
int cs_compare_lib_versions(int Major, int Minor, int Patch);
#endif //__CS_API_H_

12
lib/hardware/coolstream/hd2/libcoolstream/video_cs.h
View File

@@ -152,6 +152,12 @@ typedef enum
VIDEO_CONTROL_MAX = VIDEO_CONTROL_SHARPNESS
} VIDEO_CONTROL;
typedef struct cs_vs_format_t
{
char formatHD[16];
char formatSD[16];
} cs_vs_format_struct_t;
class cDemux;
class cAudio;
@@ -244,8 +250,12 @@ public:
int64_t GetPTS(void);
int Flush(void);
/* set video_system */
/* get video system infos */
int GetVideoSystem();
/* when system = -1 then use current video system */
void GetVideoSystemFormatName(cs_vs_format_t* format, int system = -1);
/* set video_system */
int SetVideoSystem(int video_system, bool remember = true);
int SetStreamType(VIDEO_FORMAT type);
void SetSyncMode(AVSYNC_TYPE mode);