- formatting code using astyle

Conflicts:
	libarmbox/dmx.cpp
	libgeneric-pc/video_lib.h
	libspark/dmx.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-05-17 23:47:39 +02:00
committed by Thilo Graf
parent 42264ba4af
commit 7e5b1fc5d2
161 changed files with 13043 additions and 11396 deletions

View File

@@ -10,7 +10,8 @@ typedef struct cs_vs_format_t
char format[16];
} cs_vs_format_struct_t;
typedef enum {
typedef enum
{
ANALOG_SD_RGB_CINCH = 0x00,
ANALOG_SD_YPRPB_CINCH,
ANALOG_HD_RGB_CINCH,
@@ -22,7 +23,8 @@ typedef enum {
ANALOG_SCART_MASK = 0x10
} analog_mode_t;
typedef enum {
typedef enum
{
COLORFORMAT_RGB = 0x10, // keep compatible with analog_mode_t
COLORFORMAT_YUV,
COLORFORMAT_CVBS,
@@ -34,7 +36,8 @@ typedef enum {
COLORFORMAT_HDMI_YCBCR420
} COLOR_FORMAT;
typedef enum {
typedef enum
{
VIDEO_FORMAT_MPEG2 = 0,
VIDEO_FORMAT_MPEG4_H264,
VIDEO_FORMAT_VC1,
@@ -45,7 +48,8 @@ typedef enum {
VIDEO_FORMAT_AVS = 16
} VIDEO_FORMAT;
typedef enum {
typedef enum
{
VIDEO_SD = 0,
VIDEO_HD,
VIDEO_120x60i,
@@ -54,7 +58,8 @@ typedef enum {
VIDEO_360x288i
} VIDEO_DEFINITION;
typedef enum {
typedef enum
{
VIDEO_FRAME_RATE_23_976 = 0,
VIDEO_FRAME_RATE_24,
VIDEO_FRAME_RATE_25,
@@ -65,7 +70,8 @@ typedef enum {
VIDEO_FRAME_RATE_60
} VIDEO_FRAME_RATE;
typedef enum {
typedef enum
{
DISPLAY_AR_1_1,
DISPLAY_AR_4_3,
DISPLAY_AR_14_9,
@@ -74,20 +80,23 @@ typedef enum {
DISPLAY_AR_RAW
} DISPLAY_AR;
typedef enum {
typedef enum
{
DISPLAY_AR_MODE_PANSCAN = 0,
DISPLAY_AR_MODE_LETTERBOX,
DISPLAY_AR_MODE_NONE,
DISPLAY_AR_MODE_PANSCAN2
} DISPLAY_AR_MODE;
typedef enum {
typedef enum
{
VIDEO_DB_DR_NEITHER = 0,
VIDEO_DB_ON,
VIDEO_DB_DR_BOTH
} VIDEO_DB_DR;
typedef enum {
typedef enum
{
VIDEO_PLAY_STILL = 0,
VIDEO_PLAY_CLIP,
VIDEO_PLAY_TRICK,
@@ -95,7 +104,8 @@ typedef enum {
VIDEO_PLAY_MOTION_NO_SYNC
} VIDEO_PLAY_MODE;
typedef enum {
typedef enum
{
VIDEO_STD_NTSC,
VIDEO_STD_SECAM,
VIDEO_STD_PAL,
@@ -120,13 +130,15 @@ typedef enum {
VIDEO_STD_MAX = VIDEO_STD_AUTO
} VIDEO_STD;
typedef enum {
typedef enum
{
VIDEO_HDMI_CEC_MODE_OFF = 0,
VIDEO_HDMI_CEC_MODE_TUNER = 3,
VIDEO_HDMI_CEC_MODE_RECORDER = 1
} VIDEO_HDMI_CEC_MODE;
typedef enum {
typedef enum
{
VIDEO_HDMI_CEC_VOL_OFF = 0,
VIDEO_HDMI_CEC_VOL_AUDIOSYSTEM = 1,
VIDEO_HDMI_CEC_VOL_TV = 2
@@ -156,8 +168,8 @@ class cPlayback;
class cVideo
{
friend class cPlayback;
friend class cDemux;
friend class cPlayback;
friend class cDemux;
private:
/* video device */
int fd;
@@ -210,8 +222,14 @@ class cVideo
void setAVInput(int val);
void * GetTVEnc() { return NULL; };
void * GetTVEncSD() { return NULL; };
void *GetTVEnc()
{
return NULL;
};
void *GetTVEncSD()
{
return NULL;
};
/* aspect ratio */
int getAspectRatio(void);
@@ -236,7 +254,7 @@ class cVideo
/* get video system infos */
int GetVideoSystem(void);
/* when system = -1 then use current video system */
void GetVideoSystemFormatName(cs_vs_format_t* format, int system);
void GetVideoSystemFormatName(cs_vs_format_t *format, int system);
/* set video_system */
int SetVideoSystem(int video_system, bool remember = true);
@@ -247,7 +265,7 @@ class cVideo
void SetCECAutoStandby(bool);
int GetAudioDestination();
void SetAudioDestination(int audio_dest);
bool ShowPicture(const char * fname);
bool ShowPicture(const char *fname);
void StopPicture();
void Standby(unsigned int bOn);
void ShowPig(int _x);
@@ -255,16 +273,37 @@ class cVideo
void SetControl(int, int);
void setContrast(int val);
void SetVideoMode(analog_mode_t mode);
void SetDBDR(int) { return; };
void SetAudioHandle(void *) { return; };
void SetAutoModes(int [VIDEO_STD_MAX]) { return; };
int OpenVBI(int) { return 0; };
int CloseVBI(void) { return 0; };
int StartVBI(unsigned short) { return 0; };
int StopVBI(void) { return 0; };
void SetDBDR(int)
{
return;
};
void SetAudioHandle(void *)
{
return;
};
void SetAutoModes(int [VIDEO_STD_MAX])
{
return;
};
int OpenVBI(int)
{
return 0;
};
int CloseVBI(void)
{
return 0;
};
int StartVBI(unsigned short)
{
return 0;
};
int StopVBI(void)
{
return 0;
};
void SetDemux(cDemux *dmx);
void SetColorFormat(COLOR_FORMAT color_format);
bool GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false);
bool GetScreenImage(unsigned char *&data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false);
};
#endif // __VIDEO_LIB_H__