add define in Utils

diff --git a/src/BlueMux.h b/src/BlueMux.h
index 15e06dc..5f4fa39 100644 (file)
--- a/src/BlueMux.h
+++ b/src/BlueMux.h
@@ -12,12 +12,13 @@
 
 namespace TsRemux
 {
-struct EpElement {
- public:
-  signed long long pts_;
-  unsigned long spn_;
-  EpElement(signed long long pts, unsigned long spn);
-};
+// move to Utils.h
+// struct EpElement {
+//  public:
+//   signed long long pts_;
+//   unsigned long spn_;
+//   EpElement(signed long long pts, unsigned long spn);
+// };
 
 class BlueMux {
  public:

diff --git a/src/Utils.cc b/src/Utils.cc
index 579dab9..4b01114 100644 (file)
--- a/src/Utils.cc
+++ b/src/Utils.cc
@@ -2,8 +2,153 @@
 
 namespace TsRemux
 {
+    const int Constants::TS_PAYLOAD_SIZE = 184;
+    const int Constants::TS_SIZE = 188;
+    const int Constants::STRIDE_SIZE = 192;
+    const int Constants::DISK_BUFFER = 0x8D000 << 5;
+    const byte Constants::SYNC_BYTE = 0x47;
+    const byte Constants::PAT_PID = 0x00;
+    const byte Constants::SIT_PID = 0x1f;
+    const byte Constants::PAT_TABLE_ID = 0x00;
+    const byte Constants::PMT_TABLE_ID = 0x02;
+    const byte Constants::DTCP_DESCRIPTOR_TAG = 0x88;
+    const byte Constants::PACK_ID = 0xba;
+    const byte Constants::SYS_ID = 0xbb;
+    const byte Constants::MAP_ID = 0xbc;
+    const byte Constants::DIR_ID = 0xff;
+    const byte Constants::PAD_ID = 0xbe;
 
+    // defaults
+    const ushort Constants::DEFAULT_PMT_PID = 0x0100;
+    const ushort Constants::DEFAULT_VIDEO_PID = 0x1011;
+    const ushort Constants::MAX_VIDEO_PID = 0x1019;
+    const ushort Constants::DEFAULT_AUDIO_PID = 0x1100;
+    const ushort Constants::MAX_AUDIO_PID = 0x111f;
+    const ushort Constants::DEFAULT_PCR_PID = 0x1001;
+    const ushort Constants::DEFAULT_SUBTITLE_PID = 0x1800;
+    const ushort Constants::DEFAULT_PRESENTATION_GRAPHICS_PID = 0x1200;
+    const ushort Constants::DEFAULT_INTERACTIVE_GRAPHICS_PID = 0x1400;
+    const ushort Constants::DEFAULT_PROGRAM_NUMBER = 0x01;
+    const int Constants::MAX_BUFFER_COUNT = 0xff;
+    const int Constants::MIN_BUFFER_COUNT = 0x02;
+    const Int64 Constants::AUDIO_DELAY = 30000;
+    const UInt32 Constants::MKVCLUSTER_START = 0x1f43b675;
+    const UInt32 Constants::MKVFILE_START = 0x1a45dfa3;
+    const UInt32 Constants::MKVSEGMENT_START = 0x18538067;
+    const UInt32 Constants::MKVTRACKINFO_START = 0x1654AE6B;
 
+    // stream types
+    const byte Constants::PES_VIDEO = 0xe0;
+    const byte Constants::PES_AUDIO_MPEG = 0xc0;
+    const byte Constants::PES_PRIVATE1 = 0xbd;
+    const byte Constants::PES_PADDING = 0xbe;
+    const byte Constants::PES_PRIVATE2 = 0xbf;
+    const byte Constants::PES_VIDEO_VC1 = 0xfd;
+    const byte Constants::PES_PRIVATE_AC3 = 0x80;
+    const byte Constants::PES_PRIVATE_AC3_PLUS = 0xc0;
+    const byte Constants::PES_PRIVATE_DTS_HD = 0x88;
+    const byte Constants::PES_PRIVATE_LPCM = 0xa0;
+    const byte Constants::PES_PRIVATE_AC3_TRUE_HD = 0xb0;
+    const UInt32 Constants::VC1_SEQ_SC = 0x0000010f;
+    const UInt32 Constants::VC1_END_OF_STREAM = 0x0000010a;
+    const ushort Constants::AC3_SYNC = 0x0b77;
+    const UInt32 Constants::H264_PREFIX = 0x00000107;
+    const UInt32 Constants::H264_END_OF_STREAM = 0x0000010b;
+    const UInt32 Constants::DTS_SYNC = 0x7ffe8001;
+    const UInt32 Constants::DTS_EXT_SYNC = 0x64582025;
+    const UInt32 Constants::MLP_SYNC = 0xF8726FBA;
+    const UInt32 Constants::MPEG2_SEQ_CODE = 0x000001b3;
+    const UInt32 Constants::MPEG2_SEQ_EXT = 0x000001b5;
+    const UInt32 Constants::MPEG2_SEQ_END = 0x000001b7;
+
+    // clocks
+    const Int64 Constants::MPEG2TS_CLOCK_RATE = 27000000LL;
+    const Int64 Constants::MAX_MPEG2TS_CLOCK = 0x25800000000LL;
+    const Int64 Constants::MAX_BLURAY_CLOCK = 0x40000000LL;
+    const Int64 Constants::MAX_FIREWIRE_CLOCK = 24576000LL;
+    const Int64 Constants::MAX_PTS_CLOCK = 0x200000000LL;
+    const Int64 Constants::PTS_CLOCK_RATE = 90000LL;
+    const int Constants::MAX_OFFSET = 3072;
+    const int Constants::MAX_COUNT = 8000;
+
+   // descriptors
+    readonly byte Constants::hdmv_registration_descriptor[]
+        = { 0x05, 0x04, 0x48, 0x44, 0x4d, 0x56 };
+    readonly byte Constants::copy_control_descriptor[]
+        = { 0x88, 0x04, 0x0f, 0xff, 0x84, 0xfc };
+    readonly byte Constants::vc1_descriptor[]
+        = { 0x05, 0x05, 0x56, 0x43, 0x2d, 0x31, 0xff };
+    readonly byte Constants::ac3_registration_descriptor[] 
+         = { 0x05, 0x04, 0x41, 0x43, 0x2d, 0x33 };
+    readonly byte Constants::DefaultSitTableOne[] = {
+            0x47, 0x40, 0x1f, 0x10, 0x00, 0x7f, 0xf0, 0x19,
+            0xff, 0xff, 0xc1, 0x00, 0x00, 0xf0, 0x0a, 0x63,
+            0x08, 0xc1, 0x5a, 0xae, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0x00, 0x01, 0x80, 0x00, 0x34, 0x1e, 0xe7,
+            0x4e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff };   
+    readonly uint Constants::crc_table[] = {
+        0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
+        0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
+        0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
+        0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
+        0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3,
+        0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
+        0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef,
+        0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
+        0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb,
+        0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
+        0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
+        0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
+        0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4,
+        0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
+        0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08,
+        0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
+        0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc,
+        0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
+        0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050,
+        0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
+        0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
+        0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
+        0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1,
+        0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
+        0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5,
+        0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
+        0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9,
+        0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
+        0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd,
+        0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
+        0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
+        0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
+        0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2,
+        0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
+        0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e,
+        0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
+        0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a,
+        0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
+        0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676,
+        0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
+        0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
+        0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
+        0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4 };
 
 
 

diff --git a/src/Utils.h b/src/Utils.h
index 7946844..6dfa1ec 100644 (file)
--- a/src/Utils.h
+++ b/src/Utils.h
@@ -1,6 +1,11 @@
 #ifndef TSREMUXCPP_UTILS_H_
 #define TSREMUXCPP_UTILS_H_
 
+#include <string>
+#include <list>
+// #include "BlueMux.h"
+#include "tsremuxcpp_define.h"
+
 namespace TsRemux {
 enum TsFileType {
     UNKNOWN = 0,
@@ -87,71 +92,453 @@ enum SamplingFrequency {
     kHz48_96 = 14
 };
 
-class BluRayOutPut {
+struct EpElement {
+ public:
+  signed long long pts_;
+  unsigned long spn_;
+  EpElement(signed long long pts, unsigned long spn);
+};
+
+class StreamInfo {
+ public:
+  StreamInfo(byte* data, int index);
+  VideoFormat GetVideoFormati(void);
+  void SetVideoFormat(VideoFormat videoformat);
+  AspectRatio GetAspectRatio(void);
+  void SetAspectRatio(AspectRatio aspectratio);
+  FrameRate GetFrameRate(void);
+  void SetFrameRate(FrameRate frameRate);
+  AudioPresentationType GetAudioPresentationType(void);
+  void SetAudioPresentationType(AudioPresentationType audioPresentationTyp);
+  SamplingFrequency GetsamplingFrequency(void);
+  void SetSamplingFrequency(SamplingFrequency samplingFrequency);
+  StreamInfo(ElementaryStreamTypes streamType, ushort elementaryPid);
+  byte* Data;
+  ElementaryStreamTypes StreamType;
+  ushort ElementaryPID;
+  byte* ElementaryDescriptors;
+ private:
+  byte* mData;
+  VideoFormat mVideoFormat;
+  AspectRatio mAspectRatio;
+  FrameRate mFrameRate;
+  AudioPresentationType mAudioPresentationType;
+  SamplingFrequency mSamplingFrequency;
+};
+
+class BluRayOutput {
+ public:
+  BluRayOutput(std::string path, TimeSpan chapterLen);
+  void Author(EpElement* EpInfo, StreamInfo* sis, UInt32 numOfSourcePackets);
+  byte* BuildPlayList(byte* PlayItems);
+  byte* BuildFirstPlayItem(byte stc_id, UInt32 start,
+        UInt32 end, byte* StnTable);
+  byte* BuildFirstPlayMarks(UInt32 start, UInt32 end, UInt32 interval);
+  byte* Build_clpi(byte* ClipInfo, byte* SequenceInfo,
+        byte* ProgramInfo, byte* CPI);
+  byte* BuildClipInfo(UInt32 numOfSourcePackets, EpElement* EpInfo);
+  byte* BuildSequenceInfo(UInt32 start, UInt32 end);
+  byte* BuildProgramInfo(ushort pids, byte* StreamCodingInfos);
+  byte* BuildVideoStreamCodingInfo(ElementaryStreamTypes type,
+        VideoFormat format, FrameRate rate, AspectRatio ratio);
+  byte* BuildAudioStreamCodingInfo(ElementaryStreamTypes type,
+        AudioPresentationType format, SamplingFrequency rate);
+  byte* BuildPgStreamCodingInfo(void);
+  byte* BuildCpi(byte* EpMap);
+  byte* BuildEpMap(EpElement* EpInfo);
+ private:
+  byte* BuildStreamEntry(ushort pid);
+  byte* BuildVideoStreamAttributes(byte type, VideoFormat vf, FrameRate fr);
+  byte* BuildAudioStreamAttributes(byte type, AudioPresentationType vf,
+        SamplingFrequency fr);
+  byte* BuildStnTable(byte* VideoEntry, byte* VideoAttributes,
+        byte* AudioEntries, byte* AudioAttributes,
+        byte* PgEntries, byte* PgAttributes);
+  byte* UintToByteArraryNetwork(UInt32 value);
+  byte* Build_mlps(byte* PlayList, byte* PlayListMark);
 };
 
 class Descriptor {
+ public:
+  Descriptor(byte* data, int startIndex);
 };
 
 class DTCP_Descriptor : Descriptor {
+ public:
+  DTCP_Descriptor(byte* data, int startIndex);
 };
 
 class Constants {
+    static const int TS_PAYLOAD_SIZE;
+    static const int TS_SIZE;
+    static const int STRIDE_SIZE;
+    static const int DISK_BUFFER;  
+    static const byte SYNC_BYTE;
+    static const byte PAT_PID;
+    static const byte SIT_PID;
+    static const byte PAT_TABLE_ID;
+    static const byte PMT_TABLE_ID;
+    static const byte DTCP_DESCRIPTOR_TAG;
+    static const byte PACK_ID;
+    static const byte SYS_ID;
+    static const byte MAP_ID;
+    static const byte DIR_ID;
+    static const byte PAD_ID;
+
+    // defaults
+    static const ushort DEFAULT_PMT_PID;
+    static const ushort DEFAULT_VIDEO_PID;
+    static const ushort MAX_VIDEO_PID;
+    static const ushort DEFAULT_AUDIO_PID;
+    static const ushort MAX_AUDIO_PID;
+    static const ushort DEFAULT_PCR_PID;
+    static const ushort DEFAULT_SUBTITLE_PID;
+    static const ushort DEFAULT_PRESENTATION_GRAPHICS_PID;
+    static const ushort DEFAULT_INTERACTIVE_GRAPHICS_PID;
+    static const ushort DEFAULT_PROGRAM_NUMBER;
+    static const int MAX_BUFFER_COUNT;
+    static const int MIN_BUFFER_COUNT;
+    static const Int64 AUDIO_DELAY;
+    static const UInt32 MKVCLUSTER_START;
+    static const UInt32 MKVFILE_START;
+    static const UInt32 MKVSEGMENT_START;
+    static const UInt32 MKVTRACKINFO_START;
+    static const byte MKVTIMECODE_START;
+
+    // stream types
+    static const byte PES_VIDEO;
+    static const byte PES_AUDIO_MPEG;
+    static const byte PES_PRIVATE1;
+    static const byte PES_PADDING;
+    static const byte PES_PRIVATE2;
+    static const byte PES_VIDEO_VC1;
+    static const byte PES_PRIVATE_AC3;
+    static const byte PES_PRIVATE_AC3_PLUS;
+    static const byte PES_PRIVATE_DTS_HD;
+    static const byte PES_PRIVATE_LPCM;
+    static const byte PES_PRIVATE_AC3_TRUE_HD;
+    static const UInt32 VC1_SEQ_SC;
+    static const UInt32 VC1_END_OF_STREAM;
+    static const ushort AC3_SYNC;
+    static const UInt32 H264_PREFIX;
+    static const UInt32 H264_END_OF_STREAM;
+    static const UInt32 DTS_SYNC;
+    static const UInt32 DTS_EXT_SYNC;
+    static const UInt32 MLP_SYNC;
+    static const UInt32 MPEG2_SEQ_CODE;
+    static const UInt32 MPEG2_SEQ_EXT;
+    static const UInt32 MPEG2_SEQ_END;
+
+    // clocks
+    static const Int64 MPEG2TS_CLOCK_RATE;
+    static const Int64 MAX_MPEG2TS_CLOCK;
+    static const Int64 MAX_BLURAY_CLOCK;
+    static const Int64 MAX_FIREWIRE_CLOCK;
+    static const Int64 MAX_PTS_CLOCK;
+    static const Int64 PTS_CLOCK_RATE;
+    static const int MAX_OFFSET;
+    static const int MAX_COUNT;
+
+   // descriptors
+   static readonly byte hdmv_registration_descriptor[];
+   static readonly byte copy_control_descriptor[];
+   static readonly byte vc1_descriptor[];
+   static readonly byte ac3_registration_descriptor[];
+
+   static readonly byte DefaultSitTableOne[];
+   static readonly uint crc_table[];
+   static uint ComputeCrc(byte* data);
+   static uint ComputeCrc(byte* data, int length);
+   static uint ComputeCrc(byte* data, int length, int startIndex);
 };
 
 class ProgramInfo {
+ public:
+  ProgramInfo(byte* data, int index);
+  ProgramInfo(ushort programNumber, ushort programPid);
+  ushort ProgramNumber;
+  ushort ProgramPID;
+  byte* Data;
+ private:
+  byte* mData;
 };
 
 class TsPacket {
+ public:
+  TsPacket(void);
+  bool Priority;
+  ushort PID;
+  bool HasPesHeader;
+ protected:
+  byte* mData;
 };
 
 class PcrPacket : TsPacket {
+ public:
+  PcrPacket(Int64 pcr, byte counter, ushort pid);
 };
 
 class TsTable : TsPacket {
+ public:
+  TsTable();
+  TsTable(byte* data);
+  void AddData(byte* data, int offset, int len);
+  bool Complete;
+  byte TableId;
+ protected:
+  ushort NumberId;
+  ushort Length;
+  void RefreshCrc(void);
 };
 
 class PatPacket : TsTable {
+ public:
+  PatPacket(void);
+  PatPacket(byte* data);
+  ushort TransportStreamId;
+  ProgramInfo* Programs;
+ private:
+  ushort ProgramInfoLength;
 };
 
 class SitPacket : TsTable {
+ public:
+  SitPacket(void);
+  SitPacket(byte* data);
 };
 
-class PmPachet : TsTable {
-};
-
-class PesPacket {
+class PmPacket : TsTable {
+ public:
+  PmPacket(void);
+  PmPacket(byte* data);
+  DTCP_Descriptor DtcpInfo;
+  byte* ProgramDescriptorsData;
+  StreamInfo* ElementaryStreams;
+  ushort ProgramNumber;
+  ushort PcrPID;
+ private:
+  ushort ProgramDescriptorsLength;
+  ushort StreamInfoLength;
 };
 
 class PesHeader {
+ public:
+  PesHeader(byte* data);
+  byte StreamId;
+  byte GetByte(int i);
+  void SetByte(byte dat);
+  byte HeaderLength;
+  int TotalHeaderLength;
+  ushort PacketLength;
+  bool HasPts;
+  bool HasDts;
+  Int64 Pts;
+  Int64 Dts;
+  byte Extention2;
+  byte* Data;
+ private:
+  byte* mData;
 };
 
-class StreamInfo {
+class PesPacket {
+ public:
+  PesPacket(byte* buff, int offset, int length, ushort pid);
+  bool Priority;
+  byte* GetData(void);
+  byte* GetPayload(void);
+  byte GetByte(int i);
+  void SetByte(byte dat);
+  ushort PID;
+  bool Complete;
+  PesHeader GetHeader(void);
+  void AddData(std::list<byte> moredata);
+  void AddData(byte* buff, int offset, int length);
+  byte BaseId;
+  byte ExtendedId;
+  UInt32 ExtendedType;
+ private:
+  std::list<byte> data;
+  ushort pid;
+  bool priority;
 };
 
 class VC1SequenceInfo {
+ public:
+  VC1SequenceInfo(byte* data, int offset);
+  bool Valid;
+  VideoFormat GetVideoFormati(void);
+  void SetVideoFormat(VideoFormat videoformat);
+  AspectRatio GetAspectRatio(void);
+  void SetAspectRatio(AspectRatio aspectratio);
+  FrameRate GetFrameRate(void);
+  void SetFrameRate(FrameRate frameRate);
+ private:
+  byte* mData;
+  int Height;
+  int Width;
+  bool Interlaced;
+  bool DisplayExt;
+  bool AspectFlag;
+  byte Vc1AspectRatio;
+  bool FrameFlag;
+  bool FrameRateIndicatorFlag;
+  AspectRatio mAspectRatio;
+  VideoFormat mVideoFormat;
+  FrameRate   mFrameRate;
 };
 
 class H264Info {
+ public:
+  H264Info(byte* data, int offset);
+  byte* ElementaryDescriptors;
+  VideoFormat GetVideoFormati(void);
+  void SetVideoFormat(VideoFormat videoformat);
+  AspectRatio GetAspectRatio(void);
+  void SetAspectRatio(AspectRatio aspectratio);
+  FrameRate GetFrameRate(void);
+  void SetFrameRate(FrameRate frameRate);
+  AudioPresentationType GetAudioPresentationType(void);
+  void SetAudioPresentationType(AudioPresentationType audioPresentationTyp);
+  SamplingFrequency GetsamplingFrequency(void);
+  void SetSamplingFrequency(SamplingFrequency samplingFrequency);
+ private:
+  UInt32 GetNextExpGolomb();
+  void ScalingListSkip(int skip);
+  UInt32 Width;
+  UInt32 Heigth;
+  byte* HdmvVideoRegistrationDescriptor;
+  VideoFormat mVideoFormat;
+  AspectRatio mAspectRatio;
+  FrameRate   mFrameRate;
+  AudioPresentationType mAudioPresentationType;
+  SamplingFrequency mSamplingFrequency;
 };
 
 enum Ac3SyntaxType {
+        Invalid = 0,
+        Standard = 8,
+        Alternative = 6,
+        Enhanced = 16
 };
 
 class ElementaryParse {
+ public:
+  ElementaryParse(void);
+  virtual VideoFormat GetVideoFormati(void);
+  virtual void SetVideoFormat(VideoFormat videoformat);
+  virtual AspectRatio GetAspectRatio(void);
+  virtual void SetAspectRatio(AspectRatio aspectratio);
+  virtual FrameRate GetFrameRate(void);
+  virtual void SetFrameRate(FrameRate frameRate);
+  virtual AudioPresentationType GetAudioPresentationType(void);
+  virtual void SetAudioPresentationType(
+      AudioPresentationType audioPresentationTyp);
+  virtual SamplingFrequency GetsamplingFrequency(void);
+  virtual void SetSamplingFrequency(SamplingFrequency samplingFrequency);
+  virtual byte* GetElementaryDescriptors(void);
+ protected:
+  byte GetNextBit(void);
+  byte* mData;
+  int indicator;
+  bool mValid;
+  VideoFormat mVideoFormat;
+  FrameRate mFrameRate;
+  AspectRatio mAspectRatio;
+  SamplingFrequency mSamplingFrequency;
+  AudioPresentationType mAudioPresentationType;
+  byte* ElementaryDescriptors;
 };
 
-class AC3Info {
+class AC3Info : ElementaryParse {
+ public:
+  int MaxFrameLength;
+  int FrameLength;
+  bool IndependentStream;
+  Ac3SyntaxType SyntaxType;
+  AC3Info(byte* data, int offset);
+  VideoFormat GetVideoFormati(void);
+  void SetVideoFormat(VideoFormat videoformat);
+  AspectRatio GetAspectRatio(void);
+  void SetAspectRatio(AspectRatio aspectratio);
+  FrameRate GetFrameRate(void);
+  void SetFrameRate(FrameRate frameRate);
+  AudioPresentationType GetAudioPresentationType(void);
+  void SetAudioPresentationType(AudioPresentationType audioPresentationTyp);
+  SamplingFrequency GetsamplingFrequency(void);
+  void SetSamplingFrequency(SamplingFrequency samplingFrequency);
+  byte* GetElementaryDescriptors(void);
+ private:
+  static readonly int* len48k;
+  static readonly int* len44k;
+  static readonly int* len32k;
+  byte Bsid;
+  byte Bsmod;
+  byte Acmod;
 };
 
-class DtsInfo {
+class DtsInfo : ElementaryParse {
+ public:
+  DtsInfo(byte* data, int offset);
+  VideoFormat GetVideoFormati(void);
+  void SetVideoFormat(VideoFormat videoformat);
+  AspectRatio GetAspectRatio(void);
+  void SetAspectRatio(AspectRatio aspectratio);
+  FrameRate GetFrameRate(void);
+  void SetFrameRate(FrameRate frameRate);
+  AudioPresentationType GetAudioPresentationType(void);
+  void SetAudioPresentationType( AudioPresentationType audioPresentationTyp);
+  SamplingFrequency GetsamplingFrequency(void);
+  void SetSamplingFrequency(SamplingFrequency samplingFrequency);
+  byte* GetElementaryDescriptors(void);
+  ushort FrameSize;
+  byte ExtAudioId;
+ private:
+  byte Amode;
+  byte SampleFreq;
+  bool ExtAudio;
 };
 
-class MlpInfo {
+class MlpInfo : ElementaryParse {
+ public:
+  MlpInfo(byte* data, int offset);
+  VideoFormat GetVideoFormati(void);
+  void SetVideoFormat(VideoFormat videoformat);
+  AspectRatio GetAspectRatio(void);
+  void SetAspectRatio(AspectRatio aspectratio);
+  FrameRate GetFrameRate(void);
+  void SetFrameRate(FrameRate frameRate);
+  AudioPresentationType GetAudioPresentationType(void);
+  void SetAudioPresentationType(AudioPresentationType audioPresentationTyp);
+  SamplingFrequency GetsamplingFrequency(void);
+  void SetSamplingFrequency(SamplingFrequency samplingFrequency);
+  byte* GetElementaryDescriptors(void);
+ private:
+  byte* AC3AudioDescriptor;
+  byte SampleRateCode;
 };
 
-class Mpeg2Info {
+class Mpeg2Info : ElementaryParse {
+ public:
+  Mpeg2Info(byte* data, int offset);
+  VideoFormat GetVideoFormati(void);
+  void SetVideoFormat(VideoFormat videoformat);
+  AspectRatio GetAspectRatio(void);
+  void SetAspectRatio(AspectRatio aspectratio);
+  FrameRate GetFrameRate(void);
+  void SetFrameRate(FrameRate frameRate);
+  AudioPresentationType GetAudioPresentationType(void);
+  void SetAudioPresentationType(AudioPresentationType audioPresentationTyp);
+  SamplingFrequency GetsamplingFrequency(void);
+  void SetSamplingFrequency(SamplingFrequency samplingFrequency);
+  byte* GetElementaryDescriptors(void);
+ private:
+  byte* Mpeg2VideoRegistrationDescriptor;
+  ushort Horizontal;
+  ushort Vertical;
+  byte Aspect;
+  byte FrameRateCode;
+  bool Progressive;
 };
-}
-#endif
 
+} //namespace
+#endif TSREMUXCPP_UTILS_H_

diff --git a/src/tsremuxcpp_define.h b/src/tsremuxcpp_define.h
new file mode 100644 (file)
index 0000000..1922ce5
--- /dev/null
+++ b/src/tsremuxcpp_define.h
@@ -0,0 +1,18 @@
+#ifndef TSREMUXCPP_DEFINE_H_
+#define TSREMUXCPP_DEFINE_H_
+
+#include <time.h>
+
+#define readonly const
+
+namespace TsRemux {
+    typedef char byte;
+    typedef unsigned short ushort;
+    typedef unsigned int uint;
+    typedef unsigned int UInt32;
+    typedef signed int Int32;
+    typedef unsigned long long UInt64;
+    typedef signed long long Int64;
+    typedef time_t TimeSpan;
+} // namespace
+#endif TSREMUXCPP_DEFINE_H_