generic-pc: switch to ffmpeg 3.0 API

This commit is contained in:
max_10
2018-01-05 12:11:32 +01:00
committed by Thilo Graf
parent fbad9e1bc4
commit 4e1855eb75
3 changed files with 188 additions and 88 deletions

View File

@@ -157,8 +157,8 @@ class cVideo : public Thread
/* aspect ratio */
int getAspectRatio(void);
void getPictureInfo(int &width, int &height, int &rate);
int setAspectRatio(int aspect, int mode);
void getPictureInfo(int &width, int &height, int &rate);
/* cropping mode */
int setCroppingMode(int x = 0 /*vidDispMode_t x = VID_DISPMODE_NORM*/);
@@ -170,20 +170,22 @@ class cVideo : public Thread
int getBlank(void);
int setBlank(int enable);
/* set video_system */
int SetVideoSystem(int video_system, bool remember = true);
int GetVideoSystem();
/* change video play state. Parameters are all unused. */
int Start(void *PcrChannel = NULL, unsigned short PcrPid = 0, unsigned short VideoPid = 0, void *x = NULL);
int Stop(bool blank = true);
bool Pause(void);
/* set video_system */
int SetVideoSystem(int video_system, bool remember = true);
int GetVideoSystem();
int SetStreamType(VIDEO_FORMAT type);
void ShowPicture(const char * fname);
void SetSyncMode(AVSYNC_TYPE mode);
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
void SetCECAutoView(bool) { return; };
void SetCECAutoStandby(bool) { return; };
void ShowPicture(const char * fname, const char * destname = NULL);
void StopPicture();
void Standby(unsigned int bOn);
void Pig(int x, int y, int w, int h, int osd_w = 1064, int osd_h = 600, int startx = 0, int starty = 0, int endx = 1279, int endy = 719);
@@ -218,6 +220,9 @@ class cVideo : public Thread
int pig_y;
int pig_w;
int pig_h;
bool pig_changed;
Mutex still_m;
bool stillpicture;
};
#endif