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

h264 writer - Revert not intended test change

Browse Source 
Origin commit data
------------------
Branch: master
Commit: b5a0c5016b
Author: samsamsam <samsamsam@o2.pl>
Date: 2018-03-13 (Tue, 13 Mar 2018)


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

------------------
This commit was generated by Migit
This commit is contained in:
samsamsam
2018-03-13 12:55:59 +01:00
committed by TangoCash
parent 791e906695
commit f19c639e94
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libeplayer3-arm/main/exteplayer.c
View File

@@ -635,7 +635,7 @@ int main(int argc, char *argv[])
memset(argvBuff, '\0', sizeof(argvBuff)); memset(argvBuff, '\0', sizeof(argvBuff));
int commandRetVal = -1; int commandRetVal = -1;
/* inform client that we can handle additional commands */ /* inform client that we can handle additional commands */
fprintf(stderr, "{\"EPLAYER3_EXTENDED\":{\"version\":%d}}\n", 37); fprintf(stderr, "{\"EPLAYER3_EXTENDED\":{\"version\":%d}}\n", 38);
if (0 != ParseParams(argc, argv, file, audioFile, &audioTrackIdx, &subtitleTrackIdx)) if (0 != ParseParams(argc, argv, file, audioFile, &audioTrackIdx, &subtitleTrackIdx))
{ {
printf("Usage: exteplayer3 filePath [-u user-agent] [-c cookies] [-h headers] [-p prio] [-a] [-d] [-w] [-l] [-s] [-i] [-t audioTrackId] [-9 subtitleTrackId] [-x separateAudioUri] plabackUri\n"); printf("Usage: exteplayer3 filePath [-u user-agent] [-c cookies] [-h headers] [-p prio] [-a] [-d] [-w] [-l] [-s] [-i] [-t audioTrackId] [-9 subtitleTrackId] [-x separateAudioUri] plabackUri\n");

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

@@ -321,8 +321,7 @@ static int writeData(WriterAVCallData_t *call)
/* AnnexA */ /* AnnexA */
if (!avc3 && ((1 < call->private_size && 0 == call->private_data[0]) || if (!avc3 && ((1 < call->private_size && 0 == call->private_data[0]) ||
((call->len > 3) && ((call->data[0] == 0x00 && call->data[1] == 0x00 && call->data[2] == 0x00 && call->data[3] == 0x01) || ((call->len > 3) && ((call->data[0] == 0x00 && call->data[1] == 0x00 && call->data[2] == 0x00 && call->data[3] == 0x01) ||
(call->data[0] == 0x00 && call->data[1] == 0x00 && call->data[2] == 0x01) || (call->data[0] == 0xff && call->data[1] == 0xff && call->data[2] == 0xff && call->data[3] == 0xff)))))
(call->data[0] == 0xff && call->data[1] == 0xff && call->data[2] == 0xff && call->data[3] == 0xff))))
{ {
uint32_t i = 0; uint32_t i = 0;
uint8_t InsertPrivData = !sps_pps_in_stream; uint8_t InsertPrivData = !sps_pps_in_stream;
@@ -331,8 +330,7 @@ static int writeData(WriterAVCallData_t *call)
iov[ic++].iov_base = PesHeader; iov[ic++].iov_base = PesHeader;
while (InsertPrivData && i < 36 && (call->len - i) > 5) while (InsertPrivData && i < 36 && (call->len - i) > 5)
{ {
if ((call->data[i] == 0x00 && call->data[i + 1] == 0x00 && call->data[i + 2] == 0x00 && call->data[i + 3] == 0x01 && (call->data[i + 4] == 0x67 || call->data[i + 4] == 0x68)) || if ((call->data[i] == 0x00 && call->data[i + 1] == 0x00 && call->data[i + 2] == 0x00 && call->data[i + 3] == 0x01 && (call->data[i + 4] == 0x67 || call->data[i + 4] == 0x68)))
(call->data[i] == 0x00 && call->data[i + 1] == 0x00 && call->data[i + 2] == 0x00 && (call->data[i + 3] == 0x67 || call->data[i + 3] == 0x68)))
{ {
InsertPrivData = 0; InsertPrivData = 0;
sps_pps_in_stream = 1; sps_pps_in_stream = 1;