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

improved stream format detection

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20827 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2007-04-25 20:58:09 +00:00
parent 4171bc72bc
commit b0b3cab0fd
2 changed files with 138 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp
+13 -13
View File
@@ -1964,7 +1964,7 @@ DVBMediaNode::_GetNextAudioChunk(const void **chunkData, size_t *chunkLen, media
status_t status_t
DVBMediaNode::GetStreamFormat(PacketQueue *queue, media_format *format) DVBMediaNode::GetStreamFormat(PacketQueue *queue, media_format *format)
{ {
status_t err; status_t status;
Packet *packet; Packet *packet;
const uint8 *data; const uint8 *data;
size_t size; size_t size;
@@ -1972,29 +1972,29 @@ DVBMediaNode::GetStreamFormat(PacketQueue *queue, media_format *format)
// get copy of the first packet from queue, and determine format // get copy of the first packet from queue, and determine format
if ((err = queue->Peek(&packet)) != B_OK) { if ((status = queue->Peek(&packet)) != B_OK) {
TRACE("queue->Peek failed, error %lx\n", err); TRACE("queue->Peek failed, error %lx\n", status);
return err; return status;
} }
if ((err = pes_extract(packet->Data(), packet->Size(), &data, &size)) != B_OK) { if ((status = pes_extract(packet->Data(), packet->Size(), &data, &size)) != B_OK) {
TRACE("pes_extract failed\n"); TRACE("pes_extract failed\n");
return err; goto done;
} }
if ((err = pes_stream_id(packet->Data(), packet->Size(), &stream_id)) != B_OK) { if ((status = pes_stream_id(packet->Data(), packet->Size(), &stream_id)) != B_OK) {
TRACE("pes_stream_id failed\n"); TRACE("pes_stream_id failed\n");
return err; goto done;
} }
if ((err = GetHeaderFormat(format, data, size, stream_id)) != B_OK) { if ((status = GetHeaderFormat(format, data, size, stream_id)) != B_OK) {
TRACE("GetHeaderFormat failed, error %lx\n", err); TRACE("GetHeaderFormat failed, error %lx\n", status);
return err; goto done;
} }
done:
delete packet; delete packet;
return status;
return B_OK;
} }
src/add-ons/media/media-add-ons/dvb/MediaFormat.cpp
+119 -55
View File
@@ -27,12 +27,6 @@
#include <stdio.h> #include <stdio.h>
#include "MediaFormat.h" #include "MediaFormat.h"
void
PrintFormat(const media_output &output)
{
PrintFormat(output.format);
}
void void
PrintFormat(const media_format &format) PrintFormat(const media_format &format)
@@ -43,67 +37,137 @@ PrintFormat(const media_format &format)
} }
status_t void
GetHeaderFormat(media_format *out_format, const void *header, size_t size, int stream_id) PrintFormat(const media_output &output)
{ {
PrintFormat(output.format);
}
const uint8 *d = (const uint8 *)header;
printf("GetHeaderFormat: stream_id %02x\n", stream_id);
printf("frame header: "
"%02x %02x %02x %02x %02x %02x %02x %02x "
"%02x %02x %02x %02x %02x %02x %02x %02x\n",
d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7],
d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]);
if (d[0] == 0xff && d[1] == 0xfc) { static status_t
GetHeaderFormatAc3Audio(media_format *out_format, const uint8 *header, size_t size)
printf("GetHeaderFormat: assuming mepeg audio\n"); {
printf("GetHeaderFormatAc3Audio\n");
status_t err;
status_t status;
media_format_description desc; media_format_description desc;
desc.family = B_MPEG_FORMAT_FAMILY; desc.family = B_WAV_FORMAT_FAMILY;
desc.u.mpeg.id = B_MPEG_1_AUDIO_LAYER_3; desc.u.wav.codec = 0x2000;
BMediaFormats formats; BMediaFormats formats;
media_format format; status = formats.InitCheck();
if (status)
return status;
err = formats.InitCheck(); return formats.GetFormatFor(desc, out_format);
if (err) }
return err;
err = formats.GetFormatFor(desc, out_format);
if (err) static status_t
return err; GetHeaderFormatDtsAudio(media_format *out_format, const uint8 *header, size_t size)
{
printf("GetHeaderFormatDtsAudio: unsupported\n");
return B_ERROR;
}
static status_t
GetHeaderFormatLpcmAudio(media_format *out_format, const uint8 *header, size_t size)
{
printf("GetHeaderFormatLpcmAudio: unsupported\n");
return B_ERROR;
}
static status_t
GetHeaderFormatPrivateStream(media_format *out_format, const uint8 *header, size_t size)
{
printf("GetHeaderFormatPrivateStream: unsupported, assuming AC3\n");
return GetHeaderFormatAc3Audio(out_format, header, size);
}
static status_t
GetHeaderFormatMpegAudio(media_format *out_format, const uint8 *header, size_t size)
{
printf("GetHeaderFormatMpegAudio\n");
status_t status;
media_format_description desc;
desc.family = B_MPEG_FORMAT_FAMILY;
desc.u.mpeg.id = B_MPEG_2_AUDIO_LAYER_2;
BMediaFormats formats;
status = formats.InitCheck();
if (status)
return status;
status = formats.GetFormatFor(desc, out_format);
if (status)
return status;
out_format->u.encoded_audio.output.frame_rate = 48000; out_format->u.encoded_audio.output.frame_rate = 48000;
out_format->u.encoded_audio.output.channel_count = 2; out_format->u.encoded_audio.output.channel_count = 2;
out_format->u.encoded_audio.output.buffer_size = 1024; out_format->u.encoded_audio.output.buffer_size = 1024;
printf("GetHeaderFormat: ");
PrintFormat(*out_format);
} else {
printf("GetHeaderFormat: assuming mepeg video\n");
status_t err;
media_format_description desc;
desc.family = B_MPEG_FORMAT_FAMILY;
desc.u.mpeg.id = B_MPEG_1_VIDEO;
BMediaFormats formats;
media_format format;
err = formats.InitCheck();
if (err)
return err;
err = formats.GetFormatFor(desc, out_format);
if (err)
return err;
}
return B_OK; return B_OK;
} }
static status_t
GetHeaderFormatMpegVideo(media_format *out_format, const uint8 *header, size_t size)
{
printf("GetHeaderFormatMpegVideo\n");
status_t status;
media_format_description desc;
desc.family = B_MPEG_FORMAT_FAMILY;
desc.u.mpeg.id = B_MPEG_2_VIDEO;
BMediaFormats formats;
status = formats.InitCheck();
if (status)
return status;
return formats.GetFormatFor(desc, out_format);
}
status_t
GetHeaderFormat(media_format *out_format, const void *header, size_t size, int stream_id)
{
const uint8 *h = (const uint8 *)header;
status_t status;
printf("GetHeaderFormat: stream_id %02x\n", stream_id);
printf("inner frame header: "
"%02x %02x %02x %02x %02x %02x %02x %02x "
"%02x %02x %02x %02x %02x %02x %02x %02x\n",
h[0], h[1], h[2], h[3], h[4], h[5], h[6], h[7],
h[8], h[9], h[10], h[11], h[12], h[13], h[14], h[15]);
if (stream_id >= 0x80 && stream_id <= 0x87)
status = GetHeaderFormatAc3Audio(out_format, h, size);
else if (stream_id >= 0x88 && stream_id <= 0x8F)
status = GetHeaderFormatDtsAudio(out_format, h, size);
else if (stream_id >= 0xA0 && stream_id <= 0xA7)
status = GetHeaderFormatLpcmAudio(out_format, h, size);
else if (stream_id == 0xBD)
status = GetHeaderFormatPrivateStream(out_format, h, size);
else if (stream_id >= 0xC0 && stream_id <= 0xDF)
status = GetHeaderFormatMpegAudio(out_format, h, size);
else if (stream_id >= 0xE0 && stream_id <= 0xEF)
status = GetHeaderFormatMpegVideo(out_format, h, size);
else {
printf("GetHeaderFormat: don't know what this stream_id means\n");
status = B_ERROR;
}
if (status != B_OK) {
printf("GetHeaderFormat: failed!\n");
} else {
printf("GetHeaderFormat: out_format ");
PrintFormat(*out_format);
}
return status;
}