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

libeplayer3: Standardize comparison order and improve code readability

Browse Source 
Origin commit data
------------------
Commit: b7d7f97ee4
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2024-03-21 (Thu, 21 Mar 2024)

Origin message was:
------------------
small fix

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
BPanther
2024-03-24 22:23:52 +01:00
committed by Thilo Graf
parent 551e212a25
commit 73536563da
12 changed files with 65 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libeplayer3/output/writer/mipsel/aac.c
View File

@@ -154,7 +154,7 @@ static int _writeData(WriterAVCallData_t *call, int type)
}
/* simple validation */
if (0 == type) // check ADTS header
if (type == 0) // check ADTS header
{
if (0xFF != call->data[0] || 0xF0 != (0xF0 & call->data[1]))
{
@@ -163,7 +163,7 @@ static int _writeData(WriterAVCallData_t *call, int type)
}
// STB can handle only AAC LC profile
if (0 == (call->data[2] & 0xC0))
if ((call->data[2] & 0xC0) == 0)
{
// change profile AAC Main -> AAC LC (Low Complexity)
aac_printf(1, "change profile AAC Main -> AAC LC (Low Complexity) in the ADTS header");
@@ -204,7 +204,7 @@ static int writeDataADTS(WriterAVCallData_t *call)
return 0;
}
if ((call->private_data && 0 == strncmp("ADTS", (const char *)call->private_data, call->private_size)) ||
if ((call->private_data && strncmp("ADTS", (const char *)call->private_data, call->private_size) == 0) ||
HasADTSHeader(call->data, call->len))
{
//printf("%hhx %hhx %hhx %hhx %hhx %hhx %hhx %hhx\n", call->data[0], call->data[1], call->data[2], call->data[3], call->data[4], call->data[5], call->data[6], call->data[7]);
@@ -269,7 +269,7 @@ static int writeDataLATM(WriterAVCallData_t *call)
return 0;
}
if (call->private_data && 0 == strncmp("LATM", (const char *)call->private_data, call->private_size))
if (call->private_data && strncmp("LATM", (const char *)call->private_data, call->private_size) == 0)
{
return _writeData(call, 1);
}

2
libeplayer3/output/writer/mipsel/h264.c
View File

@@ -334,7 +334,7 @@ static int writeData(WriterAVCallData_t *call)
}
/* AnnexA */
if (!avc3 && ((1 < call->private_size && 0 == call->private_data[0]) ||
if (!avc3 && ((1 < call->private_size && call->private_data[0] == 0) ||
((call->len > 3) && ((call->data[0] == 0x00 && call->data[1] == 0x00 && call->data[2] == 0x00 && call->data[3] == 0x01) ||
(call->data[0] == 0xff && call->data[1] == 0xff && call->data[2] == 0xff && call->data[3] == 0xff)))))
{

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

@@ -111,7 +111,7 @@ ssize_t WriteWithRetry(Context_t *context, int pipefd, int fd, void *pDVBMtx __a
int retval = -1;
int maxFd = pipefd > fd ? pipefd : fd;
struct timeval tv;
while (size > 0 && 0 == PlaybackDieNow(0) && !context->playback->isSeeking)
while (size > 0 && PlaybackDieNow(0) == 0 && !context->playback->isSeeking)
{
FD_ZERO(&rfds);
FD_ZERO(&wfds);
@@ -194,7 +194,7 @@ ssize_t write_with_retry(int fd, const void *buf, int size)
{
ssize_t ret;
int retval = 0;
while (size > 0 && 0 == PlaybackDieNow(0))
while (size > 0 && PlaybackDieNow(0) == 0)
{
ret = write(fd, buf, size);
if (ret < 0)

8
libeplayer3/output/writer/sh4/aac.c
View File

@@ -153,7 +153,7 @@ static int _writeData(void *_call, int type)
}
/* simple validation */
if (0 == type) // check ADTS header
if (type == 0) // check ADTS header
{
if (0xFF != call->data[0] || 0xF0 != (0xF0 & call->data[1]))
{
@@ -162,7 +162,7 @@ static int _writeData(void *_call, int type)
}
// STB can handle only AAC LC profile
if (0 == (call->data[2] & 0xC0))
if ((call->data[2] & 0xC0) == 0)
{
// change profile AAC Main -> AAC LC (Low Complexity)
aac_printf(1, "change profile AAC Main -> AAC LC (Low Complexity) in the ADTS header");
@@ -217,7 +217,7 @@ static int writeDataADTS(void *_call)
return 0;
}
if ((call->private_data && 0 == strncmp("ADTS", call->private_data, call->private_size)) ||
if ((call->private_data && strncmp("ADTS", call->private_data, call->private_size) == 0) ||
HasADTSHeader(call->data, call->len))
{
return _writeData(_call, 0);
@@ -281,7 +281,7 @@ static int writeDataLATM(void *_call)
return 0;
}
if (call->private_data && 0 == strncmp("LATM", call->private_data, call->private_size))
if (call->private_data && strncmp("LATM", call->private_data, call->private_size) == 0)
{
return _writeData(_call, 1);
}

2
libeplayer3/output/writer/sh4/h264.c
View File

@@ -236,7 +236,7 @@ static int32_t writeData(void *_call)
}
/* AnnexA */
if (!avc3 && ((1 < call->private_size && 0 == call->private_data[0]) ||
if (!avc3 && ((1 < call->private_size && call->private_data[0] == 0) ||
(call->len > 3) && ((call->data[0] == 0x00 && call->data[1] == 0x00 && call->data[2] == 0x00 && call->data[3] == 0x01) ||
(call->data[0] == 0xff && call->data[1] == 0xff && call->data[2] == 0xff && call->data[3] == 0xff))))
{

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

@@ -105,7 +105,7 @@ ssize_t WriteWithRetry(Context_t *context, int pipefd, int fd, void *pDVBMtx, co
int retval = -1;
struct timeval tv;
while (size > 0 && 0 == PlaybackDieNow(0) && !context->playback->isSeeking)
while (size > 0 && PlaybackDieNow(0) == 0 && !context->playback->isSeeking)
{
if (context->playback->isPaused)
{