Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged 2436

Browse Source
This commit is contained in:
Moritz Bunkus 2004-11-09 14:06:20 +00:00
parent 77d13918dd
commit 3dcf05bd69
2 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/input/qtmp4_atoms.h
View File

@ -178,4 +178,24 @@ typedef struct PACKED_STRUCTURE {
#pragma pack(pop)
#endif
// Object type identifications.
// See http://gpac.sourceforge.net/tutorial/mediatypes.htm
#define MP4OTI_MPEG4Systems1 0x01
#define MP4OTI_MPEG4Systems2 0x02
#define MP4OTI_MPEG4Visual 0x20
#define MP4OTI_MPEG4Audio 0x40
#define MP4OTI_MPEG2VisualSimple 0x60
#define MP4OTI_MPEG2VisualMain 0x61
#define MP4OTI_MPEG2VisualSNR 0x62
#define MP4OTI_MPEG2VisualSpatial 0x63
#define MP4OTI_MPEG2VisualHigh 0x64
#define MP4OTI_MPEG2Visual422 0x65
#define MP4OTI_MPEG2AudioMain 0x66
#define MP4OTI_MPEG2AudioLowComplexity 0x67
#define MP4OTI_MPEG2AudioScaleableSamplingRate 0x68
#define MP4OTI_MPEG2AudioPart3 0x69
#define MP4OTI_MPEG1Visual 0x6A
#define MP4OTI_MPEG1Audio 0x6B
#define MP4OTI_JPEG 0x6C
#endif // __QTMP4_ATOMS_H

30
src/input/r_qtmp4.cpp
View File

@ -242,17 +242,24 @@ qtmp4_reader_c::parse_headers() {
if ((dmx->type == 'a') &&
!strncasecmp(dmx->fourcc, "MP4A", 4)) {
if ((dmx->esds.object_type_id != 64) && // AAC
(dmx->esds.object_type_id != 103) && // AAC, too?
(dmx->esds.object_type_id != 107)) { // MP2/3
if ((dmx->esds.object_type_id != MP4OTI_MPEG4Audio) && // AAC..
(dmx->esds.object_type_id != MP4OTI_MPEG2AudioMain) &&
(dmx->esds.object_type_id != MP4OTI_MPEG2AudioLowComplexity) &&
(dmx->esds.object_type_id != MP4OTI_MPEG2AudioScaleableSamplingRate)
&&
(dmx->esds.object_type_id != MP4OTI_MPEG2AudioPart3) && // MP3...
(dmx->esds.object_type_id != MP4OTI_MPEG1Audio)) {
mxwarn(PFX "The audio track %u is using an unsupported 'object type "
"id' of %u in the 'esds' atom. Skipping this track.\n",
dmx->id, dmx->esds.object_type_id);
continue;
}
if (((dmx->esds.object_type_id == 64) ||
(dmx->esds.object_type_id == 103)) &&
if (((dmx->esds.object_type_id == MP4OTI_MPEG4Audio) || // AAC..
(dmx->esds.object_type_id == MP4OTI_MPEG2AudioMain) ||
(dmx->esds.object_type_id == MP4OTI_MPEG2AudioLowComplexity) ||
(dmx->esds.object_type_id ==
MP4OTI_MPEG2AudioScaleableSamplingRate)) &&
(dmx->esds.decoder_config == NULL)) {
mxwarn(PFX "The AAC track %u is missing the esds atom/the decoder "
"config. Skipping this track.\n", dmx->id);
@ -1162,8 +1169,12 @@ qtmp4_reader_c::create_packetizer(int64_t tid) {
"\n", ti->fname, (int64_t)dmx->id, dmx->fourcc);
} else if (!strncasecmp(dmx->fourcc, "MP4A", 4) &&
((dmx->esds.object_type_id == 64) ||
(dmx->esds.object_type_id == 103))) {
((dmx->esds.object_type_id == MP4OTI_MPEG4Audio) || // AAC..
(dmx->esds.object_type_id == MP4OTI_MPEG2AudioMain) ||
(dmx->esds.object_type_id ==
MP4OTI_MPEG2AudioLowComplexity) ||
(dmx->esds.object_type_id ==
MP4OTI_MPEG2AudioScaleableSamplingRate))) {
int profile, sample_rate, channels, output_sample_rate;
bool sbraac;
@ -1193,7 +1204,8 @@ qtmp4_reader_c::create_packetizer(int64_t tid) {
dmx->esds.decoder_config_len);
} else if (!strncasecmp(dmx->fourcc, "MP4A", 4) &&
(dmx->esds.object_type_id == 107)) {
((dmx->esds.object_type_id == MP4OTI_MPEG2AudioPart3) ||
(dmx->esds.object_type_id == MP4OTI_MPEG1Audio))) {
dmx->ptzr =
add_packetizer(new mp3_packetizer_c(this, (int32_t)dmx->a_samplerate,
dmx->a_channels, true, ti));