mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

cVideo: add dummy functions for PIP stuff

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 28b21d2295
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-09-28 18:25:45 +02:00
parent 8d9d944012
commit 493e5a3955
8 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
azbox/video.cpp
View File

@@ -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_VC1_SM 5
#define VIDEO_STREAMTYPE_MPEG1 6 #define VIDEO_STREAMTYPE_MPEG1 6
cVideo::cVideo(int, void *, void *) cVideo::cVideo(int, void *, void *, unsigned int)
{ {
lt_debug("%s\n", __FUNCTION__); 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_STOP, 0);
ioctl(fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX); ioctl(fd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX);
} }
void cVideo::SetDemux(cDemux *)
{
lt_debug("%s: not implemented yet\n", __func__);
}

4
azbox/video_lib.h
View File

@@ -3,6 +3,7 @@
#include <linux/dvb/video.h> #include <linux/dvb/video.h>
#include "../common/cs_types.h" #include "../common/cs_types.h"
#include "dmx_lib.h"
typedef enum { typedef enum {
ANALOG_SD_RGB_CINCH = 0x00, ANALOG_SD_RGB_CINCH = 0x00,
@@ -141,7 +142,7 @@ class cVideo
void closeDevice(void); void closeDevice(void);
public: public:
/* constructor & destructor */ /* constructor & destructor */
cVideo(int mode, void *, void *); cVideo(int mode, void *, void *, unsigned int unit = 0);
~cVideo(void); ~cVideo(void);
void * GetTVEnc() { return NULL; }; void * GetTVEnc() { return NULL; };
@@ -189,6 +190,7 @@ class cVideo
int CloseVBI(void) { return 0; }; int CloseVBI(void) { return 0; };
int StartVBI(unsigned short) { return 0; }; int StartVBI(unsigned short) { return 0; };
int StopVBI(void) { return 0; }; int StopVBI(void) { return 0; };
void SetDemux(cDemux *dmx);
}; };
#endif #endif

7
generic-pc/video.cpp
View File

@@ -65,7 +65,7 @@ static const AVRational aspect_ratios[6] = {
{ -1,-1 } { -1,-1 }
}; };
cVideo::cVideo(int, void *, void *) cVideo::cVideo(int, void *, void *, unsigned int)
{ {
lt_debug("%s\n", __func__); lt_debug("%s\n", __func__);
av_register_all(); av_register_all();
@@ -660,3 +660,8 @@ int64_t cVideo::GetPTS(void)
buf_m.unlock(); buf_m.unlock();
return pts; return pts;
} }
void cVideo::SetDemux(cDemux *)
{
lt_debug("%s: not implemented yet\n", __func__);
}

4
generic-pc/video_lib.h
View File

@@ -6,6 +6,7 @@
#include <vector> #include <vector>
#include <linux/dvb/video.h> #include <linux/dvb/video.h>
#include "../common/cs_types.h" #include "../common/cs_types.h"
#include "dmx_lib.h"
extern "C" { extern "C" {
#include <libavutil/rational.h> #include <libavutil/rational.h>
} }
@@ -147,7 +148,7 @@ class cVideo : public OpenThreads::Thread
int64_t GetPTS(void); int64_t GetPTS(void);
public: public:
/* constructor & destructor */ /* constructor & destructor */
cVideo(int mode, void *, void *); cVideo(int mode, void *, void *, unsigned int unit = 0);
~cVideo(void); ~cVideo(void);
void * GetTVEnc() { return NULL; }; void * GetTVEnc() { return NULL; };
@@ -194,6 +195,7 @@ class cVideo : public OpenThreads::Thread
int CloseVBI(void) { return 0; }; int CloseVBI(void) { return 0; };
int StartVBI(unsigned short) { return 0; }; int StartVBI(unsigned short) { return 0; };
int StopVBI(void) { 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); 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); SWFramebuffer *getDecBuf(void);
private: private:

9
libspark/video.cpp
View File

@@ -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; //croppingMode = VID_DISPMODE_NORM;
//outputformat = VID_OUTFMT_RGBC_SVIDEO; //outputformat = VID_OUTFMT_RGBC_SVIDEO;
@@ -667,3 +667,8 @@ int64_t cVideo::GetPTS(void)
lt_info("%s: GET_PTS failed (%m)\n", __func__); lt_info("%s: GET_PTS failed (%m)\n", __func__);
return pts; return pts;
} }
void cVideo::SetDemux(cDemux *)
{
lt_debug("%s not implemented yet\n", __func__);
}

4
libspark/video_lib.h
View File

@@ -3,6 +3,7 @@
#include <linux/dvb/video.h> #include <linux/dvb/video.h>
#include "../common/cs_types.h" #include "../common/cs_types.h"
#include "dmx_lib.h"
typedef enum { typedef enum {
ANALOG_SD_RGB_CINCH = 0x00, ANALOG_SD_RGB_CINCH = 0x00,
@@ -141,7 +142,7 @@ class cVideo
void closeDevice(void); void closeDevice(void);
public: public:
/* constructor & destructor */ /* constructor & destructor */
cVideo(int mode, void *, void *); cVideo(int mode, void *, void *, unsigned int unit = 0);
~cVideo(void); ~cVideo(void);
void * GetTVEnc() { return NULL; }; void * GetTVEnc() { return NULL; };
@@ -189,6 +190,7 @@ class cVideo
int CloseVBI(void) { return 0; }; int CloseVBI(void) { return 0; };
int StartVBI(unsigned short) { return 0; }; int StartVBI(unsigned short) { return 0; };
int StopVBI(void) { return 0; }; int StopVBI(void) { return 0; };
void SetDemux(cDemux *dmx);
}; };
#endif #endif

7
libtriple/video_td.cpp
View File

@@ -70,7 +70,7 @@ static pthread_mutex_t stillp_mutex = PTHREAD_MUTEX_INITIALIZER;
/* debugging hacks */ /* debugging hacks */
static bool noscart = false; static bool noscart = false;
cVideo::cVideo(int, void *, void *) cVideo::cVideo(int, void *, void *, unsigned int)
{ {
lt_debug("%s\n", __FUNCTION__); lt_debug("%s\n", __FUNCTION__);
if ((fd = open(VIDEO_DEVICE, O_RDWR)) < 0) 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); close(mfd);
return true; return true;
} }
void cVideo::SetDemux(cDemux *)
{
lt_debug("%s: not implemented yet\n", __func__);
}

4
libtriple/video_td.h
View File

@@ -5,6 +5,7 @@
#define video_format_t vidDispSize_t #define video_format_t vidDispSize_t
//#define video_displayformat_t vidDispMode_t //#define video_displayformat_t vidDispMode_t
#include "../common/cs_types.h" #include "../common/cs_types.h"
#include "dmx_td.h"
#define STB_HAL_VIDEO_HAS_GETSCREENIMAGE 1 #define STB_HAL_VIDEO_HAS_GETSCREENIMAGE 1
@@ -138,7 +139,7 @@ class cVideo
int video_standby; int video_standby;
public: public:
/* constructor & destructor */ /* constructor & destructor */
cVideo(int mode, void *, void *); cVideo(int mode, void *, void *, unsigned int unit = 0);
~cVideo(void); ~cVideo(void);
void * GetTVEnc() { return NULL; }; void * GetTVEnc() { return NULL; };
@@ -188,6 +189,7 @@ class cVideo
int CloseVBI(void) { return 0; }; int CloseVBI(void) { return 0; };
int StartVBI(unsigned short) { return 0; }; int StartVBI(unsigned short) { return 0; };
int StopVBI(void) { 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); bool GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false);
}; };