libeplayer3-arm: cleanup types, use Context_t in commands

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

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)

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)

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)
{

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)
{

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)

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");

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;

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;

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)
{

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)
{

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");

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)
{

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)
{

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)

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);
}
/* ***************************** */

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)

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)
{