Author: spyfeng
Date: Tue Aug 12 17:27:42 2008
New Revision: 3196
Log:
extract mxf data definition ul and codec ul tables from mxfenc.c/mxfdec.c mxf.c
Modified:
mxf/mxf.h
mxf/mxfdec.c
mxf/mxfenc.c
Modified: mxf/mxf.h
==============================================================================
--- mxf/mxf.h (original)
+++ mxf/mxf.h Tue Aug 12 17:27:42 2008
@@ -54,6 +54,37 @@ typedef struct {
enum CodecType type;
} MXFDataDefinitionUL;
+/**
+ * SMPTE RP224 http://www.smpte-ra.org/mdd/index.html
+ */
+static const MXFDataDefinitionUL mxf_data_definition_uls[] = {
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x00
}, CODEC_TYPE_VIDEO },
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x02,0x00,0x00,0x00
}, CODEC_TYPE_AUDIO },
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x05,0x01,0x03,0x02,0x02,0x02,0x02,0x00,0x00
}, CODEC_TYPE_AUDIO },
+ { {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
}, CODEC_TYPE_DATA },
+};
+
+static const MXFCodecUL mxf_codec_uls[] = {
+ /* PictureEssenceCoding */
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x01,0x11,0x00
}, 14, CODEC_ID_MPEG2VIDEO }, /* [EMAIL PROTECTED] Long GoP */
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01
}, 14, CODEC_ID_MPEG2VIDEO }, /* D-10 50Mbps PAL */
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x03,0x03,0x00
}, 14, CODEC_ID_MPEG2VIDEO }, /* [EMAIL PROTECTED] Long GoP */
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x02,0x00
}, 14, CODEC_ID_MPEG2VIDEO }, /* [EMAIL PROTECTED] I-Frame */
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x20,0x02,0x03
}, 14, CODEC_ID_MPEG4 }, /* XDCAM proxy_pal030926.mxf */
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00
}, 13, CODEC_ID_DVVIDEO }, /* DV25 IEC PAL */
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00
}, 14, CODEC_ID_JPEG2000 }, /* JPEG2000 Codestream */
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00
}, 13, CODEC_ID_RAWVIDEO }, /* Uncompressed */
+ /* SoundEssenceCompression */
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00
}, 13, CODEC_ID_PCM_S16LE }, /* Uncompressed */
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x7F,0x00,0x00,0x00
}, 13, CODEC_ID_PCM_S16LE },
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x02,0x02,0x01,0x7E,0x00,0x00,0x00
}, 13, CODEC_ID_PCM_S16BE }, /* From Omneon MXF file */
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x04,0x04,0x02,0x02,0x02,0x03,0x01,0x01,0x00
}, 15, CODEC_ID_PCM_ALAW }, /* XDCAM Proxy C0023S01.mxf */
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x01,0x00
}, 15, CODEC_ID_AC3 },
+ { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x05,0x00
}, 15, CODEC_ID_MP2 }, /* MP2 or MP3 */
+ //{ {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x1C,0x00
}, 15, CODEC_ID_DOLBY_E }, /* Dolby-E */
+ { {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
}, 0, CODEC_ID_NONE },
+};
+
#define PRINT_KEY(pc, s, x) dprintf(pc, "%s %02X %02X %02X %02X %02X %02X %02X
%02X %02X %02X %02X %02X %02X %02X %02X %02X\n", s, \
(x)[0], (x)[1], (x)[2], (x)[3], (x)[4], (x)[5],
(x)[6], (x)[7], (x)[8], (x)[9], (x)[10], (x)[11], (x)[12], (x)[13], (x)[14],
(x)[15])
Modified: mxf/mxfdec.c
==============================================================================
--- mxf/mxfdec.c (original)
+++ mxf/mxfdec.c Tue Aug 12 17:27:42 2008
@@ -583,35 +583,6 @@ static int mxf_read_generic_descriptor(M
return 0;
}
-/* SMPTE RP224 http://www.smpte-ra.org/mdd/index.html */
-static const MXFDataDefinitionUL mxf_data_definition_uls[] = {
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x00
}, CODEC_TYPE_VIDEO },
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x02,0x00,0x00,0x00
}, CODEC_TYPE_AUDIO },
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x05,0x01,0x03,0x02,0x02,0x02,0x02,0x00,0x00
}, CODEC_TYPE_AUDIO },
- { {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
}, CODEC_TYPE_DATA },
-};
-
-static const MXFCodecUL mxf_codec_uls[] = {
- /* PictureEssenceCoding */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x01,0x11,0x00
}, 14, CODEC_ID_MPEG2VIDEO }, /* [EMAIL PROTECTED] Long GoP */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01
}, 14, CODEC_ID_MPEG2VIDEO }, /* D-10 50Mbps PAL */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x03,0x03,0x00
}, 14, CODEC_ID_MPEG2VIDEO }, /* [EMAIL PROTECTED] Long GoP */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x02,0x00
}, 14, CODEC_ID_MPEG2VIDEO }, /* [EMAIL PROTECTED] I-Frame */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x20,0x02,0x03
}, 14, CODEC_ID_MPEG4 }, /* XDCAM proxy_pal030926.mxf */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00
}, 13, CODEC_ID_DVVIDEO }, /* DV25 IEC PAL */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00
}, 14, CODEC_ID_JPEG2000 }, /* JPEG2000 Codestream */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00
}, 13, CODEC_ID_RAWVIDEO }, /* Uncompressed */
- /* SoundEssenceCompression */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00
}, 13, CODEC_ID_PCM_S16LE }, /* Uncompressed */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x7F,0x00,0x00,0x00
}, 13, CODEC_ID_PCM_S16LE },
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x02,0x02,0x01,0x7E,0x00,0x00,0x00
}, 13, CODEC_ID_PCM_S16BE }, /* From Omneon MXF file */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x04,0x04,0x02,0x02,0x02,0x03,0x01,0x01,0x00
}, 15, CODEC_ID_PCM_ALAW }, /* XDCAM Proxy C0023S01.mxf */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x01,0x00
}, 15, CODEC_ID_AC3 },
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x05,0x00
}, 15, CODEC_ID_MP2 }, /* MP2 or MP3 */
- //{ {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x1C,0x00
}, 15, CODEC_ID_DOLBY_E }, /* Dolby-E */
- { {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
}, 0, CODEC_ID_NONE },
-};
-
static const MXFCodecUL mxf_picture_essence_container_uls[] = {
{ {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x60,0x01
}, 14, CODEC_ID_MPEG2VIDEO }, /* MPEG-ES Frame wrapped */
{ {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x41,0x01
}, 14, CODEC_ID_DVVIDEO }, /* DV 625 25mbps */
Modified: mxf/mxfenc.c
==============================================================================
--- mxf/mxfenc.c (original)
+++ mxf/mxfenc.c Tue Aug 12 17:27:42 2008
@@ -98,37 +98,6 @@ static const MXFEssenceElementKey mxf_es
{ {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
}, CODEC_ID_NONE},
};
-/**
- * SMPTE RP224 http://www.smpte-ra.org/mdd/index.html
- */
-static const MXFDataDefinitionUL mxf_data_definition_uls[] = {
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x00
}, CODEC_TYPE_VIDEO },
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x02,0x00,0x00,0x00
}, CODEC_TYPE_AUDIO },
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x05,0x01,0x03,0x02,0x02,0x02,0x02,0x00,0x00
}, CODEC_TYPE_AUDIO },
- { {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
}, CODEC_TYPE_DATA },
-};
-
-static const MXFCodecUL mxf_codec_uls[] = {
- /* PictureEssenceCoding */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x01,0x11,0x00
}, 14, CODEC_ID_MPEG2VIDEO }, /* [EMAIL PROTECTED] Long GoP */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x01,0x02,0x01,0x01
}, 14, CODEC_ID_MPEG2VIDEO }, /* D-10 50Mbps PAL */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x03,0x03,0x00
}, 14, CODEC_ID_MPEG2VIDEO }, /* [EMAIL PROTECTED] Long GoP */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x04,0x02,0x00
}, 14, CODEC_ID_MPEG2VIDEO }, /* [EMAIL PROTECTED] I-Frame */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x04,0x01,0x02,0x02,0x01,0x20,0x02,0x03
}, 14, CODEC_ID_MPEG4 }, /* XDCAM proxy_pal030926.mxf */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00
}, 13, CODEC_ID_DVVIDEO }, /* DV25 IEC PAL */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00
}, 14, CODEC_ID_JPEG2000 }, /* JPEG2000 Codestream */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00
}, 13, CODEC_ID_RAWVIDEO }, /* Uncompressed */
- /* SoundEssenceCompression */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00
}, 13, CODEC_ID_PCM_S16LE }, /* Uncompressed */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x7F,0x00,0x00,0x00
}, 13, CODEC_ID_PCM_S16LE },
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x02,0x02,0x01,0x7E,0x00,0x00,0x00
}, 13, CODEC_ID_PCM_S16BE }, /* From Omneon MXF file */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x04,0x04,0x02,0x02,0x02,0x03,0x01,0x01,0x00
}, 15, CODEC_ID_PCM_ALAW }, /* XDCAM Proxy C0023S01.mxf */
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x01,0x00
}, 15, CODEC_ID_AC3 },
- { {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x05,0x00
}, 15, CODEC_ID_MP2 }, /* MP2 or MP3 */
- //{ {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x1C,0x00
}, 15, CODEC_ID_DOLBY_E }, /* Dolby-E */
- { {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
}, 0, CODEC_ID_NONE },
-};
-
static const uint8_t multiple_desc_ul[] = {
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x0D,0x01,0x03,0x01,0x02,0x7F,0x01,0x00
};
static const MXFCodecUL mxf_essence_container_uls[] = {
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
