Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes based on feedback from stippi 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27629 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
David McPaul 2008-09-19 07:04:49 +00:00
parent abb2df34ee
commit cac510c913
4 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/add-ons/media/plugins/matroska/matroska_codecs.cpp
View File

@ -120,7 +120,7 @@ GetAudioFormat(media_format *format, const char *codec, void *private_data, int
media_format_description description;
description.family = B_MPEG_FORMAT_FAMILY;
description.u.mpeg.id = B_MPEG_1_AUDIO_LAYER_3;
if (B_OK != formats.GetFormatFor(description, format))
if (formats.GetFormatFor(description, format) != B_OK)
format->type = B_MEDIA_ENCODED_AUDIO;
return B_OK;
@ -134,7 +134,7 @@ GetAudioFormat(media_format *format, const char *codec, void *private_data, int
description.family = B_MISC_FORMAT_FAMILY;
description.u.misc.file_format = (uint32)(misc_codec >> 32);
description.u.misc.codec = (uint32)misc_codec;
if (B_OK != formats.GetFormatFor(description, format))
if (formats.GetFormatFor(description, format) != B_OK)
format->type = B_MEDIA_ENCODED_AUDIO;
// Set the DecoderConfigSize (Not that haiku seems to use it)

2
src/add-ons/media/plugins/matroska/matroska_codecs.h
View File

@ -25,7 +25,7 @@
#ifndef _MATROSKA_CODECS_H
#define _MATROSKA_CODECS_H
#define IS_CODEC(a,b) !memcmp(a, b, strlen(b))
#define IS_CODEC(a, b) !memcmp(a, b, strlen(b))
status_t GetAudioFormat(media_format *format, const char *codec, void *private_data, int private_size);
status_t GetVideoFormat(media_format *format, const char *codec, void *private_data, int private_size);

66
src/add-ons/media/plugins/matroska/matroska_reader.cpp
View File

@ -60,7 +60,9 @@ struct mkv_cookie
const TrackInfo *track_info;
int private_data_size;
uint8 * private_data;
uint8 * private_data; // reference
uint8 * fake_private_data; // created as needed
float frame_rate;
int64 frame_count;
@ -75,7 +77,8 @@ struct mkv_cookie
uint32 line_count;
};
static uint8 matroska_samplerate_to_samplerateindex(float samplerate)
static uint8
matroska_samplerate_to_samplerateindex(float samplerate)
{
if (samplerate <= 7350.0) {
return 12;
@ -113,7 +116,6 @@ mkvReader::mkvReader()
, fFile(0)
, fFileInfo(0)
{
fakeExtraData = 0;
TRACE("mkvReader::mkvReader\n");
}
@ -122,37 +124,35 @@ mkvReader::~mkvReader()
{
mkv_Close(fFile);
free(fInputStream);
if (fakeExtraData) {
delete [] fakeExtraData;
}
}
int
mkvReader::CreateFakeAACDecoderConfig(const TrackInfo *track)
mkvReader::CreateFakeAACDecoderConfig(const TrackInfo *track, uint8 **fakeExtraData)
{
// Try to fake up a valid Decoder Config for the AAC decoder to parse
TRACE("AAC requires private data (attempting to fake one).\n");
TRACE("AAC (%s) requires private data (attempting to fake one)\n",track->CodecID);
fakeExtraData = new uint8[8];
int Profile = 1;
int profile = 1;
if (strstr(track->CodecID,"MAIN")) {
Profile = 1;
profile = 1;
} else if (strstr(track->CodecID,"LC")) {
Profile = 2;
profile = 2;
} else if (strstr(track->CodecID,"SSR")) {
Profile = 3;
profile = 3;
}
uint8 SampleRateIndex = matroska_samplerate_to_samplerateindex(track->Audio.SamplingFreq);
uint8 sampleRateIndex = matroska_samplerate_to_samplerateindex(track->Audio.SamplingFreq);
TRACE("Profile %d, SampleRate %f, SampleRateIndex %d\n",profile, track->Audio.SamplingFreq, sampleRateIndex);
// profile 5 bits
// SampleRateIndex 4 bits
// Channels 4 Bits
fakeExtraData[0] = (Profile << 3) | ((SampleRateIndex & 0x0E) >> 1);
fakeExtraData[1] = ((SampleRateIndex & 0x01) << 7) | (track->Audio.Channels << 3);
(*fakeExtraData)[0] = (profile << 3) | ((sampleRateIndex & 0x0E) >> 1);
(*fakeExtraData)[1] = ((sampleRateIndex & 0x01) << 7) | (track->Audio.Channels << 3);
if (strstr(track->CodecID, "SBR")) {
TRACE("Extension SBR Needs more configuration\n");
// Sync Extension 0x2b7 11 bits
// Extension Audio Object Type 0x5 5 bits
// SBR present flag 0x1 1 bit
@ -160,20 +160,20 @@ mkvReader::CreateFakeAACDecoderConfig(const TrackInfo *track)
// if SampleRateIndex = 15
// ExtendedSamplingFrequency 24 bits
SampleRateIndex = matroska_samplerate_to_samplerateindex(track->Audio.OutputSamplingFreq);
fakeExtraData[2] = 0x56;
fakeExtraData[3] = 0xE5;
if (SampleRateIndex != 15) {
fakeExtraData[4] = 0x80 | (SampleRateIndex << 3);
sampleRateIndex = matroska_samplerate_to_samplerateindex(track->Audio.OutputSamplingFreq);
(*fakeExtraData)[2] = 0x56;
(*fakeExtraData)[3] = 0xE5;
if (sampleRateIndex != 15) {
(*fakeExtraData)[4] = 0x80 | (sampleRateIndex << 3);
return 5;
}
uint32 SampleRate = uint32(track->Audio.OutputSamplingFreq);
uint32 sampleRate = uint32(track->Audio.OutputSamplingFreq);
fakeExtraData[4] = 0x80 | (SampleRateIndex << 3) | ((SampleRate & 0xFFF0 ) >> 4);
fakeExtraData[5] = (SampleRate & 0x0FFF) << 4;
fakeExtraData[6] = SampleRate << 12;
fakeExtraData[7] = SampleRate << 20;
(*fakeExtraData)[4] = 0x80 | (sampleRateIndex << 3) | ((sampleRate & 0xFFF0 ) >> 4);
(*fakeExtraData)[5] = (sampleRate & 0x0FFF) << 4;
(*fakeExtraData)[6] = sampleRate << 12;
(*fakeExtraData)[7] = sampleRate << 20;
return 8;
} else {
return 2;
@ -388,7 +388,7 @@ mkvReader::SetupAudioCookie(mkv_cookie *cookie)
TRACE("duration: %Ld (%.6f)\n", cookie->duration, cookie->duration / 1E6);
TRACE("frame_count: %Ld\n", cookie->frame_count);
if (B_OK != GetAudioFormat(&cookie->format, cookie->track_info->CodecID, cookie->track_info->CodecPrivate, cookie->track_info->CodecPrivateSize)) {
if (GetAudioFormat(&cookie->format, cookie->track_info->CodecID, cookie->track_info->CodecPrivate, cookie->track_info->CodecPrivateSize) != B_OK) {
TRACE("mkvReader::SetupAudioCookie: codec not recognized\n");
return B_ERROR;
}
@ -402,8 +402,11 @@ mkvReader::SetupAudioCookie(mkv_cookie *cookie)
if (IS_CODEC(cookie->track_info->CodecID, "A_AAC")) {
if (cookie->private_data_size == 0) {
cookie->private_data_size = CreateFakeAACDecoderConfig(cookie->track_info);
cookie->private_data = &fakeExtraData[0];
// we create our own private data and keep a reference for us to dispose.
cookie->fake_private_data = new uint8[8];
cookie->private_data = cookie->fake_private_data;
cookie->private_data_size = CreateFakeAACDecoderConfig(cookie->track_info, &cookie->private_data);
}
cookie->format.u.encoded_audio.output.format = media_raw_audio_format::B_AUDIO_SHORT;
@ -430,7 +433,8 @@ mkvReader::FreeCookie(void *_cookie)
mkv_Close(cookie->file);
delete [] cookie->buffer;
delete [] cookie->fake_private_data;
delete cookie;
return B_OK;
}

3
src/add-ons/media/plugins/matroska/matroska_reader.h
View File

@ -62,13 +62,12 @@ private:
status_t SetupVideoCookie(mkv_cookie *cookie);
status_t SetupAudioCookie(mkv_cookie *cookie);
status_t SetupTextCookie(mkv_cookie *cookie);
int CreateFakeAACDecoderConfig(const TrackInfo *track);
int CreateFakeAACDecoderConfig(const TrackInfo *track, uint8 **fakeExtraData);
private:
InputStream * fInputStream;
MatroskaFile * fFile;
const SegmentInfo * fFileInfo;
uint8 * fakeExtraData;
};