From 53a1e82bd25f926679a165a6c632ccc799fddb3c Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Thu, 8 May 2008 21:47:31 +0000 Subject: matroskadec: add support for track content encoding Only the header strip method is supported for now. Originally committed as revision 13082 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroska.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'libavformat/matroska.h') diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 370a8bfd89..025eefb3e2 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -89,6 +89,8 @@ #define MATROSKA_ID_TRACKMINCACHE 0x6DE7 #define MATROSKA_ID_TRACKMAXCACHE 0x6DF8 #define MATROSKA_ID_TRACKDEFAULTDURATION 0x23E383 +#define MATROSKA_ID_TRACKCONTENTENCODINGS 0x6D80 +#define MATROSKA_ID_TRACKCONTENTENCODING 0x6240 /* IDs in the trackvideo master */ #define MATROSKA_ID_VIDEOFRAMERATE 0x2383E3 @@ -108,6 +110,13 @@ #define MATROSKA_ID_AUDIOBITDEPTH 0x6264 #define MATROSKA_ID_AUDIOCHANNELS 0x9F +/* IDs in the content encoding master */ +#define MATROSKA_ID_ENCODINGSCOPE 0x5032 +#define MATROSKA_ID_ENCODINGTYPE 0x5033 +#define MATROSKA_ID_ENCODINGCOMPRESSION 0x5034 +#define MATROSKA_ID_ENCODINGCOMPALGO 0x4254 +#define MATROSKA_ID_ENCODINGCOMPSETTINGS 0x4255 + /* ID in the cues master */ #define MATROSKA_ID_POINTENTRY 0xBB @@ -168,6 +177,13 @@ typedef enum { MATROSKA_ASPECT_RATIO_MODE_FIXED = 0x2, } MatroskaAspectRatioMode; +typedef enum { + MATROSKA_TRACK_ENCODING_COMP_ZLIB = 0, + MATROSKA_TRACK_ENCODING_COMP_BZLIB = 1, + MATROSKA_TRACK_ENCODING_COMP_LZO = 2, + MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP = 3, +} MatroskaTrackEncodingCompAlgo; + /* * These aren't in any way "matroska-form" things, * it's just something I use in the muxer/demuxer. -- cgit v1.2.3