diff --git a/libeplayer3/include/misc.h b/libeplayer3/include/misc.h index 7c383e7..34b2eb2 100644 --- a/libeplayer3/include/misc.h +++ b/libeplayer3/include/misc.h @@ -3,11 +3,13 @@ /* some useful things needed by many files ... */ +#include + #define INVALID_PTS_VALUE 0x200000000ll struct BitPacker_t { - unsigned char *Ptr; /* write pointer */ + uint8_t *Ptr; /* write pointer */ unsigned int BitBuffer; /* bitreader shifter */ int Remaining; /* number of remaining in the shifter */ }; diff --git a/libeplayer3/include/pes.h b/libeplayer3/include/pes.h index 2e69eb8..c9c63a5 100644 --- a/libeplayer3/include/pes.h +++ b/libeplayer3/include/pes.h @@ -28,7 +28,7 @@ #define VC1_VIDEO_PES_START_CODE 0xfd #define AAC_AUDIO_PES_START_CODE 0xcf -int InsertPesHeader(uint8_t *data, int size, unsigned char stream_id, int64_t pts, int pic_start_code); +int InsertPesHeader(uint8_t *data, int size, uint8_t stream_id, int64_t pts, int pic_start_code); int InsertVideoPrivateDataHeader(uint8_t *data, int payload_size); #endif diff --git a/libeplayer3/writer/ac3.cpp b/libeplayer3/writer/ac3.cpp index ec0d5b0..7ac84e3 100644 --- a/libeplayer3/writer/ac3.cpp +++ b/libeplayer3/writer/ac3.cpp @@ -42,7 +42,7 @@ bool WriterAC3::Write(int fd, AVFormatContext * /* avfc */, AVStream * /* stream if (fd < 0 || !packet) return false; - unsigned char PesHeader[PES_MAX_HEADER_SIZE]; + uint8_t PesHeader[PES_MAX_HEADER_SIZE]; struct iovec iov[2]; iov[0].iov_base = PesHeader; diff --git a/libeplayer3/writer/divx.cpp b/libeplayer3/writer/divx.cpp index 5629527..4de3436 100644 --- a/libeplayer3/writer/divx.cpp +++ b/libeplayer3/writer/divx.cpp @@ -53,10 +53,10 @@ bool WriterDIVX::Write(int fd, AVFormatContext * /* avfc */, AVStream *stream, A if (fd < 0 || !packet) return false; - unsigned char PesHeader[PES_MAX_HEADER_SIZE]; - unsigned char FakeHeaders[64]; // 64bytes should be enough to make the fake headers + uint8_t PesHeader[PES_MAX_HEADER_SIZE]; + uint8_t FakeHeaders[64]; // 64bytes should be enough to make the fake headers unsigned int FakeHeaderLength; - unsigned char Version = 5; + uint8_t Version = 5; unsigned int FakeStartCode = (Version << 8) | PES_VERSION_FAKE_START_CODE; unsigned int usecPerFrame = 41708; /* Hellmaster1024: default value */ BitPacker_t ld = { FakeHeaders, 0, 32 }; diff --git a/libeplayer3/writer/dts.cpp b/libeplayer3/writer/dts.cpp index 1e89ec8..2ac0ec8 100644 --- a/libeplayer3/writer/dts.cpp +++ b/libeplayer3/writer/dts.cpp @@ -45,16 +45,16 @@ bool WriterDTS::Write(int fd, AVFormatContext * /* avfc */, AVStream * /* stream if (fd < 0 || !packet) return false; - unsigned char PesHeader[PES_AUDIO_HEADER_SIZE]; + uint8_t PesHeader[PES_AUDIO_HEADER_SIZE]; // #define DO_BYTESWAP #ifdef DO_BYTESWAP - unsigned char Data[packet->size]; + uint8_t Data[packet->size]; memcpy(Data, packet->data, packet->size); /* 16-bit byte swap all data before injecting it */ for (i = 0; i < packet->size; i += 2) { - unsigned char Tmp = Data[i]; + uint8_t Tmp = Data[i]; Data[i] = Data[i + 1]; Data[i + 1] = Tmp; } diff --git a/libeplayer3/writer/flac.cpp b/libeplayer3/writer/flac.cpp index 707d00b..44f03d4 100644 --- a/libeplayer3/writer/flac.cpp +++ b/libeplayer3/writer/flac.cpp @@ -40,9 +40,9 @@ class WriterFLAC : public Writer bool WriterFLAC::Write(int fd, AVFormatContext * /* avfc */, AVStream * /* stream */, AVPacket *packet, int64_t pts) { if (fd < 0 || !packet) - return -1; + return false; - unsigned char PesHeader[PES_MAX_HEADER_SIZE]; + uint8_t PesHeader[PES_MAX_HEADER_SIZE]; struct iovec iov[2]; iov[0].iov_base = PesHeader; diff --git a/libeplayer3/writer/h263.cpp b/libeplayer3/writer/h263.cpp index 188ca88..aa0c30e 100644 --- a/libeplayer3/writer/h263.cpp +++ b/libeplayer3/writer/h263.cpp @@ -40,7 +40,7 @@ bool WriterH263::Write(int fd, AVFormatContext * /* avfc */, AVStream * /* strea { if (fd < 0 || !packet) return false; - unsigned char PesHeader[PES_MAX_HEADER_SIZE]; + uint8_t PesHeader[PES_MAX_HEADER_SIZE]; int HeaderLength = InsertPesHeader(PesHeader, packet->size, H263_VIDEO_PES_START_CODE, pts, 0); diff --git a/libeplayer3/writer/h264.cpp b/libeplayer3/writer/h264.cpp index f4e54ef..402661c 100644 --- a/libeplayer3/writer/h264.cpp +++ b/libeplayer3/writer/h264.cpp @@ -37,16 +37,16 @@ #define CONTAINER_PARAMETERS_VERSION 0x00 typedef struct avcC_s { - unsigned char Version; // configurationVersion - unsigned char Profile; // AVCProfileIndication - unsigned char Compatibility; // profile_compatibility - unsigned char Level; // AVCLevelIndication - unsigned char NalLengthMinusOne; // held in bottom two bits - unsigned char NumParamSets; // held in bottom 5 bits - unsigned char Params[1]; // {length,params}{length,params}...sequence then picture + uint8_t Version; // configurationVersion + uint8_t Profile; // AVCProfileIndication + uint8_t Compatibility; // profile_compatibility + uint8_t Level; // AVCLevelIndication + uint8_t NalLengthMinusOne; // held in bottom two bits + uint8_t NumParamSets; // held in bottom 5 bits + uint8_t Params[1]; // {length,params}{length,params}...sequence then picture } avcC_t; -const unsigned char Head[] = { 0, 0, 0, 1 }; +const uint8_t Head[] = { 0, 0, 0, 1 }; class WriterH264 : public Writer { @@ -70,7 +70,7 @@ bool WriterH264::Write(int fd, AVFormatContext * /* avfc */, AVStream *stream, A { if (fd < 0 || !packet) return false; - unsigned char PesHeader[PES_MAX_HEADER_SIZE]; + uint8_t PesHeader[PES_MAX_HEADER_SIZE]; unsigned int TimeDelta; unsigned int TimeScale; int len = 0; @@ -122,7 +122,7 @@ bool WriterH264::Write(int fd, AVFormatContext * /* avfc */, AVStream *stream, A ParametersLength = 0; - unsigned char HeaderData[19]; + uint8_t HeaderData[19]; HeaderData[ParametersLength++] = 0x00; // Start code HeaderData[ParametersLength++] = 0x00; HeaderData[ParametersLength++] = 0x01; @@ -212,7 +212,7 @@ bool WriterH264::Write(int fd, AVFormatContext * /* avfc */, AVStream *stream, A do { unsigned int NalLength; - unsigned char NalData[4]; + uint8_t NalData[4]; int NalPresent = 1; memcpy(NalData, packet->data + VideoPosition, NalLengthBytes); diff --git a/libeplayer3/writer/mp3.cpp b/libeplayer3/writer/mp3.cpp index 8d3502e..024bb4f 100644 --- a/libeplayer3/writer/mp3.cpp +++ b/libeplayer3/writer/mp3.cpp @@ -42,7 +42,7 @@ bool WriterMP3::Write(int fd, AVFormatContext * /* avfc */, AVStream * /* stream if (fd < 0 || !packet) return false; - unsigned char PesHeader[PES_MAX_HEADER_SIZE]; + uint8_t PesHeader[PES_MAX_HEADER_SIZE]; struct iovec iov[2]; iov[0].iov_base = PesHeader; diff --git a/libeplayer3/writer/mpeg2.cpp b/libeplayer3/writer/mpeg2.cpp index 66be81a..a9143ec 100644 --- a/libeplayer3/writer/mpeg2.cpp +++ b/libeplayer3/writer/mpeg2.cpp @@ -44,7 +44,7 @@ bool WriterMPEG2::Write(int fd, AVFormatContext * /* avfc */, AVStream * /* stre if (fd < 0 || !packet) return false; - unsigned char PesHeader[PES_MAX_HEADER_SIZE]; + uint8_t PesHeader[PES_MAX_HEADER_SIZE]; for (int Position = 0; Position < packet->size; ) { int PacketLength = std::min(packet->size - Position, MAX_PES_PACKET_SIZE); diff --git a/libeplayer3/writer/pcm.cpp b/libeplayer3/writer/pcm.cpp index 5ae2f2b..b03ed20 100644 --- a/libeplayer3/writer/pcm.cpp +++ b/libeplayer3/writer/pcm.cpp @@ -40,7 +40,7 @@ extern "C" { } // reference: search for TypeLpcmDVDAudio in player/frame_parser/frame_parser_audio_lpcm.cpp -static const unsigned char clpcm_prv[14] = { +static const uint8_t clpcm_prv[14] = { 0xA0, //sub_stream_id 0, 0, //resvd and UPC_EAN_ISRC stuff, unused 0x0A, //private header length @@ -59,8 +59,8 @@ class WriterPCM : public Writer private: unsigned int SubFrameLen; unsigned int SubFramesPerPES; - unsigned char lpcm_prv[14]; - unsigned char breakBuffer[8192]; + uint8_t lpcm_prv[14]; + uint8_t breakBuffer[8192]; unsigned int breakBufferFillSize; int uNoOfChannels; int uSampleRate; @@ -137,7 +137,7 @@ bool WriterPCM::prepareClipPlay() break; default: printf("inappropriate bits per sample (%d) - must be 16 or 24\n", uBitsPerSample); - return false; + return false; } return true; @@ -145,7 +145,7 @@ bool WriterPCM::prepareClipPlay() int WriterPCM::writePCM(int fd, int64_t Pts, uint8_t *data, unsigned int size) { - unsigned char PesHeader[PES_MAX_HEADER_SIZE]; + uint8_t PesHeader[PES_MAX_HEADER_SIZE]; if (initialHeader) { initialHeader = false; @@ -153,25 +153,25 @@ int WriterPCM::writePCM(int fd, int64_t Pts, uint8_t *data, unsigned int size) } unsigned int n; - unsigned char *injectBuffer = (unsigned char *) malloc(SubFrameLen); + uint8_t *injectBuffer = (uint8_t *) malloc(SubFrameLen); unsigned int pos; for (pos = 0; pos < size;) { //printf("PCM %s - Position=%d\n", __FUNCTION__, pos); if ((size - pos) < SubFrameLen) { breakBufferFillSize = size - pos; - memcpy(breakBuffer, &data[pos], sizeof(unsigned char) * breakBufferFillSize); + memcpy(breakBuffer, &data[pos], sizeof(uint8_t) * breakBufferFillSize); //printf("PCM %s - Unplayed=%d\n", __FUNCTION__, breakBufferFillSize); break; } //get first PES's worth if (breakBufferFillSize > 0) { - memcpy(injectBuffer, breakBuffer, sizeof(unsigned char) * breakBufferFillSize); - memcpy(&injectBuffer[breakBufferFillSize], &data[pos], sizeof(unsigned char) * (SubFrameLen - breakBufferFillSize)); + memcpy(injectBuffer, breakBuffer, sizeof(uint8_t) * breakBufferFillSize); + memcpy(&injectBuffer[breakBufferFillSize], &data[pos], sizeof(uint8_t) * (SubFrameLen - breakBufferFillSize)); pos += (SubFrameLen - breakBufferFillSize); breakBufferFillSize = 0; } else { - memcpy(injectBuffer, &data[pos], sizeof(unsigned char) * SubFrameLen); + memcpy(injectBuffer, &data[pos], sizeof(uint8_t) * SubFrameLen); pos += SubFrameLen; } @@ -186,8 +186,7 @@ int WriterPCM::writePCM(int fd, int64_t Pts, uint8_t *data, unsigned int size) //write the PCM data if (uBitsPerSample == 16) { for (n = 0; n < SubFrameLen; n += 2) { - unsigned char tmp; - tmp = injectBuffer[n]; + uint8_t tmp = injectBuffer[n]; injectBuffer[n] = injectBuffer[n + 1]; injectBuffer[n + 1] = tmp; } @@ -196,7 +195,7 @@ int WriterPCM::writePCM(int fd, int64_t Pts, uint8_t *data, unsigned int size) // A1c A1b A1a-B1c B1b B1a-A2c A2b A2a-B2c B2b B2a // to A1a A1b B1a B1b.A2a A2b B2a B2b-A1c B1c A2c B2c for (n = 0; n < SubFrameLen; n += 12) { - unsigned char t, *p = &injectBuffer[n]; + uint8_t t, *p = &injectBuffer[n]; t = p[0]; p[0] = p[2]; p[2] = p[5]; diff --git a/libeplayer3/writer/pes.cpp b/libeplayer3/writer/pes.cpp index aef9582..f32da30 100644 --- a/libeplayer3/writer/pes.cpp +++ b/libeplayer3/writer/pes.cpp @@ -30,7 +30,7 @@ #include "misc.h" #include "pes.h" -int InsertVideoPrivateDataHeader(unsigned char *data, int payload_size) +int InsertVideoPrivateDataHeader(uint8_t *data, int payload_size) { BitPacker_t ld2 = { data, 0, 32 }; int i; @@ -49,7 +49,7 @@ int InsertVideoPrivateDataHeader(unsigned char *data, int payload_size) } -int InsertPesHeader(uint8_t *data, int size, unsigned char stream_id, int64_t pts, int pic_start_code) +int InsertPesHeader(uint8_t *data, int size, uint8_t stream_id, int64_t pts, int pic_start_code) { BitPacker_t ld2 = { data, 0, 32 }; diff --git a/libeplayer3/writer/vc1.cpp b/libeplayer3/writer/vc1.cpp index 7422cd7..7ac5c18 100644 --- a/libeplayer3/writer/vc1.cpp +++ b/libeplayer3/writer/vc1.cpp @@ -49,7 +49,7 @@ class WriterVC1 : public Writer { private: bool initialHeader; - unsigned char FrameHeaderSeen; + uint8_t FrameHeaderSeen; double frameRate; public: bool Write(int fd, AVFormatContext *avfc, AVStream *stream, AVPacket *packet, int64_t pts); @@ -71,11 +71,11 @@ bool WriterVC1::Write(int fd, AVFormatContext * /* avfc */, AVStream *stream, AV initialHeader = false; FrameHeaderSeen = false; - const unsigned char SequenceLayerStartCode[] = + const uint8_t SequenceLayerStartCode[] = { 0x00, 0x00, 0x01, VC1_SEQUENCE_LAYER_METADATA_START_CODE }; - const unsigned char Metadata[] = { + const uint8_t Metadata[] = { 0x00, 0x00, 0x00, 0xc5, 0x04, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, /* Struct C set for for advanced profile */ @@ -87,9 +87,9 @@ bool WriterVC1::Write(int fd, AVFormatContext * /* avfc */, AVStream *stream, AV 0x00, 0x00, 0x00, 0x00 }; - unsigned char PesHeader[PES_MAX_HEADER_SIZE]; - unsigned char PesPayload[128]; - unsigned char *PesPtr; + uint8_t PesHeader[PES_MAX_HEADER_SIZE]; + uint8_t PesPayload[128]; + uint8_t *PesPtr; unsigned int usecPerFrame = ((10000000.0 / av_q2d(stream->r_frame_rate))); struct iovec iov[2]; @@ -142,15 +142,15 @@ bool WriterVC1::Write(int fd, AVFormatContext * /* avfc */, AVStream *stream, AV if (packet->size > 0) { int Position = 0; - unsigned char insertSampleHeader = 1; + bool insertSampleHeader = true; while (Position < packet->size) { int PacketLength = std::min(packet->size - Position, MAX_PES_PACKET_SIZE); - unsigned char PesHeader[PES_MAX_HEADER_SIZE]; + uint8_t PesHeader[PES_MAX_HEADER_SIZE]; int HeaderLength = InsertPesHeader(PesHeader, PacketLength, VC1_VIDEO_PES_START_CODE, pts, 0); if (insertSampleHeader) { - const unsigned char Vc1FrameStartCode[] = { 0, 0, 1, VC1_FRAME_START_CODE }; + const uint8_t Vc1FrameStartCode[] = { 0, 0, 1, VC1_FRAME_START_CODE }; if (!FrameHeaderSeen && (packet->size > 3) && (memcmp(packet->data, Vc1FrameStartCode, 4) == 0)) FrameHeaderSeen = true; @@ -158,7 +158,7 @@ bool WriterVC1::Write(int fd, AVFormatContext * /* avfc */, AVStream *stream, AV memcpy(&PesHeader[HeaderLength], Vc1FrameStartCode, sizeof(Vc1FrameStartCode)); HeaderLength += sizeof(Vc1FrameStartCode); } - insertSampleHeader = 0; + insertSampleHeader = false; } struct iovec iov[2]; diff --git a/libeplayer3/writer/wmv.cpp b/libeplayer3/writer/wmv.cpp index fa62a17..023fa21 100644 --- a/libeplayer3/writer/wmv.cpp +++ b/libeplayer3/writer/wmv.cpp @@ -37,7 +37,7 @@ #define WMV3_PRIVATE_DATA_LENGTH 4 -static const unsigned char Metadata[] = { +static const uint8_t Metadata[] = { 0x00, 0x00, 0x00, 0xc5, 0x04, 0x00, 0x00, 0x00, #define METADATA_STRUCT_C_START 8 @@ -75,8 +75,8 @@ bool WriterWMV::Write(int fd, AVFormatContext * /* avfc */, AVStream *stream, AV if (initialHeader) { #define PES_MIN_HEADER_SIZE 9 - unsigned char PesPacket[PES_MIN_HEADER_SIZE + 128]; - unsigned char *PesPtr; + uint8_t PesPacket[PES_MIN_HEADER_SIZE + 128]; + uint8_t *PesPtr; unsigned int MetadataLength; unsigned int usecPerFrame = ((10000000.0 / av_q2d(stream->r_frame_rate))); @@ -85,7 +85,7 @@ bool WriterWMV::Write(int fd, AVFormatContext * /* avfc */, AVStream *stream, AV memcpy(PesPtr, Metadata, sizeof(Metadata)); PesPtr += METADATA_STRUCT_C_START; - unsigned char privateData[WMV3_PRIVATE_DATA_LENGTH] = { 0 }; + uint8_t privateData[WMV3_PRIVATE_DATA_LENGTH] = { 0 }; memcpy(privateData, stream->codec->extradata, stream->codec->extradata_size > WMV3_PRIVATE_DATA_LENGTH ? WMV3_PRIVATE_DATA_LENGTH : stream->codec->extradata_size); memcpy(PesPtr, privateData, WMV3_PRIVATE_DATA_LENGTH); @@ -126,7 +126,7 @@ bool WriterWMV::Write(int fd, AVFormatContext * /* avfc */, AVStream *stream, AV int PacketLength = std::min(packet->size - Position, MAX_PES_PACKET_SIZE); - unsigned char PesHeader[PES_MAX_HEADER_SIZE] = { 0 }; + uint8_t PesHeader[PES_MAX_HEADER_SIZE] = { 0 }; int HeaderLength = InsertPesHeader(PesHeader, PacketLength, VC1_VIDEO_PES_START_CODE, pts, 0); if (insertSampleHeader) {