diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-06-11 18:01:01 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-06-11 18:01:01 +0400 |
| commit | 9d042ba4e8c0ee43a173134aa755317b5f3e3629 (patch) | |
| tree | 90deb44b77175b37cdb43d3c8b13fdf9b85005a5 /src/filters/parser/MpegSplitter/MpegSplitterFile.h | |
| parent | f095f67e37e1f8af40e2e5d796f746bff2ef63b0 (diff) | |
legacy branch: merge r3126-r3207 from trunk
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@3208 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/parser/MpegSplitter/MpegSplitterFile.h')
| -rw-r--r-- | src/filters/parser/MpegSplitter/MpegSplitterFile.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/filters/parser/MpegSplitter/MpegSplitterFile.h b/src/filters/parser/MpegSplitter/MpegSplitterFile.h index 6c9650f54..7c5e23471 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitterFile.h +++ b/src/filters/parser/MpegSplitter/MpegSplitterFile.h @@ -24,9 +24,14 @@ #include <atlbase.h>
#include <atlcoll.h>
#include "../BaseSplitter/BaseSplitter.h"
+#include "../../../DSUtil/GolombBuffer.h"
#define NO_SUBTITLE_PID 1 // Fake PID use for the "No subtitle" entry
+#define NO_SUBTITLE_NAME _T("No subtitle")
+#define ISVALIDPID(pid) (pid >= 0x10 && pid < 0x1fff)
+
+//#define MVC_SUPPORT
class CMpegSplitterFile : public CBaseSplitterFileEx
{
@@ -34,7 +39,6 @@ class CMpegSplitterFile : public CBaseSplitterFileEx CAtlMap<WORD, CMpegSplitterFile::avchdr> avch;
bool m_bIsHdmv;
-
HRESULT Init(IAsyncReader* pAsyncReader);
void OnComplete(IAsyncReader* pAsyncReader);
@@ -72,7 +76,11 @@ public: }
};
- enum {video, audio, subpic, stereo, unknown};
+ enum {video, audio, subpic,
+#if defined(MVC_SUPPORT)
+ stereo,
+#endif
+ unknown};
class CStreamList : public CAtlList<stream>
{
@@ -95,7 +103,9 @@ public: type == video ? L"Video" :
type == audio ? L"Audio" :
type == subpic ? L"Subtitle" :
+#if defined(MVC_SUPPORT)
type == stereo ? L"Stereo" :
+#endif
L"Unknown";
}
@@ -131,11 +141,15 @@ public: struct program() {
memset(this, 0, sizeof(*this));
}
+
+ BYTE ts_buffer[1024];
+ WORD ts_len_cur, ts_len_packet;
};
CAtlMap<WORD, program> m_programs;
void UpdatePrograms(const trhdr& h);
+ void UpdatePrograms(CGolombBuffer gb, WORD pid);
const program* FindProgram(WORD pid, int &iStream, const CHdmvClipInfo::Stream * &_pClipInfo);
CAtlMap<DWORD, CString> m_pPMT_Lang;
|