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

sync with seife

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 848730507b
Author: martii <m4rtii@gmx.de>
Date: 2013-10-06 (Sun, 06 Oct 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-10-06 10:16:33 +02:00
parent e3f0c78ad2 8eba568def
commit 3e8bc0bc75
11 changed files with 115 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
generic-pc/video.cpp
View File

@@ -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__);
}

4
generic-pc/video_lib.h
View File

@@ -6,6 +6,7 @@
#include <vector>
#include <linux/dvb/video.h>
#include "../common/cs_types.h"
#include "dmx_lib.h"
extern "C" {
#include <libavutil/rational.h>
}
@@ -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: