mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multituner

Browse Source 
Origin commit data
------------------
Commit: 9f3e2dc9c5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-29 (Thu, 29 Mar 2012)
This commit is contained in:
[CST] Focus
2012-03-29 12:23:22 +04:00
parent 38e00ae403 d7c8385cec
commit eb90038630
5 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libcoolstream/audio_cs.h
View File

@@ -141,12 +141,13 @@ public:
void getAudioInfo(int &Type, int &Layer, int &Freq, int &Bitrate, int &Mode); void getAudioInfo(int &Type, int &Layer, int &Freq, int &Bitrate, int &Mode);
void SetSRS(int iq_enable, int nmgr_enable, int iq_mode, int iq_level); void SetSRS(int iq_enable, int nmgr_enable, int iq_mode, int iq_level);
bool IsHdmiDDSupported(void); bool IsHdmiDDSupported(void);
void SetHdmiDD(HDMI_ENCODED_MODE type); void SetHdmiDD(bool On);
void SetSpdifDD(bool Enable); void SetSpdifDD(bool Enable);
void ScheduleMute(bool On); void ScheduleMute(bool On);
void EnableAnalogOut(bool Enable); void EnableAnalogOut(bool Enable);
bool GetHdmiAudioCaps(cs_audio_caps_t &caps); bool GetHdmiAudioCaps(cs_audio_caps_t &caps);
bool IsHdmiAudioFormatSupported(HDMI_AUDIO_FORMAT format); bool IsHdmiAudioFormatSupported(HDMI_AUDIO_FORMAT format);
void SetHdmiDD(HDMI_ENCODED_MODE type);
}; };
#endif //__AUDIO_CS_H_ #endif //__AUDIO_CS_H_

8
lib/libcoolstream/dmx_cs.h
View File

@@ -5,6 +5,7 @@
/* */ /* */
/* (C) 2008 CoolStream International */ /* (C) 2008 CoolStream International */
/* */ /* */
/* $Id:: $ */
/*******************************************************************************/ /*******************************************************************************/
#ifndef __DEMUX_CS_H_ #ifndef __DEMUX_CS_H_
#define __DEMUX_CS_H_ #define __DEMUX_CS_H_
@@ -14,9 +15,12 @@
#define DEMUX_POLL_TIMEOUT 0 // timeout in ms #define DEMUX_POLL_TIMEOUT 0 // timeout in ms
#define MAX_FILTER_LENGTH 12 // maximum number of filters #define MAX_FILTER_LENGTH 12 // maximum number of filters
#ifndef DMX_FILTER_SIZE
#define DMX_FILTER_SIZE MAX_FILTER_LENGTH #ifdef DMX_FILTER_SIZE
#error
#endif #endif
#define DMX_FILTER_SIZE MAX_FILTER_LENGTH
#define MAX_DMX_UNITS 4 #define MAX_DMX_UNITS 4
typedef enum { typedef enum {

10
lib/libcoolstream/playback_cs.h
View File

@@ -5,6 +5,7 @@
/* */ /* */
/* (C) 2008 CoolStream International */ /* (C) 2008 CoolStream International */
/* */ /* */
/* $Id:: $ */
/*******************************************************************************/ /*******************************************************************************/
#ifndef __PLAYBACK_CS_H_ #ifndef __PLAYBACK_CS_H_
#define __PLAYBACK_CS_H_ #define __PLAYBACK_CS_H_
@@ -18,6 +19,14 @@ typedef enum {
class cPlaybackData; class cPlaybackData;
typedef struct {
bool enabled;
uint16_t pid;
uint16_t ac3flags;
std::string lang;
std::string codec_name;
} playback_audio_pid_info_t;
class cPlayback { class cPlayback {
private: private:
cPlaybackData * pd; cPlaybackData * pd;
@@ -50,6 +59,7 @@ public:
bool SetPosition(int position, bool absolute = false); bool SetPosition(int position, bool absolute = false);
bool IsPlaying(void) const { return playing; } bool IsPlaying(void) const { return playing; }
bool IsEnabled(void) const { return enabled; } bool IsEnabled(void) const { return enabled; }
void FindAllPids(playback_audio_pid_info_t *audiopids, uint16_t size, uint16_t *numpida);
void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language); void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language);
}; };

4
lib/libdvbsub/dvbsubtitle.cpp
View File

@@ -183,8 +183,8 @@ cDvbSubtitleConverter::cDvbSubtitleConverter(void)
dbgconverter("cDvbSubtitleConverter: unable to get dvb subtitle codec!\n"); dbgconverter("cDvbSubtitleConverter: unable to get dvb subtitle codec!\n");
return; return;
} }
avctx = avcodec_alloc_context(); avctx = avcodec_alloc_context3(avcodec);
if (avcodec_open(avctx, avcodec) < 0) if (avcodec_open2(avctx, avcodec, NULL) < 0)
dbgconverter("cDvbSubtitleConverter: unable to open codec !\n"); dbgconverter("cDvbSubtitleConverter: unable to open codec !\n");
av_log_set_level(AV_LOG_PANIC); av_log_set_level(AV_LOG_PANIC);

2
src/sectionsd/dmxapi.h
View File

@@ -29,7 +29,7 @@
#endif #endif
#include <stdint.h> #include <stdint.h>
#if !HAVE_TRIPLEDRAGON #if 0 // !HAVE_TRIPLEDRAGON
#include <linux/dvb/dmx.h> #include <linux/dvb/dmx.h>
#endif #endif