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

libeplayer3-arm: cleanup types, use Context_t in commands

Browse Source
This commit is contained in:
max_10
2018-03-07 23:59:23 +01:00
committed by Thilo Graf
parent 71905680a6
commit cb275626b1
32 changed files with 195 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
libeplayer3-arm/output/linuxdvb_mipsel.c
View File

@@ -228,9 +228,9 @@ int LinuxDvbPlay(Context_t *context, char *type)
/*
if (0 != ioctl(videofd, VIDEO_STOP))
{
linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("VIDEO_STOP: %s\n", strerror(errno));
ret = cERR_LINUXDVB_ERROR;
linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("VIDEO_STOP: %s\n", strerror(errno));
ret = cERR_LINUXDVB_ERROR;
}
*/
if (writer == NULL)
@@ -276,9 +276,9 @@ int LinuxDvbPlay(Context_t *context, char *type)
/*
if (0 != ioctl(audiofd, AUDIO_STOP))
{
linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("AUDIO_STOP: %s\n", strerror(errno));
ret = cERR_LINUXDVB_ERROR;
linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("AUDIO_STOP: %s\n", strerror(errno));
ret = cERR_LINUXDVB_ERROR;
}
*/
if (writer == NULL)
@@ -347,11 +347,13 @@ int LinuxDvbStop(Context_t *context __attribute__((unused)), char *type)
linuxdvb_err("AUDIO_CLEAR_BUFFER: %s\n", strerror(errno));
}
/* set back to normal speed (end trickmodes) */
// if (ioctl(audiofd, AUDIO_SET_SPEED, DVB_SPEED_NORMAL_PLAY) == -1)
// {
// linuxdvb_err("ioctl failed with errno %d\n", errno);
// linuxdvb_err("AUDIO_SET_SPEED: %s\n", strerror(errno));
// }
/*
if (ioctl(audiofd, AUDIO_SET_SPEED, DVB_SPEED_NORMAL_PLAY) == -1)
{
linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("AUDIO_SET_SPEED: %s\n", strerror(errno));
}
*/
if (ioctl(audiofd, AUDIO_STOP) == -1)
{
linuxdvb_err("ioctl failed with errno %d\n", errno);
@@ -428,14 +430,16 @@ int LinuxDvbContinue(Context_t *context __attribute__((unused)), char *type)
int LinuxDvbReverseDiscontinuity(Context_t *context __attribute__((unused)), int *surplus __attribute__((unused)))
{
int ret = cERR_LINUXDVB_NO_ERROR;
// int dis_type = VIDEO_DISCONTINUITY_CONTINUOUS_REVERSE | *surplus;
// linuxdvb_printf(50, "\n");
// if (ioctl(videofd, VIDEO_DISCONTINUITY, (void*) dis_type) == -1)
// {
// linuxdvb_err("ioctl failed with errno %d\n", errno);
// linuxdvb_err("VIDEO_DISCONTINUITY: %s\n", strerror(errno));
// }
// linuxdvb_printf(50, "exiting\n");
/*
int dis_type = VIDEO_DISCONTINUITY_CONTINUOUS_REVERSE | *surplus;
linuxdvb_printf(50, "\n");
if (ioctl(videofd, VIDEO_DISCONTINUITY, (void *) dis_type) == -1)
{
linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("VIDEO_DISCONTINUITY: %s\n", strerror(errno));
}
linuxdvb_printf(50, "exiting\n");
*/
return ret;
}
@@ -476,28 +480,33 @@ int LinuxDvbAudioMute(Context_t *context __attribute__((unused)), char *flag)
int LinuxDvbFlush(Context_t *context __attribute__((unused)), char *type __attribute__((unused)))
{
// unsigned char video = !strcmp("video", type);
// unsigned char audio = !strcmp("audio", type);
// linuxdvb_printf(10, "v%d a%d\n", video, audio);
// if ((video && videofd != -1) || (audio && audiofd != -1)) {
// getLinuxDVBMutex(FILENAME, __FUNCTION__,__LINE__);
// if (video && videofd != -1) {
// if (ioctl(videofd, VIDEO_FLUSH, NULL) == -1)
// {
// linuxdvb_err("ioctl failed with errno %d\n", errno);
// linuxdvb_err("VIDEO_FLUSH: %s\n", strerror(errno));
// }
// }
// if (audio && audiofd != -1) {
// if (ioctl(audiofd, AUDIO_FLUSH, NULL) == -1)
// {
// linuxdvb_err("ioctl failed with errno %d\n", errno);
// linuxdvb_err("AUDIO_FLUSH: %s\n", strerror(errno));
// }
// }
// releaseLinuxDVBMutex(FILENAME, __FUNCTION__,__LINE__);
// }
// linuxdvb_printf(10, "exiting\n");
/*
unsigned char video = !strcmp("video", type);
unsigned char audio = !strcmp("audio", type);
linuxdvb_printf(10, "v%d a%d\n", video, audio);
if ((video && videofd != -1) || (audio && audiofd != -1))
{
getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
if (video && videofd != -1)
{
if (ioctl(videofd, VIDEO_FLUSH, NULL) == -1)
{
linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("VIDEO_FLUSH: %s\n", strerror(errno));
}
}
if (audio && audiofd != -1)
{
if (ioctl(audiofd, AUDIO_FLUSH, NULL) == -1)
{
linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("AUDIO_FLUSH: %s\n", strerror(errno));
}
}
releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
}
linuxdvb_printf(10, "exiting\n");
*/
return cERR_LINUXDVB_NO_ERROR;
}
@@ -546,12 +555,14 @@ int LinuxDvbFastForward(Context_t *context, char *type)
getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
speedIndex = context->playback->Speed % (sizeof(SpeedList) / sizeof(int));
linuxdvb_printf(1, "speedIndex %d\n", speedIndex);
// if (ioctl(videofd, VIDEO_SET_SPEED, SpeedList[speedIndex]) == -1)
// {
// linuxdvb_err("ioctl failed with errno %d\n", errno);
// linuxdvb_err("VIDEO_SET_SPEED: %s\n", strerror(errno));
// ret = cERR_LINUXDVB_ERROR;
// }
/*
if (ioctl(videofd, VIDEO_SET_SPEED, SpeedList[speedIndex]) == -1)
{
linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("VIDEO_SET_SPEED: %s\n", strerror(errno));
ret = cERR_LINUXDVB_ERROR;
}
*/
releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
}
if (audio && audiofd != -1)
@@ -559,12 +570,14 @@ int LinuxDvbFastForward(Context_t *context, char *type)
getLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
speedIndex = context->playback->Speed % (sizeof(SpeedList) / sizeof(int));
linuxdvb_printf(1, "speedIndex %d\n", speedIndex);
// if (ioctl(audiofd, AUDIO_SET_SPEED, SpeedList[speedIndex]) == -1)
// {
// linuxdvb_err("ioctl failed with errno %d\n", errno);
// linuxdvb_err("AUDIO_SET_SPEED: %s\n", strerror(errno));
// ret = cERR_LINUXDVB_ERROR;
// }
/*
if (ioctl(audiofd, AUDIO_SET_SPEED, SpeedList[speedIndex]) == -1)
{
linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("AUDIO_SET_SPEED: %s\n", strerror(errno));
ret = cERR_LINUXDVB_ERROR;
}
*/
releaseLinuxDVBMutex(FILENAME, __FUNCTION__, __LINE__);
}
linuxdvb_printf(10, "exiting with value %d\n", ret);
@@ -728,11 +741,13 @@ int LinuxDvbSwitch(Context_t *context, char *type)
if (writer == NULL)
{
linuxdvb_err("cannot found writer for encoding %s using default\n", Encoding);
// if (ioctl(audiofd, AUDIO_SET_BYPASS_MODE, (void*) AUDIO_ENCODING_MP3) == -1)
// {
// linuxdvb_err("ioctl failed with errno %d\n", errno);
// linuxdvb_err("AUDIO_SET_BYPASS_MODE: %s\n", strerror(errno));
// }
/*
if (ioctl(audiofd, AUDIO_SET_BYPASS_MODE, (void *) AUDIO_ENCODING_MP3) == -1)
{
linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("AUDIO_SET_BYPASS_MODE: %s\n", strerror(errno));
}
*/
}
else
{
@@ -776,11 +791,13 @@ int LinuxDvbSwitch(Context_t *context, char *type)
if (writer == NULL)
{
linuxdvb_err("cannot found writer for encoding %s using default\n", Encoding);
// if (ioctl(videofd, VIDEO_SET_STREAMTYPE, (void*) VIDEO_ENCODING_AUTO) == -1)
// {
// linuxdvb_err("ioctl failed with errno %d\n", errno);
// linuxdvb_err("VIDEO_SET_STREAMTYPE: %s\n", strerror(errno));
// }
/*
if (ioctl(videofd, VIDEO_SET_STREAMTYPE, (void *) VIDEO_ENCODING_AUTO) == -1)
{
linuxdvb_err("ioctl failed with errno %d\n", errno);
linuxdvb_err("VIDEO_SET_STREAMTYPE: %s\n", strerror(errno));
}
*/
}
else
{
@@ -812,15 +829,14 @@ int LinuxDvbSwitch(Context_t *context, char *type)
return cERR_LINUXDVB_NO_ERROR;
}
static int Write(void *_context, void *_out)
static int Write(Context_t *context, void *_out)
{
Context_t *context = (Context_t *) _context;
AudioVideoOut_t *out = (AudioVideoOut_t *) _out;
int ret = cERR_LINUXDVB_NO_ERROR;
int res = 0;
unsigned char video = 0;
unsigned char audio = 0;
Writer_t *writer;
AudioVideoOut_t *out = (AudioVideoOut_t *) _out;
int ret = cERR_LINUXDVB_NO_ERROR;
int res = 0;
unsigned char video = 0;
unsigned char audio = 0;
Writer_t *writer;
WriterAVCallData_t call;
if (out == NULL)
{
@@ -905,7 +921,7 @@ static int Write(void *_context, void *_out)
call.Width = out->width;
call.Height = out->height;
call.InfoFlags = out->infoFlags;
call.Version = 0; // is unsingned char
call.Version = 0; // is unsingned char
if (writer->writeData)
{
res = writer->writeData(&call);
@@ -947,7 +963,7 @@ static int Write(void *_context, void *_out)
call.FrameRate = out->frameRate;
call.FrameScale = out->timeScale;
call.InfoFlags = out->infoFlags;
call.Version = 0; /* -1; unsigned char cannot be negative */
call.Version = 0; /* -1; unsigned char cannot be negative */
if (writer->writeData)
{
res = writer->writeData(&call);
@@ -996,9 +1012,8 @@ static int reset(Context_t *context)
return ret;
}
static int Command(void *_context, OutputCmd_t command, void *argument)
static int Command(Context_t *context, OutputCmd_t command, void *argument)
{
Context_t *context = (Context_t *) _context;
int ret = cERR_LINUXDVB_NO_ERROR;
linuxdvb_printf(50, "Command %d\n", command);
switch (command)

3
libeplayer3-arm/output/output.c
View File

@@ -147,9 +147,8 @@ static void OutputDel(Context_t *context, char *port)
}
}
static int Command(void *_context, OutputCmd_t command, void *argument)
static int Command(Context_t *context, OutputCmd_t command, void *argument)
{
Context_t *context = (Context_t *) _context;
int ret = cERR_OUTPUT_NO_ERROR;
output_printf(10, "%s::%s Command %d\n", __FILE__, __FUNCTION__, command);
switch (command)

6
libeplayer3-arm/output/output_subtitle.c
View File

@@ -188,9 +188,8 @@ static int Flush()
return cERR_SUBTITLE_NO_ERROR;
}
static int Write(void *_context, void *data)
static int Write(Context_t *context, void *data)
{
Context_t *context = (Context_t *)_context;
char *Encoding = NULL;
SubtitleOut_t *out = NULL;
int32_t curtrackid = -1;
@@ -257,9 +256,8 @@ static int32_t subtitle_Close(Context_t *context __attribute__((unused)))
return cERR_SUBTITLE_NO_ERROR;
}
static int Command(void *_context, OutputCmd_t command, void *argument __attribute__((unused)))
static int Command(Context_t *context, OutputCmd_t command, void *argument __attribute__((unused)))
{
Context_t *context = (Context_t *) _context;
int ret = cERR_SUBTITLE_NO_ERROR;
subtitle_printf(50, "%d\n", command);
switch (command)

13
libeplayer3-arm/output/writer/mipsel/aac.c
View File

@@ -156,9 +156,8 @@ static int reset()
return 0;
}
static int _writeData(void *_call, int type)
static int _writeData(WriterAVCallData_t *call, int type)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
aac_printf(10, "\n _writeData type[%d]\n", type);
if (call == NULL)
{
@@ -199,9 +198,8 @@ static int _writeData(void *_call, int type)
return writev_with_retry(call->fd, iov, 2);
}
static int writeDataADTS(void *_call)
static int writeDataADTS(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
aac_printf(10, "\n");
if (call == NULL)
{
@@ -221,7 +219,7 @@ static int writeDataADTS(void *_call)
if ((call->private_data && 0 == strncmp("ADTS", (const char *)call->private_data, call->private_size)) ||
HasADTSHeader(call->data, call->len))
{
return _writeData(_call, 0);
return _writeData(call, 0);
}
uint32_t PacketLength = call->len + AAC_HEADER_LENGTH;
uint8_t PesHeader[PES_MAX_HEADER_SIZE + AAC_HEADER_LENGTH];
@@ -258,9 +256,8 @@ static int writeDataADTS(void *_call)
return writev_with_retry(call->fd, iov, 2);
}
static int writeDataLATM(void *_call)
static int writeDataLATM(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
aac_printf(10, "\n");
if (call == NULL)
{
@@ -274,7 +271,7 @@ static int writeDataLATM(void *_call)
}
if (call->private_data && 0 == strncmp("LATM", (const char *)call->private_data, call->private_size))
{
return _writeData(_call, 1);
return _writeData(call, 1);
}
aac_printf(10, "AudioPts %lld\n", call->Pts);
if (!pLATMCtx)

3
libeplayer3-arm/output/writer/mipsel/ac3.c
View File

@@ -95,9 +95,8 @@ static int reset()
return 0;
}
static int writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
ac3_printf(10, "\n");
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
if (call == NULL)

5
libeplayer3-arm/output/writer/mipsel/amr.c
View File

@@ -96,10 +96,9 @@ static int reset()
return 0;
}
static int writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
unsigned char PesHeader[PES_MAX_HEADER_SIZE + 4 + 9];
unsigned char PesHeader[PES_MAX_HEADER_SIZE + 4 + 9];
amr_printf(10, "\n");
if (call == NULL)
{

9
libeplayer3-arm/output/writer/mipsel/divx3.c
View File

@@ -113,12 +113,11 @@ static int reset()
return 0;
}
static int writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
unsigned char PesHeader[PES_MAX_HEADER_SIZE + 4];
// unsigned char Version = 5;
// unsigned int FakeStartCode = (Version << 8) | PES_VERSION_FAKE_START_CODE;
unsigned char PesHeader[PES_MAX_HEADER_SIZE + 4];
// unsigned char Version = 5;
// unsigned int FakeStartCode = (Version << 8) | PES_VERSION_FAKE_START_CODE;
divx_printf(10, "\n");
if (call == NULL)
{

3
libeplayer3-arm/output/writer/mipsel/dts.c
View File

@@ -100,9 +100,8 @@ static int32_t reset()
return 0;
}
static int32_t writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
uint8_t PesHeader[PES_AUDIO_HEADER_SIZE];
dts_printf(10, "\n");
if (call == NULL)

3
libeplayer3-arm/output/writer/mipsel/h263.c
View File

@@ -91,9 +91,8 @@ static int32_t reset()
return 0;
}
static int32_t writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
uint8_t PesHeader[PES_MAX_HEADER_SIZE];
int32_t len = 0;
h263_printf(10, "\n");

3
libeplayer3-arm/output/writer/mipsel/h264.c
View File

@@ -284,9 +284,8 @@ static int reset()
return 0;
}
static int writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
unsigned long long int VideoPts;
unsigned int TimeDelta;

3
libeplayer3-arm/output/writer/mipsel/h265.c
View File

@@ -168,9 +168,8 @@ static int reset()
return 0;
}
static int writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
unsigned long long int VideoPts;
unsigned int TimeDelta;

3
libeplayer3-arm/output/writer/mipsel/lpcm.c
View File

@@ -132,9 +132,8 @@ static int32_t reset()
return 0;
}
static int32_t writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
lpcm_printf(10, "\n");
if (!call)
{

5
libeplayer3-arm/output/writer/mipsel/mp3.c
View File

@@ -91,10 +91,9 @@ static int reset()
return 0;
}
static int writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
unsigned char PesHeader[PES_MAX_HEADER_SIZE + 22];
unsigned char PesHeader[PES_MAX_HEADER_SIZE + 22];
mp3_printf(10, "\n");
if (call == NULL)
{

5
libeplayer3-arm/output/writer/mipsel/mpeg2.c
View File

@@ -92,10 +92,9 @@ static int reset()
return 0;
}
static int writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
int len = 0;
unsigned int Position = 0;
mpeg2_printf(10, "\n");

5
libeplayer3-arm/output/writer/mipsel/mpeg4.c
View File

@@ -100,10 +100,9 @@ static int reset()
return 0;
}
static int writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
mpeg4_printf(10, "\n");
if (call == NULL)
{

3
libeplayer3-arm/output/writer/mipsel/pcm.c
View File

@@ -110,9 +110,8 @@ static int32_t reset()
return 0;
}
static int32_t writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
pcm_printf(10, "\n");
if (!call)
{

3
libeplayer3-arm/output/writer/mipsel/vc1.c
View File

@@ -107,9 +107,8 @@ static int reset()
return 0;
}
static int writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
//int len = 0;
vc1_printf(10, "\n");
if (call == NULL)

11
libeplayer3-arm/output/writer/mipsel/vp.c
View File

@@ -98,9 +98,8 @@ static int reset()
return 0;
}
static int writeData(void *_call, int is_vp6)
static int writeData(WriterAVCallData_t *call, int is_vp6)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
vp_printf(10, "\n");
if (call == NULL)
{
@@ -142,14 +141,14 @@ static int writeData(void *_call, int is_vp6)
return writev_with_retry(call->fd, iov, 2);
}
static int writeDataVP6(void *_call)
static int writeDataVP6(WriterAVCallData_t *call)
{
return writeData(_call, 1);
return writeData(call, 1);
}
static int writeDataVP89(void *_call)
static int writeDataVP89(WriterAVCallData_t *call)
{
return writeData(_call, 0);
return writeData(call, 0);
}
/* ***************************** */

3
libeplayer3-arm/output/writer/mipsel/wma.c
View File

@@ -103,9 +103,8 @@ static int reset()
return 0;
}
static int writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
//int len = 0;
wma_printf(10, "\n");
if (call == NULL)

3
libeplayer3-arm/output/writer/mipsel/wmv.c
View File

@@ -105,9 +105,8 @@ static int reset()
return 0;
}
static int writeData(void *_call)
static int writeData(WriterAVCallData_t *call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
wmv_printf(10, "\n");
if (call == NULL)
{