i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes to handle avcodec aac

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27532 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
David McPaul
2008-09-15 13:37:51 +00:00
parent cbcebd3330
commit c7f27caff8
2 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/mp4_reader/libMP4/MP4Parser.cpp
+11 -5
View File
@@ -1085,6 +1085,9 @@ void ESDSAtom::OnOverrideAudioDescription(AudioDescription *pAudioDescription)
uint32 buffer; uint32 buffer;
uint32 temp; uint32 temp;
// remember where the tag 5 starts
uint32 extendedAudioConfig = offset;
switch (ESDSType) { switch (ESDSType) {
case 64: // AAC case 64: // AAC
// Attempt to read AAC Header // Attempt to read AAC Header
@@ -1114,10 +1117,14 @@ void ESDSAtom::OnOverrideAudioDescription(AudioDescription *pAudioDescription)
// SampleRate is in 16.16 format // SampleRate is in 16.16 format
pAudioDescription->theAudioSampleEntry.SampleRate = aac_sampling_rate[theAACHeader.sampleRateIndex] * 65536 ; pAudioDescription->theAudioSampleEntry.SampleRate = aac_sampling_rate[theAACHeader.sampleRateIndex] * 65536 ;
pAudioDescription->theAudioSampleEntry.ChannelCount = theAACHeader.totalChannels; pAudioDescription->theAudioSampleEntry.ChannelCount = theAACHeader.totalChannels;
// Reset decoder Config memory
memcpy(pAudioDescription->theDecoderConfig, &pAudioDescription->theDecoderConfig[extendedAudioConfig], pAudioDescription->DecoderConfigSize-extendedAudioConfig+1);
break; break;
case 107: // MP3 case 107: // MP3
pAudioDescription->codecSubType = 'mp3'; pAudioDescription->codecSubType = '.mp3';
// Only set this for mp3, we calc it normally // Only set this for mp3, we calc it normally
if (NeededBufferSize > pAudioDescription->BufferSize) { if (NeededBufferSize > pAudioDescription->BufferSize) {
@@ -1172,7 +1179,6 @@ WAVEAtom::~WAVEAtom()
void WAVEAtom::OnProcessMetaData() void WAVEAtom::OnProcessMetaData()
{ {
} }
char *WAVEAtom::OnGetAtomName() char *WAVEAtom::OnGetAtomName()
@@ -1182,8 +1188,8 @@ char *WAVEAtom::OnGetAtomName()
void WAVEAtom::OnOverrideAudioDescription(AudioDescription *pAudioDescription) void WAVEAtom::OnOverrideAudioDescription(AudioDescription *pAudioDescription)
{ {
pAudioDescription->codecSubType = 'mp3'; pAudioDescription->codecSubType = '.mp3';
pAudioDescription->FrameSize = 0; pAudioDescription->FrameSize = 1;
} }
void WAVEAtom::OnOverrideVideoDescription(VideoDescription *pVideoDescription) void WAVEAtom::OnOverrideVideoDescription(VideoDescription *pVideoDescription)
@@ -1196,7 +1202,7 @@ STSDAtom::STSDAtom(BPositionIO *pStream, off_t pstreamOffset, uint32 patomType,
theHeader.NoEntries = 0; theHeader.NoEntries = 0;
theAudioDescription.codecid = 0; theAudioDescription.codecid = 0;
theAudioDescription.codecSubType = 0; theAudioDescription.codecSubType = 0;
theAudioDescription.FrameSize = 0; theAudioDescription.FrameSize = 1;
theAudioDescription.BufferSize = 0; theAudioDescription.BufferSize = 0;
theAudioDescription.BitRate = 0; theAudioDescription.BitRate = 0;
theAudioDescription.theDecoderConfig = NULL; theAudioDescription.theDecoderConfig = NULL;
src/add-ons/media/plugins/mp4_reader/mp4_reader.cpp
+34 -13
View File
@@ -47,7 +47,6 @@
#define ERROR(a...) fprintf(stderr, a) #define ERROR(a...) fprintf(stderr, a)
struct mp4_cookie { struct mp4_cookie {
unsigned stream; unsigned stream;
char * buffer; char * buffer;
@@ -73,7 +72,6 @@ struct mp4_cookie {
uint32 frame_size; uint32 frame_size;
}; };
mp4Reader::mp4Reader() mp4Reader::mp4Reader()
: theFileReader(0) : theFileReader(0)
{ {
@@ -140,7 +138,6 @@ mp4Reader::GetFileFormatInfo(media_file_format *mff)
strcpy(mff->pretty_name, "MPEG-4 (MP4) file format"); strcpy(mff->pretty_name, "MPEG-4 (MP4) file format");
} }
status_t status_t
mp4Reader::AllocateCookie(int32 streamNumber, void **_cookie) mp4Reader::AllocateCookie(int32 streamNumber, void **_cookie)
{ {
@@ -184,11 +181,11 @@ mp4Reader::AllocateCookie(int32 streamNumber, void **_cookie)
delete cookie; delete cookie;
return B_ERROR; return B_ERROR;
} }
codecID = B_BENDIAN_TO_HOST_INT32(audio_format->compression);
// frame_count is actually sample_count for audio - makes media_player happy but david sad // frame_count is actually sample_count for audio - makes media_player happy but david sad
cookie->frame_count = theFileReader->getFrameCount(cookie->stream) * audio_format->FrameSize; cookie->frame_count = theFileReader->getFrameCount(cookie->stream) * audio_format->FrameSize;
cookie->duration = theFileReader->getAudioDuration(cookie->stream); cookie->duration = theFileReader->getAudioDuration(cookie->stream);
cookie->frame_size = audio_format->FrameSize;
cookie->audio = true; cookie->audio = true;
@@ -225,6 +222,8 @@ mp4Reader::AllocateCookie(int32 streamNumber, void **_cookie)
|| audio_format->compression == AUDIO_RAW || audio_format->compression == AUDIO_RAW
|| audio_format->compression == AUDIO_TWOS1 || audio_format->compression == AUDIO_TWOS1
|| audio_format->compression == AUDIO_TWOS2) { || audio_format->compression == AUDIO_TWOS2) {
codecID = B_BENDIAN_TO_HOST_INT32(audio_format->compression);
description.family = B_BEOS_FORMAT_FAMILY; description.family = B_BEOS_FORMAT_FAMILY;
description.u.beos.format = B_BEOS_FORMAT_RAW_AUDIO; description.u.beos.format = B_BEOS_FORMAT_RAW_AUDIO;
if (B_OK != formats.GetFormatFor(description, format)) if (B_OK != formats.GetFormatFor(description, format))
@@ -267,13 +266,21 @@ mp4Reader::AllocateCookie(int32 streamNumber, void **_cookie)
format->u.raw_audio.buffer_size = stream_header->suggested_buffer_size; format->u.raw_audio.buffer_size = stream_header->suggested_buffer_size;
} else { } else {
printf("codecid %s codecsubtype %s\n",&audio_format->compression,&audio_format->codecSubType);
description.family = B_QUICKTIME_FORMAT_FAMILY; description.family = B_QUICKTIME_FORMAT_FAMILY;
description.u.quicktime.codec = audio_format->compression;
if (audio_format->codecSubType != 0) {
codecID = audio_format->codecSubType;
} else {
codecID = audio_format->compression;
}
description.u.quicktime.codec = codecID;
if (B_OK != formats.GetFormatFor(description, format)) { if (B_OK != formats.GetFormatFor(description, format)) {
format->type = B_MEDIA_ENCODED_AUDIO; format->type = B_MEDIA_ENCODED_AUDIO;
} }
switch (audio_format->compression) { switch (description.u.quicktime.codec) {
case AUDIO_MS_PCM02: case AUDIO_MS_PCM02:
TRACE("MS PCM02\n"); TRACE("MS PCM02\n");
format->u.raw_audio.format |= B_AUDIO_FORMAT_CHANNEL_ORDER_WAVE; format->u.raw_audio.format |= B_AUDIO_FORMAT_CHANNEL_ORDER_WAVE;
@@ -288,15 +295,28 @@ mp4Reader::AllocateCookie(int32 streamNumber, void **_cookie)
format->u.encoded_audio.output.channel_count = audio_format->NoOfChannels; format->u.encoded_audio.output.channel_count = audio_format->NoOfChannels;
break; break;
case AUDIO_MPEG3_CBR: case AUDIO_MPEG3_CBR:
case '.mp3':
TRACE("MP3\n"); TRACE("MP3\n");
format->u.encoded_audio.bit_rate = 8 * cookie->frames_per_sec_rate / cookie->frames_per_sec_scale; format->u.encoded_audio.bit_rate = 8 * cookie->frames_per_sec_rate / cookie->frames_per_sec_scale;
format->u.encoded_audio.output.frame_rate = cookie->frames_per_sec_rate / cookie->frames_per_sec_scale; format->u.encoded_audio.output.frame_rate = cookie->frames_per_sec_rate / cookie->frames_per_sec_scale;
format->u.encoded_audio.output.channel_count = audio_format->NoOfChannels; format->u.encoded_audio.output.channel_count = audio_format->NoOfChannels;
format->u.encoded_audio.output.buffer_size = audio_format->BufferSize;
format->u.encoded_audio.output.format = media_raw_audio_format::B_AUDIO_SHORT;
format->u.encoded_audio.output.byte_order = B_HOST_IS_LENDIAN ? B_MEDIA_LITTLE_ENDIAN : B_MEDIA_BIG_ENDIAN;
TRACE("Audio NoOfChannels %d, SampleSize %d, SampleRate %f, FrameSize %ld\n",audio_format->NoOfChannels, audio_format->SampleSize, audio_format->SampleRate, audio_format->FrameSize);
TRACE("Audio frame_rate %f, channel_count %ld, format %ld, buffer_size %ld, frame_size %ld, bit_rate %f\n",
format->u.encoded_audio.output.frame_rate, format->u.encoded_audio.output.channel_count, format->u.encoded_audio.output.format,format->u.encoded_audio.output.buffer_size, format->u.encoded_audio.frame_size, format->u.encoded_audio.bit_rate);
TRACE("Track %d MP4 Audio FrameCount %ld Duration %Ld\n",cookie->stream,theFileReader->getFrameCount(cookie->stream),cookie->duration);
break; break;
case 'mp4a': case 'mp4a':
codecID = B_BENDIAN_TO_HOST_INT32('aac '); codecID = 'aac ';
case 'aac ':
case 'alac': case 'alac':
TRACE("AAC audio (mp4a) or ALAC audio\n"); TRACE("AAC audio or ALAC audio\n");
format->u.encoded_audio.output.frame_rate = cookie->frames_per_sec_rate / cookie->frames_per_sec_scale; format->u.encoded_audio.output.frame_rate = cookie->frames_per_sec_rate / cookie->frames_per_sec_scale;
@@ -309,8 +329,6 @@ mp4Reader::AllocateCookie(int32 streamNumber, void **_cookie)
// ALAC is 4096 samples per frame // ALAC is 4096 samples per frame
format->u.encoded_audio.frame_size = audio_format->FrameSize; format->u.encoded_audio.frame_size = audio_format->FrameSize;
cookie->frame_size = audio_format->FrameSize;
format->u.encoded_audio.output.buffer_size = audio_format->BufferSize; format->u.encoded_audio.output.buffer_size = audio_format->BufferSize;
// Average BitRate = (TotalBytes * 8 * (SampleRate / FrameSize)) / TotalFrames // Average BitRate = (TotalBytes * 8 * (SampleRate / FrameSize)) / TotalFrames
@@ -338,11 +356,12 @@ mp4Reader::AllocateCookie(int32 streamNumber, void **_cookie)
format->u.encoded_audio.bit_rate = 8 * cookie->frames_per_sec_rate / cookie->frames_per_sec_scale; format->u.encoded_audio.bit_rate = 8 * cookie->frames_per_sec_rate / cookie->frames_per_sec_scale;
format->u.encoded_audio.output.frame_rate = cookie->frames_per_sec_rate / cookie->frames_per_sec_scale; format->u.encoded_audio.output.frame_rate = cookie->frames_per_sec_rate / cookie->frames_per_sec_scale;
format->u.encoded_audio.output.channel_count = audio_format->NoOfChannels; format->u.encoded_audio.output.channel_count = audio_format->NoOfChannels;
format->u.encoded_audio.output.buffer_size = audio_format->BufferSize;
break; break;
} }
} }
// Set the DecoderConfigSize // Set the DecoderConfig
size = audio_format->DecoderConfigSize; size = audio_format->DecoderConfigSize;
data = audio_format->theDecoderConfig; data = audio_format->theDecoderConfig;
if (size > 0) { if (size > 0) {
@@ -357,8 +376,8 @@ mp4Reader::AllocateCookie(int32 streamNumber, void **_cookie)
#ifdef TRACE_MP4_READER #ifdef TRACE_MP4_READER
if (data) { if (data) {
uint8 *p = (uint8 *)data; uint8 *p = (uint8 *)data;
TRACE("extra_data: %ld: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", TRACE("extra_data: %ld: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
size , p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9]); size , p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15], p[16], p[17]);
} }
#endif #endif
@@ -533,6 +552,8 @@ mp4Reader::GetStreamInfo(void *_cookie, int64 *frameCount, bigtime_t *duration,
} else { } else {
ERROR("No stream Info for stream %d\n",cookie->stream); ERROR("No stream Info for stream %d\n",cookie->stream);
} }
TRACE("GetStreamInfo (%d) fc %Ld duration %Ld extra %ld\n",cookie->stream,*frameCount,*duration,*infoSize);
} }
return B_OK; return B_OK;
} }