mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 15:33:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3: get rid of compiler warnings

Browse Source
This commit is contained in:
martii
2013-06-10 15:06:00 +02:00
committed by Stefan Seyfried
parent dd618fc883
commit c3bbda3e9c
32 changed files with 148 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libeplayer3/output/linuxdvb.c
View File

@@ -88,7 +88,7 @@ int LinuxDvbStop(Context_t *context, char * type);
/* MISC Functions */
/* ***************************** */
void getLinuxDVBMutex(const char *filename, const char *function, int line) {
void getLinuxDVBMutex(const char *filename __attribute__((unused)), const char *function __attribute__((unused)), int line __attribute__((unused))) {
linuxdvb_printf(250, "requesting mutex\n");
@@ -97,14 +97,14 @@ void getLinuxDVBMutex(const char *filename, const char *function, int line) {
linuxdvb_printf(250, "received mutex\n");
}
void releaseLinuxDVBMutex(const char *filename, const char *function, int line) {
void releaseLinuxDVBMutex(const char *filename __attribute__((unused)), const char *function __attribute__((unused)), int line __attribute__((unused))) {
pthread_mutex_unlock(&LinuxDVBmutex);
linuxdvb_printf(250, "released mutex\n");
}
int LinuxDvbOpen(Context_t *context, char * type) {
int LinuxDvbOpen(Context_t *context __attribute__((unused)), char * type) {
unsigned char video = !strcmp("video", type);
unsigned char audio = !strcmp("audio", type);
@@ -292,7 +292,7 @@ int LinuxDvbPlay(Context_t *context, char * type) {
return ret;
}
int LinuxDvbStop(Context_t *context, char * type) {
int LinuxDvbStop(Context_t *context __attribute__((unused)), char * type) {
int ret = cERR_LINUXDVB_NO_ERROR;
unsigned char video = !strcmp("video", type);
unsigned char audio = !strcmp("audio", type);
@@ -349,7 +349,7 @@ int LinuxDvbStop(Context_t *context, char * type) {
return ret;
}
int LinuxDvbPause(Context_t *context, char * type) {
int LinuxDvbPause(Context_t *context __attribute__((unused)), char * type) {
int ret = cERR_LINUXDVB_NO_ERROR;
unsigned char video = !strcmp("video", type);
unsigned char audio = !strcmp("audio", type);
@@ -380,7 +380,7 @@ int LinuxDvbPause(Context_t *context, char * type) {
return ret;
}
int LinuxDvbContinue(Context_t *context, char * type) {
int LinuxDvbContinue(Context_t *context __attribute__((unused)), char * type) {
int ret = cERR_LINUXDVB_NO_ERROR;
unsigned char video = !strcmp("video", type);
unsigned char audio = !strcmp("audio", type);
@@ -410,7 +410,7 @@ int LinuxDvbContinue(Context_t *context, char * type) {
return ret;
}
int LinuxDvbReverseDiscontinuity(Context_t *context, int* surplus) {
int LinuxDvbReverseDiscontinuity(Context_t *context __attribute__((unused)), int* surplus) {
int ret = cERR_LINUXDVB_NO_ERROR;
int dis_type = VIDEO_DISCONTINUITY_CONTINUOUS_REVERSE | *surplus;
@@ -427,7 +427,7 @@ int LinuxDvbReverseDiscontinuity(Context_t *context, int* surplus) {
return ret;
}
int LinuxDvbAudioMute(Context_t *context, char *flag) {
int LinuxDvbAudioMute(Context_t *context __attribute__((unused)), char *flag) {
int ret = cERR_LINUXDVB_NO_ERROR;
linuxdvb_printf(10, "\n");
@@ -465,7 +465,7 @@ int LinuxDvbAudioMute(Context_t *context, char *flag) {
}
int LinuxDvbFlush(Context_t *context, char * type) {
int LinuxDvbFlush(Context_t *context __attribute__((unused)), char * type) {
unsigned char video = !strcmp("video", type);
unsigned char audio = !strcmp("audio", type);
@@ -600,7 +600,7 @@ int LinuxDvbFastForward(Context_t *context, char * type) {
#endif
int LinuxDvbReverse(Context_t *context, char * type) {
int LinuxDvbReverse(Context_t *context __attribute__((unused)), char * type __attribute__((unused))) {
int ret = cERR_LINUXDVB_NO_ERROR;
#ifdef reverse_playback_2
int speed;
@@ -686,7 +686,7 @@ int LinuxDvbSlowMotion(Context_t *context, char * type) {
return ret;
}
int LinuxDvbAVSync(Context_t *context, char * type) {
int LinuxDvbAVSync(Context_t *context, char * type __attribute__((unused))) {
int ret = cERR_LINUXDVB_NO_ERROR;
/* konfetti: this one is dedicated to audiofd so we
* are ignoring what is given by type! I think we should
@@ -710,7 +710,7 @@ int LinuxDvbAVSync(Context_t *context, char * type) {
return ret;
}
int LinuxDvbClear(Context_t *context, char * type) {
int LinuxDvbClear(Context_t *context __attribute__((unused)), char * type) {
int ret = cERR_LINUXDVB_NO_ERROR;
unsigned char video = !strcmp("video", type);
unsigned char audio = !strcmp("audio", type);
@@ -745,7 +745,7 @@ int LinuxDvbClear(Context_t *context, char * type) {
return ret;
}
int LinuxDvbPts(Context_t *context, unsigned long long int* pts) {
int LinuxDvbPts(Context_t *context __attribute__((unused)), unsigned long long int* pts) {
int ret = cERR_LINUXDVB_NO_ERROR;
linuxdvb_printf(50, "\n");
@@ -783,7 +783,7 @@ int LinuxDvbPts(Context_t *context, unsigned long long int* pts) {
return ret;
}
int LinuxDvbGetFrameCount(Context_t *context, unsigned long long int* frameCount) {
int LinuxDvbGetFrameCount(Context_t *context __attribute__((unused)), unsigned long long int* frameCount) {
int ret = cERR_LINUXDVB_NO_ERROR;
dvb_play_info_t playInfo;

7
libeplayer3/output/output.c
View File

@@ -63,6 +63,13 @@ static const char* FILENAME = "output.c";
/* Varaibles */
/* ***************************** */
static Output_t * AvailableOutput[] = {
&LinuxDvbOutput,
&SubtitleOutput,
&PipeOutput,
NULL
};
/* ***************************** */
/* Prototypes */
/* ***************************** */

38
libeplayer3/output/output_pipe.c
View File

@@ -88,7 +88,7 @@ int PipeStop(Context_t *context, char * type);
/* MISC Functions */
/* ***************************** */
void getPipeMutex(const char *filename, const char *function, int line) {
void getPipeMutex(const char *filename __attribute__((unused)), const char *function __attribute__((unused)), int line __attribute__((unused))) {
pipe_printf(250, "requesting mutex\n");
@@ -97,14 +97,14 @@ void getPipeMutex(const char *filename, const char *function, int line) {
pipe_printf(250, "received mutex\n");
}
void releasePipeMutex(const char *filename, const char *function, int line) {
void releasePipeMutex(const char *filename __attribute__((unused)), const char *function __attribute__((unused)), int line __attribute__((unused))) {
pthread_mutex_unlock(&Pipemutex);
pipe_printf(250, "released mutex\n");
}
int PipeOpen(Context_t *context, char * type) {
int PipeOpen(Context_t *context __attribute__((unused)), char * type) {
unsigned char teletext = !strcmp("teletext", type);
unsigned char dvbsubtitle = !strcmp("dvbsubtitle", type);
@@ -163,10 +163,10 @@ int PipeClose(Context_t *context, char * type) {
return cERR_PIPE_NO_ERROR;
}
int PipePlay(Context_t *context, char * type) {
int PipePlay(Context_t *context __attribute__((unused)), char * type __attribute__((unused))) {
int ret = cERR_PIPE_NO_ERROR;
Writer_t* writer;
#if 0
unsigned char dvbsubtitle = !strcmp("dvbsubtitle", type);
unsigned char teletext = !strcmp("teletext", type);
@@ -176,12 +176,14 @@ int PipePlay(Context_t *context, char * type) {
}
if (teletext && teletextfd != -1) {
}
#endif
return ret;
}
int PipeStop(Context_t *context, char * type) {
int PipeStop(Context_t *context __attribute__((unused)), char * type __attribute__((unused))) {
int ret = cERR_PIPE_NO_ERROR;
#if 0
unsigned char dvbsubtitle = !strcmp("dvbsubtitle", type);
unsigned char teletext = !strcmp("teletext", type);
@@ -195,11 +197,12 @@ int PipeStop(Context_t *context, char * type) {
}
releasePipeMutex(FILENAME, __FUNCTION__,__LINE__);
#endif
return ret;
}
int PipeFlush(Context_t *context, char * type) {
int PipeFlush(Context_t *context __attribute__((unused)), char * type) {
unsigned char dvbsubtitle = !strcmp("dvbsubtitle", type);
unsigned char teletext = !strcmp("teletext", type);
@@ -225,7 +228,7 @@ int PipeFlush(Context_t *context, char * type) {
return cERR_PIPE_NO_ERROR;
}
int PipeClear(Context_t *context, char * type) {
int PipeClear(Context_t *context __attribute__((unused)), char * type) {
int ret = cERR_PIPE_NO_ERROR;
unsigned char dvbsubtitle = !strcmp("dvbsubtitle", type);
unsigned char teletext = !strcmp("teletext", type);
@@ -252,10 +255,10 @@ int PipeClear(Context_t *context, char * type) {
return ret;
}
int PipeSwitch(Context_t *context, char * type) {
int PipeSwitch(Context_t *context __attribute__((unused)), char * type __attribute__((unused))) {
#if 0
unsigned char dvbsubtitle = !strcmp("dvbsubtitle", type);
unsigned char teletext = !strcmp("teletext", type);
Writer_t* writer;
pipe_printf(10, "v%d a%d\n", dvbsubtitle, teletext);
@@ -273,13 +276,13 @@ int PipeSwitch(Context_t *context, char * type) {
}
pipe_printf(10, "exiting\n");
#endif
return cERR_PIPE_NO_ERROR;
}
static int writePESDataTeletext(int fd, unsigned char *data, size_t data_len)
{
int len = 0;
unsigned int len = 0;
if (data_len > 0) {
len = data_len + 39;
char header[45];
@@ -335,7 +338,7 @@ static int writePESDataDvbsubtitle(int fd, unsigned char *data, size_t data_len,
iov[1].iov_base = data;
iov[1].iov_len = data_len;
len = writev(fd, iov, 2);
if (len != iov[0].iov_len + iov[1].iov_len) {
if (len != (int)(iov[0].iov_len + iov[1].iov_len)) {
// writing to pipe failed, clear it.
char buf[65536];
while(0 < read(fd, buf, sizeof(buf)));
@@ -344,16 +347,13 @@ static int writePESDataDvbsubtitle(int fd, unsigned char *data, size_t data_len,
return len;
}
static int Write(void *_context, void* _out)
static int Write(void *_context __attribute__((unused)), void* _out)
{
Context_t *context = (Context_t *) _context;
AudioVideoOut_t *out = (AudioVideoOut_t*) _out;
int ret = cERR_PIPE_NO_ERROR;
int res = 0;
unsigned char dvbsubtitle;
unsigned char teletext;
Writer_t* writer;
WriterAVCallData_t call;
if (out == NULL)
{
@@ -387,7 +387,7 @@ static int Write(void *_context, void* _out)
return ret;
}
static int reset(Context_t *context)
static int reset(Context_t *context __attribute__((unused)))
{
int ret = cERR_PIPE_NO_ERROR;

6
libeplayer3/output/output_subtitle.c
View File

@@ -597,7 +597,7 @@ static int Write(void* _context, void *data) {
return cERR_SUBTITLE_NO_ERROR;
}
static int subtitle_Open(Context_t* context) {
static int subtitle_Open(Context_t* context __attribute__((unused))) {
int i;
subtitle_printf(10, "\n");
@@ -629,7 +629,7 @@ static int subtitle_Open(Context_t* context) {
return cERR_SUBTITLE_NO_ERROR;
}
static int subtitle_Close(Context_t* context) {
static int subtitle_Close(Context_t* context __attribute__((unused))) {
int i;
subtitle_printf(10, "\n");
@@ -690,7 +690,7 @@ static int subtitle_Play(Context_t* context) {
return cERR_SUBTITLE_NO_ERROR;
}
static int subtitle_Stop(Context_t* context) {
static int subtitle_Stop(Context_t* context __attribute__((unused))) {
int wait_time = 20;
int i;

1
libeplayer3/output/writer/divx.c
View File

@@ -101,7 +101,6 @@ static int writeData(void* _call)
unsigned int FakeHeaderLength;
unsigned char Version = 5;
unsigned int FakeStartCode = (Version << 8) | PES_VERSION_FAKE_START_CODE;
unsigned int HeaderLength = 0;
unsigned int usecPerFrame = 41708; /* Hellmaster1024: default value */
BitPacker_t ld = {FakeHeaders, 0, 32};

1
libeplayer3/output/writer/dts.c
View File

@@ -98,7 +98,6 @@ static int writeData(void* _call)
{
WriterAVCallData_t* call = (WriterAVCallData_t*) _call;
int i = 0;
unsigned char PesHeader[PES_AUDIO_HEADER_SIZE];
dts_printf(10, "\n");

4
libeplayer3/output/writer/framebuffer.c
View File

@@ -129,7 +129,7 @@ static int writeData(void* _call)
int src_stride = call->Stride;
int dst_stride = call->destStride;
int dst_delta = dst_stride - call->Width*4;
int x,y;
unsigned int x,y;
const unsigned char *src = call->data;
unsigned char *dst = call->destination + (call->y * dst_stride + call->x * 4);
unsigned int k,ck,t;
@@ -176,7 +176,7 @@ static int writeData(void* _call)
}
} else
{
int y;
unsigned int y;
for (y = 0; y < call->Height; y++)
memset(call->destination + ((call->y + y) * call->destStride) + call->x * 4, 0, call->Width * 4);
}

16
libeplayer3/output/writer/h264.c
View File

@@ -54,9 +54,9 @@
#define H264_DEBUG
#ifdef H264_DEBUG
static const char *FILENAME = "h264.c";
static short debug_level = 0;
static short debug_level = 10;
#define h264_printf(level, fmt, x...) do { \
if (debug_level >= level) printf("[%s:%s] " fmt, FILENAME, __FUNCTION__, ## x); } while (0)
@@ -113,16 +113,14 @@ static int writeData(void* _call)
{
WriterAVCallData_t* call = (WriterAVCallData_t*) _call;
unsigned char* PacketStart = NULL;
unsigned int PacketStartSIZE = 0;
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
unsigned long long int VideoPts;
unsigned int TimeDelta;
unsigned int TimeScale;
int len = 0;
static int NoOtherBeginningFound = 1;
int ic = 0;
struct iovec iov[128];
int ic = 0;
struct iovec iov[128];
h264_printf(10, "\n");
if (call == NULL)
@@ -178,10 +176,10 @@ static int writeData(void* _call)
if (initialHeader)
{
avcC_t* avcCHeader = (avcC_t*)call->private_data;
int i;
unsigned int i;
unsigned int ParamSets;
unsigned int ParamOffset;
unsigned int InitialHeaderLength = 0;
unsigned int InitialHeaderLength = 0;
unsigned int ParametersLength;
if (avcCHeader == NULL) {
@@ -320,8 +318,6 @@ static int writeData(void* _call)
NalStart += NalLength;
while (NalLength > 0) {
unsigned int PacketLength = (NalLength < BUFFER_SIZE) ? NalLength : BUFFER_SIZE;
int ExtraLength = 0;
NalLength -= PacketLength;
ic = 0;

2
libeplayer3/output/writer/misc.c
View File

@@ -65,7 +65,7 @@
void PutBits(BitPacker_t * ld, unsigned int code, unsigned int length)
{
unsigned int bit_buf;
int bit_left;
unsigned int bit_left;
bit_buf = ld->BitBuffer;
bit_left = ld->Remaining;

2
libeplayer3/output/writer/mpeg2.c
View File

@@ -97,7 +97,7 @@ static int writeData(void* _call)
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
int len = 0;
int Position = 0;
unsigned int Position = 0;
mpeg2_printf(10, "\n");

9
libeplayer3/output/writer/pcm.c
View File

@@ -117,7 +117,7 @@ static unsigned int breakBufferFillSize = 0;
/* MISC Functions */
/* ***************************** */
static int prepareClipPlay(int uNoOfChannels, int uSampleRate, int uBitsPerSample, int bLittleEndian)
static int prepareClipPlay(int uNoOfChannels, int uSampleRate, int uBitsPerSample, int bLittleEndian __attribute__((unused)))
{
printf("rate: %d ch: %d bits: %d (%d bps)\n",
uSampleRate/*Format->dwSamplesPerSec*/,
@@ -190,8 +190,6 @@ static int writeData(void* _call)
{
WriterAVCallData_t* call = (WriterAVCallData_t*) _call;
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
pcm_printf(10, "\n");
if (call == NULL)
@@ -224,15 +222,14 @@ static int writeData(void* _call)
}
unsigned char * buffer = call->data;
int size = call->len;
unsigned int size = call->len;
//printf("PCM %d size SubFrameLen=%d\n", size, SubFrameLen);
unsigned int qty;
unsigned int n;
unsigned int injectBufferSize = sizeof(lpcm_pes) + sizeof(lpcm_prv) + SubFrameLen;
unsigned char * injectBuffer = (unsigned char *)malloc(sizeof(unsigned char)*injectBufferSize);
unsigned char * injectBufferDataPointer = &injectBuffer[sizeof(lpcm_pes)+sizeof(lpcm_prv)];
int pos;
unsigned int pos;
for(pos = 0; pos < size; )
{

5
libeplayer3/output/writer/vc1.c
View File

@@ -201,7 +201,7 @@ static int writeData(void* _call)
}
{
int i;
unsigned int i;
/* For VC1 the codec private data is a standard vc1 sequence header so we just copy it to the output */
memcpy (&PesPacket[PES_MIN_HEADER_SIZE], call->private_data, call->private_size);
@@ -218,7 +218,7 @@ static int writeData(void* _call)
}
if(call->len > 0 && call->data) {
int Position = 0;
unsigned int Position = 0;
unsigned char insertSampleHeader = 1;
while(Position < call->len) {
@@ -233,7 +233,6 @@ static int writeData(void* _call)
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
memset (PesHeader, '0', PES_MAX_HEADER_SIZE);
int HeaderLength = InsertPesHeader (PesHeader, PacketLength, VC1_VIDEO_PES_START_CODE, call->Pts, 0);
unsigned char* PacketStart;
if(insertSampleHeader) {
const unsigned char Vc1FrameStartCode[] = {0, 0, 1, VC1_FRAME_START_CODE};

1
libeplayer3/output/writer/wma.c
View File

@@ -125,7 +125,6 @@ static int writeData(void* _call)
if (initialHeader) {
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
int HeaderLength;
if ((call->private_size <= 0) || (call->private_data == NULL))
{

3
libeplayer3/output/writer/wmv.c
View File

@@ -204,7 +204,7 @@ static int writeData(void* _call)
}
if(call->len > 0 && call->data) {
int Position = 0;
unsigned int Position = 0;
unsigned char insertSampleHeader = 1;
while(Position < call->len) {
@@ -218,7 +218,6 @@ static int writeData(void* _call)
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
memset (PesHeader, '0', PES_MAX_HEADER_SIZE);
int HeaderLength = InsertPesHeader (PesHeader, PacketLength, VC1_VIDEO_PES_START_CODE, call->Pts, 0);
unsigned char* PacketStart;
if(insertSampleHeader) {
unsigned int PesLength;

26
libeplayer3/output/writer/writer.c
View File

@@ -58,6 +58,32 @@ if (debug_level >= level) printf(x); } while (0)
/* Varaibles */
/* ***************************** */
static Writer_t * AvailableWriter[] = {
&WriterAudioIPCM,
&WriterAudioPCM,
&WriterAudioMP3,
&WriterAudioMPEGL3,
&WriterAudioAC3,
&WriterAudioAAC,
&WriterAudioDTS,
&WriterAudioWMA,
&WriterAudioFLAC,
&WriterAudioVORBIS,
&WriterVideoMPEG2,
&WriterVideoMPEGH264,
&WriterVideoH264,
&WriterVideoDIVX,
&WriterVideoFOURCC,
&WriterVideoMSCOMP,
&WriterVideoWMV,
&WriterVideoH263,
&WriterVideoFLV,
&WriterVideoVC1,
&WriterFramebuffer,
NULL
};
/* ***************************** */
/* Prototypes */
/* ***************************** */