From 28b21d2295317485a52fd72d7394dce506ad34c0 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 28 Sep 2013 18:25:45 +0200 Subject: [PATCH] cVideo: add dummy functions for PIP stuff --- azbox/video.cpp | 7 ++++++- azbox/video_lib.h | 4 +++- generic-pc/video.cpp | 7 ++++++- generic-pc/video_lib.h | 4 +++- libspark/video.cpp | 9 +++++++-- libspark/video_lib.h | 4 +++- libtriple/video_td.cpp | 7 ++++++- libtriple/video_td.h | 4 +++- 8 files changed, 37 insertions(+), 9 deletions(-) diff --git a/azbox/video.cpp b/azbox/video.cpp index 2477e60..bf08c65 100644 --- a/azbox/video.cpp +++ b/azbox/video.cpp @@ -74,7 +74,7 @@ static void show_iframe(int fd, unsigned char *iframe, size_t st_size); #define VIDEO_STREAMTYPE_VC1_SM 5 #define VIDEO_STREAMTYPE_MPEG1 6 -cVideo::cVideo(int, void *, void *) +cVideo::cVideo(int, void *, void *, unsigned int) { lt_debug("%s\n", __FUNCTION__); @@ -628,3 +628,8 @@ static void show_iframe(int fd, unsigned char *iframe, size_t st_size) ioctl(fd, VIDEO_STOP, 0); ioctl(fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX); } + +void cVideo::SetDemux(cDemux *) +{ + lt_debug("%s: not implemented yet\n", __func__); +} diff --git a/azbox/video_lib.h b/azbox/video_lib.h index c26d2bd..c7286e9 100644 --- a/azbox/video_lib.h +++ b/azbox/video_lib.h @@ -3,6 +3,7 @@ #include #include "../common/cs_types.h" +#include "dmx_lib.h" typedef enum { ANALOG_SD_RGB_CINCH = 0x00, @@ -141,7 +142,7 @@ class cVideo void closeDevice(void); public: /* constructor & destructor */ - cVideo(int mode, void *, void *); + cVideo(int mode, void *, void *, unsigned int unit = 0); ~cVideo(void); void * GetTVEnc() { return NULL; }; @@ -189,6 +190,7 @@ class cVideo int CloseVBI(void) { return 0; }; int StartVBI(unsigned short) { return 0; }; int StopVBI(void) { return 0; }; + void SetDemux(cDemux *dmx); }; #endif diff --git a/generic-pc/video.cpp b/generic-pc/video.cpp index 0b39414..912cbeb 100644 --- a/generic-pc/video.cpp +++ b/generic-pc/video.cpp @@ -65,7 +65,7 @@ static const AVRational aspect_ratios[6] = { { -1,-1 } }; -cVideo::cVideo(int, void *, void *) +cVideo::cVideo(int, void *, void *, unsigned int) { lt_debug("%s\n", __func__); av_register_all(); @@ -660,3 +660,8 @@ int64_t cVideo::GetPTS(void) buf_m.unlock(); return pts; } + +void cVideo::SetDemux(cDemux *) +{ + lt_debug("%s: not implemented yet\n", __func__); +} diff --git a/generic-pc/video_lib.h b/generic-pc/video_lib.h index 69ab36a..72ce7e5 100644 --- a/generic-pc/video_lib.h +++ b/generic-pc/video_lib.h @@ -6,6 +6,7 @@ #include #include #include "../common/cs_types.h" +#include "dmx_lib.h" extern "C" { #include } @@ -147,7 +148,7 @@ class cVideo : public OpenThreads::Thread int64_t GetPTS(void); public: /* constructor & destructor */ - cVideo(int mode, void *, void *); + cVideo(int mode, void *, void *, unsigned int unit = 0); ~cVideo(void); void * GetTVEnc() { return NULL; }; @@ -194,6 +195,7 @@ class cVideo : public OpenThreads::Thread int CloseVBI(void) { return 0; }; int StartVBI(unsigned short) { return 0; }; int StopVBI(void) { return 0; }; + void SetDemux(cDemux *dmx); bool GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false); SWFramebuffer *getDecBuf(void); private: diff --git a/libspark/video.cpp b/libspark/video.cpp index 91f14f1..b1e3a20 100644 --- a/libspark/video.cpp +++ b/libspark/video.cpp @@ -141,9 +141,9 @@ out: } -cVideo::cVideo(int, void *, void *) +cVideo::cVideo(int, void *, void *, unsigned int unit) { - lt_debug("%s\n", __FUNCTION__); + lt_debug("%s unit %u\n", __func__, unit); //croppingMode = VID_DISPMODE_NORM; //outputformat = VID_OUTFMT_RGBC_SVIDEO; @@ -667,3 +667,8 @@ int64_t cVideo::GetPTS(void) lt_info("%s: GET_PTS failed (%m)\n", __func__); return pts; } + +void cVideo::SetDemux(cDemux *) +{ + lt_debug("%s not implemented yet\n", __func__); +} diff --git a/libspark/video_lib.h b/libspark/video_lib.h index c26d2bd..c7286e9 100644 --- a/libspark/video_lib.h +++ b/libspark/video_lib.h @@ -3,6 +3,7 @@ #include #include "../common/cs_types.h" +#include "dmx_lib.h" typedef enum { ANALOG_SD_RGB_CINCH = 0x00, @@ -141,7 +142,7 @@ class cVideo void closeDevice(void); public: /* constructor & destructor */ - cVideo(int mode, void *, void *); + cVideo(int mode, void *, void *, unsigned int unit = 0); ~cVideo(void); void * GetTVEnc() { return NULL; }; @@ -189,6 +190,7 @@ class cVideo int CloseVBI(void) { return 0; }; int StartVBI(unsigned short) { return 0; }; int StopVBI(void) { return 0; }; + void SetDemux(cDemux *dmx); }; #endif diff --git a/libtriple/video_td.cpp b/libtriple/video_td.cpp index f3dfaa7..f5c2fd6 100644 --- a/libtriple/video_td.cpp +++ b/libtriple/video_td.cpp @@ -70,7 +70,7 @@ static pthread_mutex_t stillp_mutex = PTHREAD_MUTEX_INITIALIZER; /* debugging hacks */ static bool noscart = false; -cVideo::cVideo(int, void *, void *) +cVideo::cVideo(int, void *, void *, unsigned int) { lt_debug("%s\n", __FUNCTION__); if ((fd = open(VIDEO_DEVICE, O_RDWR)) < 0) @@ -1098,3 +1098,8 @@ bool cVideo::GetScreenImage(unsigned char * &video, int &xres, int &yres, bool g close(mfd); return true; } + +void cVideo::SetDemux(cDemux *) +{ + lt_debug("%s: not implemented yet\n", __func__); +} diff --git a/libtriple/video_td.h b/libtriple/video_td.h index 58cdaa0..d689420 100644 --- a/libtriple/video_td.h +++ b/libtriple/video_td.h @@ -5,6 +5,7 @@ #define video_format_t vidDispSize_t //#define video_displayformat_t vidDispMode_t #include "../common/cs_types.h" +#include "dmx_td.h" #define STB_HAL_VIDEO_HAS_GETSCREENIMAGE 1 @@ -138,7 +139,7 @@ class cVideo int video_standby; public: /* constructor & destructor */ - cVideo(int mode, void *, void *); + cVideo(int mode, void *, void *, unsigned int unit = 0); ~cVideo(void); void * GetTVEnc() { return NULL; }; @@ -188,6 +189,7 @@ class cVideo int CloseVBI(void) { return 0; }; int StartVBI(unsigned short) { return 0; }; int StopVBI(void) { return 0; }; + void SetDemux(cDemux *dmx); bool GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false); };