mirror of
https://github.com/tuxbox-neutrino/libstb-hal.git
synced 2025-08-26 23:13:16 +02:00
Merge remote-tracking branch 'seife/master'
This commit is contained in:
@@ -3,6 +3,8 @@
|
|||||||
#ifndef _AUDIO_LIB_H_
|
#ifndef _AUDIO_LIB_H_
|
||||||
#define _AUDIO_LIB_H_
|
#define _AUDIO_LIB_H_
|
||||||
|
|
||||||
|
#include "../common/cs_types.h"
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
AUDIO_SYNC_WITH_PTS,
|
AUDIO_SYNC_WITH_PTS,
|
||||||
@@ -76,7 +78,6 @@ class cAudio
|
|||||||
int Stop(void);
|
int Stop(void);
|
||||||
bool Pause(bool Pcm = true);
|
bool Pause(bool Pcm = true);
|
||||||
void SetStreamType(AUDIO_FORMAT type);
|
void SetStreamType(AUDIO_FORMAT type);
|
||||||
#define AVSYNC_TYPE int
|
|
||||||
void SetSyncMode(AVSYNC_TYPE Mode);
|
void SetSyncMode(AVSYNC_TYPE Mode);
|
||||||
|
|
||||||
/* select channels */
|
/* select channels */
|
||||||
|
@@ -18,6 +18,7 @@ extern cVideo *videoDecoder;
|
|||||||
|
|
||||||
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_DEMUX, this, args)
|
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_DEMUX, this, args)
|
||||||
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_DEMUX, this, args)
|
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_DEMUX, this, args)
|
||||||
|
#define lt_info_c(args...) _lt_info(TRIPLE_DEBUG_DEMUX, NULL, args)
|
||||||
|
|
||||||
#define dmx_err(_errfmt, _errstr, _revents) do { \
|
#define dmx_err(_errfmt, _errstr, _revents) do { \
|
||||||
uint16_t _pid = (uint16_t)-1; uint16_t _f = 0;\
|
uint16_t _pid = (uint16_t)-1; uint16_t _f = 0;\
|
||||||
@@ -492,3 +493,9 @@ int cDemux::getUnit(void)
|
|||||||
anyway */
|
anyway */
|
||||||
return num;
|
return num;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool cDemux::SetSource(int unit, int source)
|
||||||
|
{
|
||||||
|
lt_info_c("%s(%d, %d): not implemented yet\n", __func__, unit, source);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
@@ -6,6 +6,7 @@
|
|||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <linux/dvb/dmx.h>
|
#include <linux/dvb/dmx.h>
|
||||||
|
#include "../common/cs_types.h"
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
@@ -46,7 +47,6 @@ class cDemux
|
|||||||
int Read(unsigned char *buff, int len, int Timeout = 0);
|
int Read(unsigned char *buff, int len, int Timeout = 0);
|
||||||
bool sectionFilter(unsigned short pid, const unsigned char * const filter, const unsigned char * const mask, int len, int Timeout = 0, const unsigned char * const negmask = NULL);
|
bool sectionFilter(unsigned short pid, const unsigned char * const filter, const unsigned char * const mask, int len, int Timeout = 0, const unsigned char * const negmask = NULL);
|
||||||
bool pesFilter(const unsigned short pid);
|
bool pesFilter(const unsigned short pid);
|
||||||
#define AVSYNC_TYPE int
|
|
||||||
void SetSyncMode(AVSYNC_TYPE mode);
|
void SetSyncMode(AVSYNC_TYPE mode);
|
||||||
void * getBuffer();
|
void * getBuffer();
|
||||||
void * getChannel();
|
void * getChannel();
|
||||||
@@ -54,6 +54,7 @@ class cDemux
|
|||||||
bool addPid(unsigned short pid);
|
bool addPid(unsigned short pid);
|
||||||
void getSTC(int64_t * STC);
|
void getSTC(int64_t * STC);
|
||||||
int getUnit(void);
|
int getUnit(void);
|
||||||
|
static bool SetSource(int unit, int source);
|
||||||
// TD only functions
|
// TD only functions
|
||||||
int getFD(void) { return fd; }; /* needed by cPlayback class */
|
int getFD(void) { return fd; }; /* needed by cPlayback class */
|
||||||
void removePid(unsigned short Pid); /* needed by cRecord class */
|
void removePid(unsigned short Pid); /* needed by cRecord class */
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
#define _VIDEO_TD_H
|
#define _VIDEO_TD_H
|
||||||
|
|
||||||
#include <linux/dvb/video.h>
|
#include <linux/dvb/video.h>
|
||||||
|
#include "../common/cs_types.h"
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
ANALOG_SD_RGB_CINCH = 0x00,
|
ANALOG_SD_RGB_CINCH = 0x00,
|
||||||
@@ -169,7 +170,6 @@ class cVideo
|
|||||||
/* set video_system */
|
/* set video_system */
|
||||||
int SetVideoSystem(int video_system, bool remember = true);
|
int SetVideoSystem(int video_system, bool remember = true);
|
||||||
int SetStreamType(VIDEO_FORMAT type);
|
int SetStreamType(VIDEO_FORMAT type);
|
||||||
#define AVSYNC_TYPE int
|
|
||||||
void SetSyncMode(AVSYNC_TYPE mode);
|
void SetSyncMode(AVSYNC_TYPE mode);
|
||||||
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
|
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
|
||||||
void SetCECAutoView(bool) { return; };
|
void SetCECAutoView(bool) { return; };
|
||||||
|
10
common/ca.h
10
common/ca.h
@@ -5,8 +5,11 @@
|
|||||||
#define __CA_LIBTRIPLE_H_
|
#define __CA_LIBTRIPLE_H_
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
/* used in cam_menu.cpp */
|
#include "cs_types.h"
|
||||||
typedef uint32_t u32;
|
#include <vector>
|
||||||
|
typedef std::vector<u16> CaIdVector;
|
||||||
|
typedef std::vector<u16>::iterator CaIdVectorIterator;
|
||||||
|
typedef std::vector<u16>::const_iterator CaIdVectorConstIterator;
|
||||||
|
|
||||||
enum CA_INIT_MASK {
|
enum CA_INIT_MASK {
|
||||||
CA_INIT_SC = 1,
|
CA_INIT_SC = 1,
|
||||||
@@ -79,8 +82,10 @@ public:
|
|||||||
uint32_t GetNumberSmartCardSlots(void);
|
uint32_t GetNumberSmartCardSlots(void);
|
||||||
static cCA *GetInstance(void);
|
static cCA *GetInstance(void);
|
||||||
bool SendPMT(int Unit, unsigned char *Data, int Len, CA_SLOT_TYPE SlotType = CA_SLOT_TYPE_ALL);
|
bool SendPMT(int Unit, unsigned char *Data, int Len, CA_SLOT_TYPE SlotType = CA_SLOT_TYPE_ALL);
|
||||||
|
bool SendCAPMT(u64 /*Source*/, u8 /*DemuxSource*/, u8 /*DemuxMask*/, const unsigned char * /*CAPMT*/, u32 /*CAPMTLen*/, const unsigned char * /*RawPMT*/, u32 /*RawPMTLen*/) { return true; };
|
||||||
bool SendMessage(const CA_MESSAGE *Msg);
|
bool SendMessage(const CA_MESSAGE *Msg);
|
||||||
void SetInitMask(enum CA_INIT_MASK InitMask);
|
void SetInitMask(enum CA_INIT_MASK InitMask);
|
||||||
|
int GetCAIDS(CaIdVector & /*Caids*/) { return 0; };
|
||||||
bool Start(void);
|
bool Start(void);
|
||||||
void Stop(void);
|
void Stop(void);
|
||||||
void Ready(bool Set);
|
void Ready(bool Set);
|
||||||
@@ -91,6 +96,7 @@ public:
|
|||||||
void MenuAnswer(enum CA_SLOT_TYPE, uint32_t Slot, uint32_t choice);
|
void MenuAnswer(enum CA_SLOT_TYPE, uint32_t Slot, uint32_t choice);
|
||||||
void InputAnswer(enum CA_SLOT_TYPE, uint32_t Slot, uint8_t * Data, int Len);
|
void InputAnswer(enum CA_SLOT_TYPE, uint32_t Slot, uint8_t * Data, int Len);
|
||||||
void MenuClose(enum CA_SLOT_TYPE, uint32_t Slot);
|
void MenuClose(enum CA_SLOT_TYPE, uint32_t Slot);
|
||||||
|
void SetTSClock(u32 /*Speed*/) { return; };
|
||||||
virtual ~cCA();
|
virtual ~cCA();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
23
common/cs_types.h
Normal file
23
common/cs_types.h
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
/* pretty useless, but we don't need to work around this if
|
||||||
|
* we just copy it over... */
|
||||||
|
|
||||||
|
#ifndef __CS_TYPES_H_
|
||||||
|
#define __CS_TYPES_H_
|
||||||
|
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
AVSYNC_DISABLED,
|
||||||
|
AVSYNC_ENABLED,
|
||||||
|
AVSYNC_AUDIO_IS_MASTER
|
||||||
|
} AVSYNC_TYPE;
|
||||||
|
|
||||||
|
typedef unsigned long long u64;
|
||||||
|
typedef unsigned int u32;
|
||||||
|
typedef unsigned short u16;
|
||||||
|
typedef unsigned char u8;
|
||||||
|
typedef signed long long s64;
|
||||||
|
typedef signed int s32;
|
||||||
|
typedef signed short s16;
|
||||||
|
typedef signed char s8;
|
||||||
|
|
||||||
|
#endif // __CS_TYPES_H_
|
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
#ifndef _AUDIO_TD_H_
|
#ifndef _AUDIO_TD_H_
|
||||||
#define _AUDIO_TD_H_
|
#define _AUDIO_TD_H_
|
||||||
|
#include "../common/cs_types.h"
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
@@ -79,7 +80,6 @@ class cAudio
|
|||||||
int Stop(void);
|
int Stop(void);
|
||||||
bool Pause(bool Pcm = true);
|
bool Pause(bool Pcm = true);
|
||||||
void SetStreamType(AUDIO_FORMAT type);
|
void SetStreamType(AUDIO_FORMAT type);
|
||||||
#define AVSYNC_TYPE int
|
|
||||||
void SetSyncMode(AVSYNC_TYPE Mode);
|
void SetSyncMode(AVSYNC_TYPE Mode);
|
||||||
|
|
||||||
/* select channels */
|
/* select channels */
|
||||||
|
@@ -21,6 +21,7 @@ extern cVideo *videoDecoder;
|
|||||||
|
|
||||||
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_DEMUX, this, args)
|
#define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_DEMUX, this, args)
|
||||||
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_DEMUX, this, args)
|
#define lt_info(args...) _lt_info(TRIPLE_DEBUG_DEMUX, this, args)
|
||||||
|
#define lt_info_c(args...) _lt_info(TRIPLE_DEBUG_DEMUX, NULL, args)
|
||||||
|
|
||||||
#define dmx_err(_errfmt, _errstr, _revents) do { \
|
#define dmx_err(_errfmt, _errstr, _revents) do { \
|
||||||
uint16_t _pid = (uint16_t)-1; uint16_t _f = 0;\
|
uint16_t _pid = (uint16_t)-1; uint16_t _f = 0;\
|
||||||
@@ -559,3 +560,9 @@ int cDemux::getUnit(void)
|
|||||||
anyway */
|
anyway */
|
||||||
return num;
|
return num;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool cDemux::SetSource(int unit, int source)
|
||||||
|
{
|
||||||
|
lt_info_c("%s(%d, %d): not implemented yet\n", __func__, unit, source);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
@@ -6,6 +6,7 @@
|
|||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <linux/dvb/dmx.h>
|
#include <linux/dvb/dmx.h>
|
||||||
|
#include "../common/cs_types.h"
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
@@ -46,7 +47,6 @@ class cDemux
|
|||||||
int Read(unsigned char *buff, int len, int Timeout = 0);
|
int Read(unsigned char *buff, int len, int Timeout = 0);
|
||||||
bool sectionFilter(unsigned short pid, const unsigned char * const filter, const unsigned char * const mask, int len, int Timeout = 0, const unsigned char * const negmask = NULL);
|
bool sectionFilter(unsigned short pid, const unsigned char * const filter, const unsigned char * const mask, int len, int Timeout = 0, const unsigned char * const negmask = NULL);
|
||||||
bool pesFilter(const unsigned short pid);
|
bool pesFilter(const unsigned short pid);
|
||||||
#define AVSYNC_TYPE int
|
|
||||||
void SetSyncMode(AVSYNC_TYPE mode);
|
void SetSyncMode(AVSYNC_TYPE mode);
|
||||||
void * getBuffer();
|
void * getBuffer();
|
||||||
void * getChannel();
|
void * getChannel();
|
||||||
@@ -54,6 +54,7 @@ class cDemux
|
|||||||
bool addPid(unsigned short pid);
|
bool addPid(unsigned short pid);
|
||||||
void getSTC(int64_t * STC);
|
void getSTC(int64_t * STC);
|
||||||
int getUnit(void);
|
int getUnit(void);
|
||||||
|
static bool SetSource(int unit, int source);
|
||||||
// TD only functions
|
// TD only functions
|
||||||
int getFD(void) { return fd; }; /* needed by cPlayback class */
|
int getFD(void) { return fd; }; /* needed by cPlayback class */
|
||||||
void removePid(unsigned short Pid); /* needed by cRecord class */
|
void removePid(unsigned short Pid); /* needed by cRecord class */
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
#define _VIDEO_TD_H
|
#define _VIDEO_TD_H
|
||||||
|
|
||||||
#include <linux/dvb/video.h>
|
#include <linux/dvb/video.h>
|
||||||
|
#include "../common/cs_types.h"
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
ANALOG_SD_RGB_CINCH = 0x00,
|
ANALOG_SD_RGB_CINCH = 0x00,
|
||||||
@@ -169,7 +170,6 @@ class cVideo
|
|||||||
/* set video_system */
|
/* set video_system */
|
||||||
int SetVideoSystem(int video_system, bool remember = true);
|
int SetVideoSystem(int video_system, bool remember = true);
|
||||||
int SetStreamType(VIDEO_FORMAT type);
|
int SetStreamType(VIDEO_FORMAT type);
|
||||||
#define AVSYNC_TYPE int
|
|
||||||
void SetSyncMode(AVSYNC_TYPE mode);
|
void SetSyncMode(AVSYNC_TYPE mode);
|
||||||
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
|
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
|
||||||
void SetCECAutoView(bool) { return; };
|
void SetCECAutoView(bool) { return; };
|
||||||
|
@@ -4,6 +4,7 @@
|
|||||||
#define _AUDIO_TD_H_
|
#define _AUDIO_TD_H_
|
||||||
|
|
||||||
#include <hardware/aud/aud_inf.h>
|
#include <hardware/aud/aud_inf.h>
|
||||||
|
#include "../common/cs_types.h"
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
@@ -78,7 +79,6 @@ class cAudio
|
|||||||
int Stop(void);
|
int Stop(void);
|
||||||
bool Pause(bool Pcm = true);
|
bool Pause(bool Pcm = true);
|
||||||
void SetStreamType(AUDIO_FORMAT type);
|
void SetStreamType(AUDIO_FORMAT type);
|
||||||
#define AVSYNC_TYPE int
|
|
||||||
void SetSyncMode(AVSYNC_TYPE Mode);
|
void SetSyncMode(AVSYNC_TYPE Mode);
|
||||||
|
|
||||||
/* select channels */
|
/* select channels */
|
||||||
|
@@ -8,6 +8,7 @@ extern "C" {
|
|||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <hardware/xp/xp_osd_user.h>
|
#include <hardware/xp/xp_osd_user.h>
|
||||||
}
|
}
|
||||||
|
#include "../common/cs_types.h"
|
||||||
#if defined DMX_FILTER_SIZE
|
#if defined DMX_FILTER_SIZE
|
||||||
#undef DMX_FILTER_SIZE
|
#undef DMX_FILTER_SIZE
|
||||||
#endif
|
#endif
|
||||||
@@ -52,7 +53,6 @@ class cDemux
|
|||||||
int Read(unsigned char *buff, int len, int Timeout = 0);
|
int Read(unsigned char *buff, int len, int Timeout = 0);
|
||||||
bool sectionFilter(unsigned short pid, const unsigned char * const filter, const unsigned char * const mask, int len, int Timeout = 0, const unsigned char * const negmask = NULL);
|
bool sectionFilter(unsigned short pid, const unsigned char * const filter, const unsigned char * const mask, int len, int Timeout = 0, const unsigned char * const negmask = NULL);
|
||||||
bool pesFilter(const unsigned short pid);
|
bool pesFilter(const unsigned short pid);
|
||||||
#define AVSYNC_TYPE int
|
|
||||||
void SetSyncMode(AVSYNC_TYPE mode);
|
void SetSyncMode(AVSYNC_TYPE mode);
|
||||||
void * getBuffer();
|
void * getBuffer();
|
||||||
void * getChannel();
|
void * getChannel();
|
||||||
@@ -60,6 +60,8 @@ class cDemux
|
|||||||
bool addPid(unsigned short pid);
|
bool addPid(unsigned short pid);
|
||||||
void getSTC(int64_t * STC);
|
void getSTC(int64_t * STC);
|
||||||
int getUnit(void);
|
int getUnit(void);
|
||||||
|
/* tripledragon is unlikely to get a second tuner, so stub it out right here */
|
||||||
|
static bool SetSource(int /*unit*/, int /*source*/) { return true; };
|
||||||
// TD only functions
|
// TD only functions
|
||||||
int getFD(void) { return fd; }; /* needed by cPlayback class */
|
int getFD(void) { return fd; }; /* needed by cPlayback class */
|
||||||
void removePid(unsigned short Pid); /* needed by cRecord class */
|
void removePid(unsigned short Pid); /* needed by cRecord class */
|
||||||
|
@@ -4,7 +4,7 @@
|
|||||||
#include <hardware/vid/vid_inf.h>
|
#include <hardware/vid/vid_inf.h>
|
||||||
#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"
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
ANALOG_SD_RGB_SCART = 0x00,
|
ANALOG_SD_RGB_SCART = 0x00,
|
||||||
@@ -165,7 +165,6 @@ class cVideo
|
|||||||
/* set video_system */
|
/* set video_system */
|
||||||
int SetVideoSystem(int video_system, bool remember = true);
|
int SetVideoSystem(int video_system, bool remember = true);
|
||||||
int SetStreamType(VIDEO_FORMAT type);
|
int SetStreamType(VIDEO_FORMAT type);
|
||||||
#define AVSYNC_TYPE int
|
|
||||||
void SetSyncMode(AVSYNC_TYPE mode);
|
void SetSyncMode(AVSYNC_TYPE mode);
|
||||||
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
|
bool SetCECMode(VIDEO_HDMI_CEC_MODE) { return true; };
|
||||||
void SetCECAutoView(bool) { return; };
|
void SetCECAutoView(bool) { return; };
|
||||||
|
Reference in New Issue
Block a user