|
Line 0
Link Here
|
|
|
1 |
--- plugins/xmms/src/mp4_utils.c.orig Thu Dec 4 05:07:56 2003 |
| 2 |
+++ plugins/xmms/src/mp4_utils.c Fri Jul 29 11:11:21 2005 |
| 3 |
@@ -6,23 +6,35 @@ |
| 4 |
|
| 5 |
const char *mp4AudioNames[]= |
| 6 |
{ |
| 7 |
- "MPEG-1 Audio Layers 1,2 or 3", |
| 8 |
- "MPEG-2 low biterate (MPEG-1 extension) - MP3", |
| 9 |
- "MPEG-2 AAC Main Profile", |
| 10 |
- "MPEG-2 AAC Low Complexity profile", |
| 11 |
- "MPEG-2 AAC SSR profile", |
| 12 |
- "MPEG-4 audio (MPEG-4 AAC)", |
| 13 |
- 0 |
| 14 |
+ "MPEG-4 AAC Main profile", |
| 15 |
+ "MPEG-4 AAC Low Complexity profile", |
| 16 |
+ "MPEG-4 AAC SSR profile", |
| 17 |
+ "MPEG-4 AAC Long Term Prediction profile", |
| 18 |
+ "MPEG-4 AAC Scalable", |
| 19 |
+ "MPEG-4 CELP", |
| 20 |
+ "MPEG-4 HVXC", |
| 21 |
+ "MPEG-4 Text to Speech", |
| 22 |
+ "MPEG-4 Main Synthetic profile", |
| 23 |
+ "MPEG-4 Wavetable Synthesis profile", |
| 24 |
+ "MPEG-4 MIDI profile", |
| 25 |
+ "MPEG-4 Algorithmic Synthesis and Audio FX profile", |
| 26 |
+ NULL |
| 27 |
}; |
| 28 |
|
| 29 |
const u_int8_t mp4AudioTypes[] = |
| 30 |
{ |
| 31 |
- MP4_MPEG1_AUDIO_TYPE, // 0x6B |
| 32 |
- MP4_MPEG2_AUDIO_TYPE, // 0x69 |
| 33 |
- MP4_MPEG2_AAC_MAIN_AUDIO_TYPE, // 0x66 |
| 34 |
- MP4_MPEG2_AAC_LC_AUDIO_TYPE, // 0x67 |
| 35 |
- MP4_MPEG2_AAC_SSR_AUDIO_TYPE, // 0x68 |
| 36 |
- MP4_MPEG4_AUDIO_TYPE, // 0x40 |
| 37 |
+ MP4_MPEG4_AAC_MAIN_AUDIO_TYPE, |
| 38 |
+ MP4_MPEG4_AAC_LC_AUDIO_TYPE, |
| 39 |
+ MP4_MPEG4_AAC_SSR_AUDIO_TYPE, |
| 40 |
+ MP4_MPEG4_AAC_LTP_AUDIO_TYPE, |
| 41 |
+ MP4_MPEG4_AAC_SCALABLE_AUDIO_TYPE, |
| 42 |
+ MP4_MPEG4_CELP_AUDIO_TYPE, |
| 43 |
+ MP4_MPEG4_HVXC_AUDIO_TYPE, |
| 44 |
+ MP4_MPEG4_TTSI_AUDIO_TYPE, |
| 45 |
+ MP4_MPEG4_MAIN_SYNTHETIC_AUDIO_TYPE, |
| 46 |
+ MP4_MPEG4_WAVETABLE_AUDIO_TYPE, |
| 47 |
+ MP4_MPEG4_MIDI_AUDIO_TYPE, |
| 48 |
+ MP4_MPEG4_ALGORITHMIC_FX_AUDIO_TYPE, |
| 49 |
0 |
| 50 |
}; |
| 51 |
|
| 52 |
@@ -54,7 +66,7 @@ |
| 53 |
const char *trackType = MP4GetTrackType(file, trackID); |
| 54 |
if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track ! |
| 55 |
int j=0; |
| 56 |
- u_int8_t audiotype = MP4GetTrackAudioType(file, trackID); |
| 57 |
+ u_int8_t audiotype = MP4GetTrackAudioMpeg4Type(file, trackID); |
| 58 |
while(mp4AudioTypes[j]){ // what kind of audio is ? |
| 59 |
if(mp4AudioTypes[j] == audiotype){ |
| 60 |
if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){//MPEG4 audio ok |
| 61 |
@@ -64,9 +76,9 @@ |
| 62 |
} |
| 63 |
else{ |
| 64 |
printf("%s\n", mp4AudioNames[j]); |
| 65 |
- if (mp4AudioTypes[j]== MP4_MPEG2_AAC_LC_AUDIO_TYPE || |
| 66 |
- mp4AudioTypes[j]== MP4_MPEG2_AAC_MAIN_AUDIO_TYPE || |
| 67 |
- mp4AudioTypes[j]== MP4_MPEG2_AAC_SSR_AUDIO_TYPE) |
| 68 |
+ if (mp4AudioTypes[j]== MP4_MPEG4_AAC_MAIN_AUDIO_TYPE || |
| 69 |
+ mp4AudioTypes[j]== MP4_MPEG4_AAC_LC_AUDIO_TYPE || |
| 70 |
+ mp4AudioTypes[j]== MP4_MPEG4_AAC_SSR_AUDIO_TYPE) |
| 71 |
return(trackID); |
| 72 |
return(-1); |
| 73 |
} |
| 74 |
@@ -126,10 +138,11 @@ |
| 75 |
printf("Track %d, %s", trackID, trackType); |
| 76 |
if(!strcmp(trackType, MP4_AUDIO_TRACK_TYPE)){//we found audio track ! |
| 77 |
int j=0; |
| 78 |
- u_int8_t audiotype = MP4GetTrackAudioType(mp4file, trackID); |
| 79 |
+ u_int8_t audiotype = MP4GetTrackAudioMpeg4Type(mp4file, trackID); |
| 80 |
while(mp4AudioTypes[j]){ // what kind of audio is ? |
| 81 |
if(mp4AudioTypes[j] == audiotype){ |
| 82 |
- if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE){ |
| 83 |
+ if(mp4AudioTypes[j] == MP4_MPEG4_AUDIO_TYPE || |
| 84 |
+ mp4AudioTypes[j] == MP4_MPEG4_AAC_LC_AUDIO_TYPE){ |
| 85 |
audiotype = MP4GetTrackAudioMpeg4Type(mp4file, trackID); |
| 86 |
g_print(" %s", mpeg4AudioNames[audiotype]); |
| 87 |
} |