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-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3: experimental fixes

Browse Source 
Origin commit data
------------------
Branch: master
Commit: d481adb2b8
Author: martii <m4rtii@gmx.de>
Date: 2013-01-17 (Thu, 17 Jan 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-01-17 18:37:45 +01:00
parent 9c38b59aa9
commit 1bbd1ffc87
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libeplayer3/include/pes.h
View File

@@ -14,7 +14,11 @@
#define PES_VERSION_FAKE_START_CODE 0x31 #define PES_VERSION_FAKE_START_CODE 0x31
#ifdef MARTII
#define MAX_PES_PACKET_SIZE (6+65535)
#else
#define MAX_PES_PACKET_SIZE 65400 #define MAX_PES_PACKET_SIZE 65400
#endif
/* start codes */ /* start codes */

25
libeplayer3/output/writer/aac.c
View File

@@ -37,6 +37,9 @@
#include <asm/types.h> #include <asm/types.h>
#include <pthread.h> #include <pthread.h>
#include <errno.h> #include <errno.h>
#ifdef MARTII
#include <sys/uio.h>
#endif
#include "common.h" #include "common.h"
#include "output.h" #include "output.h"
@@ -246,17 +249,38 @@ static int writeData(void* _call)
{ {
aac_printf(10, "private_data = NULL\n"); aac_printf(10, "private_data = NULL\n");
#ifdef MARTII
memcpy (ExtraData, DefaultAACHeader, AAC_HEADER_LENGTH);
#else
call->private_data = DefaultAACHeader; call->private_data = DefaultAACHeader;
call->private_size = AAC_HEADER_LENGTH; call->private_size = AAC_HEADER_LENGTH;
#endif
} }
#ifdef MARTII
else
#endif
memcpy (ExtraData, call->private_data, AAC_HEADER_LENGTH); memcpy (ExtraData, call->private_data, AAC_HEADER_LENGTH);
#ifdef MARTII
ExtraData[3] |= (PacketLength >> 11) & 0x3;
#else
ExtraData[3] |= (PacketLength >> 12) & 0x3; ExtraData[3] |= (PacketLength >> 12) & 0x3;
#endif
ExtraData[4] = (PacketLength >> 3) & 0xff; ExtraData[4] = (PacketLength >> 3) & 0xff;
ExtraData[5] |= (PacketLength << 5) & 0xe0; ExtraData[5] |= (PacketLength << 5) & 0xe0;
unsigned int HeaderLength = InsertPesHeader (PesHeader, PacketLength, AAC_AUDIO_PES_START_CODE, call->Pts, 0); unsigned int HeaderLength = InsertPesHeader (PesHeader, PacketLength, AAC_AUDIO_PES_START_CODE, call->Pts, 0);
#ifdef MARTII
struct iovec iov[3];
iov[0].iov_base = PesHeader;
iov[0].iov_len = HeaderLength;
iov[1].iov_base = ExtraData;
iov[1].iov_len = AAC_HEADER_LENGTH;
iov[2].iov_base = call->data;
iov[2].iov_len = call->len;
return writev(call->fd, iov, 3);
#else
unsigned char* PacketStart = malloc(HeaderLength + sizeof(ExtraData) + call->len); unsigned char* PacketStart = malloc(HeaderLength + sizeof(ExtraData) + call->len);
memcpy (PacketStart, PesHeader, HeaderLength); memcpy (PacketStart, PesHeader, HeaderLength);
memcpy (PacketStart + HeaderLength, ExtraData, sizeof(ExtraData)); memcpy (PacketStart + HeaderLength, ExtraData, sizeof(ExtraData));
@@ -269,6 +293,7 @@ static int writeData(void* _call)
free(PacketStart); free(PacketStart);
return len; return len;
#endif
} }
/* ***************************** */ /* ***************************** */