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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	lib/hardware/coolstream/hd2/libcoolstream/cs_api.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c95f1f7a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-10 15:10:04 +01:00
parent 0c2a383673 283c5857f5
commit 07da62e157
7 changed files with 82 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
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,6 +250,11 @@ public:
int64_t GetPTS(void);
int Flush(void);
/* 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 GetVideoSystem();
int SetVideoSystem(int video_system, bool remember = true);