diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2005-10-14 12:43:30 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2005-10-14 12:43:30 +0000 |
| commit | 22b9a5cd4310a0c4b4ab1508c0ac8fb6a951f061 (patch) | |
| tree | 7425a287d6c908eb1acda5b99793ac69343d7a32 /gst/matroska/matroska-ids.h | |
| parent | fb495736bc531080df1a7874d7ef3b94679d25a9 (diff) | |
Port matroska muxer to 0.9 (#318847).
Original commit message from CVS:
Reviewed by: Tim-Philipp Müller <tim at centricular dot net>
* configure.ac:
* gst/matroska/Makefile.am:
* gst/matroska/ebml-ids.h:
* gst/matroska/ebml-write.c:
* gst/matroska/ebml-write.h:
* gst/matroska/matroska-ids.h:
* gst/matroska/matroska-mux.c:
* gst/matroska/matroska-mux.h:
* gst/matroska/matroska.c: (plugin_init):
Port matroska muxer to 0.9 (#318847).
Diffstat (limited to 'gst/matroska/matroska-ids.h')
| -rw-r--r-- | gst/matroska/matroska-ids.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gst/matroska/matroska-ids.h b/gst/matroska/matroska-ids.h index ec87fa56..a0895a95 100644 --- a/gst/matroska/matroska-ids.h +++ b/gst/matroska/matroska-ids.h @@ -132,6 +132,7 @@ #define GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_SP "V_MPEG4/ISO/SP" #define GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_ASP "V_MPEG4/ISO/ASP" #define GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_AP "V_MPEG4/ISO/AP" +#define GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_AVC "V_MPEG4/ISO/AVC" #define GST_MATROSKA_CODEC_ID_VIDEO_MSMPEG4V3 "V_MPEG4/MS/V3" #define GST_MATROSKA_CODEC_ID_VIDEO_MPEG1 "V_MPEG1" #define GST_MATROSKA_CODEC_ID_VIDEO_MPEG2 "V_MPEG2" @@ -151,6 +152,7 @@ #define GST_MATROSKA_CODEC_ID_AUDIO_MPEG2 "A_AAC/MPEG2/" #define GST_MATROSKA_CODEC_ID_AUDIO_MPEG4 "A_AAC/MPEG4/" #define GST_MATROSKA_CODEC_ID_AUDIO_TTA "A_TTA1" +#define GST_MATROSKA_CODEC_ID_AUDIO_WAVPACK4 "A_WAVPACK4" /* TODO: AC3-9/10 (?), Real, Musepack, Quicktime */ #define GST_MATROSKA_CODEC_ID_SUBTITLE_UTF8 "S_TEXT/UTF8" @@ -267,4 +269,17 @@ typedef struct _GstMatroskaIndex { guint64 time; /* in nanoseconds */ } GstMatroskaIndex; +typedef struct _Wavpack4Header { + guchar ck_id [4]; /* "wvpk" */ + guint32 ck_size; /* size of entire frame (minus 8, of course) */ + guint16 version; /* 0x403 for now */ + guint8 track_no; /* track number (0 if not used, like now) */ + guint8 index_no; /* remember these? (0 if not used, like now) */ + guint32 total_samples; /* for entire file (-1 if unknown) */ + guint32 block_index; /* index of first sample in block (to file begin) */ + guint32 block_samples; /* # samples in this block */ + guint32 flags; /* various flags for id and decoding */ + guint32 crc; /* crc for actual decoded data */ +} Wavpack4Header; + #endif /* __GST_MATROSKA_IDS_H__ */ |