/*
* Matroska constants
- * Copyright (c) 2003-2004 The ffmpeg Project
+ * Copyright (c) 2003-2004 The FFmpeg project
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define AVFORMAT_MATROSKA_H
#include "libavcodec/avcodec.h"
+#include "metadata.h"
+#include "internal.h"
/* EBML version supported */
#define EBML_VERSION 1
#define MATROSKA_ID_CODECINFOURL 0x3B4040
#define MATROSKA_ID_CODECDOWNLOADURL 0x26B240
#define MATROSKA_ID_CODECDECODEALL 0xAA
+#define MATROSKA_ID_CODECDELAY 0x56AA
#define MATROSKA_ID_TRACKNAME 0x536E
#define MATROSKA_ID_TRACKLANGUAGE 0x22B59C
#define MATROSKA_ID_TRACKFLAGENABLED 0xB9
#define MATROSKA_ID_VIDEOPIXELCROPR 0x54DD
#define MATROSKA_ID_VIDEODISPLAYUNIT 0x54B2
#define MATROSKA_ID_VIDEOFLAGINTERLACED 0x9A
-#define MATROSKA_ID_VIDEOSTEREOMODE 0x53B9
+#define MATROSKA_ID_VIDEOFIELDORDER 0x9D
+#define MATROSKA_ID_VIDEOSTEREOMODE 0x53B8
#define MATROSKA_ID_VIDEOASPECTRATIO 0x54B3
#define MATROSKA_ID_VIDEOCOLORSPACE 0x2EB524
+#define MATROSKA_ID_VIDEOPROJECTION 0x7670
+#define MATROSKA_ID_VIDEOPROJECTIONTYPE 0x7671
+#define MATROSKA_ID_VIDEOPROJECTIONPRIVATE 0x7672
+#define MATROSKA_ID_VIDEOPROJECTIONPOSEYAW 0x7673
+#define MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH 0x7674
+#define MATROSKA_ID_VIDEOPROJECTIONPOSEROLL 0x7675
+
/* IDs in the trackaudio master */
#define MATROSKA_ID_AUDIOSAMPLINGFREQ 0xB5
#define MATROSKA_ID_AUDIOOUTSAMPLINGFREQ 0x78B5
#define MATROSKA_ID_TAGNAME 0x45A3
#define MATROSKA_ID_TAGSTRING 0x4487
#define MATROSKA_ID_TAGLANG 0x447A
-#define MATROSKA_ID_TAGDEFAULT 0x44B4
+#define MATROSKA_ID_TAGDEFAULT 0x4484
+#define MATROSKA_ID_TAGDEFAULT_BUG 0x44B4
#define MATROSKA_ID_TAGTARGETS 0x63C0
+#define MATROSKA_ID_TAGTARGETS_TYPE 0x63CA
+#define MATROSKA_ID_TAGTARGETS_TYPEVALUE 0x68CA
+#define MATROSKA_ID_TAGTARGETS_TRACKUID 0x63C5
+#define MATROSKA_ID_TAGTARGETS_CHAPTERUID 0x63C4
+#define MATROSKA_ID_TAGTARGETS_ATTACHUID 0x63C6
/* IDs in the seekhead master */
#define MATROSKA_ID_SEEKENTRY 0x4DBB
#define MATROSKA_ID_BLOCK 0xA1
#define MATROSKA_ID_BLOCKDURATION 0x9B
#define MATROSKA_ID_BLOCKREFERENCE 0xFB
+#define MATROSKA_ID_CODECSTATE 0xA4
/* IDs in the attachments master */
#define MATROSKA_ID_ATTACHEDFILE 0x61A7
MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP = 3,
} MatroskaTrackEncodingCompAlgo;
+typedef enum {
+ MATROSKA_VIDEO_INTERLACE_FLAG_UNDETERMINED = 0,
+ MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED = 1,
+ MATROSKA_VIDEO_INTERLACE_FLAG_PROGRESSIVE = 2
+} MatroskaVideoInterlaceFlag;
+
+typedef enum {
+ MATROSKA_VIDEO_FIELDORDER_PROGRESSIVE = 0,
+ MATROSKA_VIDEO_FIELDORDER_UNDETERMINED = 2,
+ MATROSKA_VIDEO_FIELDORDER_TT = 1,
+ MATROSKA_VIDEO_FIELDORDER_BB = 6,
+ MATROSKA_VIDEO_FIELDORDER_TB = 9,
+ MATROSKA_VIDEO_FIELDORDER_BT = 14,
+} MatroskaVideoFieldOrder;
+
+typedef enum {
+ MATROSKA_VIDEO_STEREOMODE_TYPE_MONO = 0,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_LEFT_RIGHT = 1,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_BOTTOM_TOP = 2,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_TOP_BOTTOM = 3,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_CHECKERBOARD_RL = 4,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_CHECKERBOARD_LR = 5,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_ROW_INTERLEAVED_RL = 6,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_ROW_INTERLEAVED_LR = 7,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_COL_INTERLEAVED_RL = 8,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_COL_INTERLEAVED_LR = 9,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_ANAGLYPH_CYAN_RED = 10,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_RIGHT_LEFT = 11,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_ANAGLYPH_GREEN_MAG = 12,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_BOTH_EYES_BLOCK_LR = 13,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_BOTH_EYES_BLOCK_RL = 14,
+ MATROSKA_VIDEO_STEREOMODE_TYPE_NB,
+} MatroskaVideoStereoModeType;
+
+typedef enum {
+ MATROSKA_VIDEO_PROJECTION_TYPE_RECTANGULAR = 0,
+ MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR = 1,
+ MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP = 2,
+ MATROSKA_VIDEO_PROJECTION_TYPE_MESH = 3,
+} MatroskaVideoProjectionType;
+
/*
* Matroska Codec IDs, strings
*/
typedef struct CodecTags{
char str[20];
- enum CodecID id;
+ enum AVCodecID id;
}CodecTags;
-typedef struct CodecMime{
- char str[32];
- enum CodecID id;
-}CodecMime;
-
/* max. depth in the EBML tree structure */
#define EBML_MAX_DEPTH 16
extern const CodecTags ff_mkv_codec_tags[];
extern const CodecMime ff_mkv_mime_tags[];
+extern const CodecMime ff_mkv_image_mime_tags[];
+extern const AVMetadataConv ff_mkv_metadata_conv[];
+
+int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode);
#endif /* AVFORMAT_MATROSKA_H */
projects / ffmpeg / blobdiff