har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use a data definition uls table to fetch codec type

Browse Source 
Originally committed as revision 6380 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2006-09-29 12:23:38 +00:00
parent 996c9ad0a4
commit dd202ff65d
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavformat/mxf.c
View File

@ -158,6 +158,11 @@ typedef struct MXFCodecUL {
enum MXFWrappingScheme wrapping; enum MXFWrappingScheme wrapping;
} MXFCodecUL; } MXFCodecUL;
typedef struct MXFDataDefinitionUL {
UID uid;
enum CodecType type;
} MXFDataDefinitionUL;
typedef struct MXFMetadataReadTableEntry { typedef struct MXFMetadataReadTableEntry {
const UID key; const UID key;
int (*read)(MXFContext *mxf, KLVPacket *klv); int (*read)(MXFContext *mxf, KLVPacket *klv);
@ -615,8 +620,11 @@ static int mxf_read_metadata_generic_descriptor(MXFContext *mxf, KLVPacket *klv)
} }
/* SMPTE RP224 http://www.smpte-ra.org/mdd/index.html */ /* SMPTE RP224 http://www.smpte-ra.org/mdd/index.html */
static const UID picture_essence_track_ul = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x00 }; static const MXFDataDefinitionUL mxf_data_definition_uls[] = {
static const UID sound_essence_track_ul = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x02,0x00,0x00,0x00 }; { { 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 },
{ { 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[] = { static const MXFCodecUL mxf_codec_uls[] = {
/* PictureEssenceCoding */ /* PictureEssenceCoding */
@ -673,6 +681,16 @@ static const MXFCodecUL *mxf_get_codec_ul(const MXFCodecUL *uls, UID *uid)
return uls; return uls;
} }
static enum CodecType mxf_get_codec_type(const MXFDataDefinitionUL *uls, UID *uid)
{
while (uls->type != CODEC_TYPE_DATA) {
if(!memcmp(uls->uid, *uid, 16))
break;
uls++;
}
return uls->type;
}
static void *mxf_resolve_strong_ref(MXFContext *mxf, UID *strong_ref) static void *mxf_resolve_strong_ref(MXFContext *mxf, UID *strong_ref)
{ {
int i; int i;
@ -786,12 +804,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
#ifdef DEBUG #ifdef DEBUG
PRINT_KEY("data definition ul", source_track->sequence->data_definition_ul); PRINT_KEY("data definition ul", source_track->sequence->data_definition_ul);
#endif #endif
if (!memcmp(source_track->sequence->data_definition_ul, picture_essence_track_ul, 16)) st->codec->codec_type = mxf_get_codec_type(mxf_data_definition_uls, &source_track->sequence->data_definition_ul);
st->codec->codec_type = CODEC_TYPE_VIDEO;
else if (!memcmp(source_track->sequence->data_definition_ul, sound_essence_track_ul, 16))
st->codec->codec_type = CODEC_TYPE_AUDIO;
else
st->codec->codec_type = CODEC_TYPE_DATA;
source_package->descriptor = mxf_resolve_strong_ref(mxf, &source_package->descriptor_ref); source_package->descriptor = mxf_resolve_strong_ref(mxf, &source_package->descriptor_ref);
if (source_package->descriptor) { if (source_package->descriptor) {