whitespace cleanup
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26826 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -67,9 +67,9 @@ RawDecoder::Setup(media_format *ioEncodedFormat,
|
|||||||
|
|
||||||
if (ioEncodedFormat->type != B_MEDIA_RAW_AUDIO && ioEncodedFormat->type != B_MEDIA_RAW_VIDEO)
|
if (ioEncodedFormat->type != B_MEDIA_RAW_AUDIO && ioEncodedFormat->type != B_MEDIA_RAW_VIDEO)
|
||||||
return B_ERROR;
|
return B_ERROR;
|
||||||
|
|
||||||
fInputFormat = *ioEncodedFormat;
|
fInputFormat = *ioEncodedFormat;
|
||||||
|
|
||||||
if (ioEncodedFormat->type == B_MEDIA_RAW_VIDEO) {
|
if (ioEncodedFormat->type == B_MEDIA_RAW_VIDEO) {
|
||||||
fInputSampleSize = ioEncodedFormat->u.raw_video.display.line_count * ioEncodedFormat->u.raw_video.display.bytes_per_row;
|
fInputSampleSize = ioEncodedFormat->u.raw_video.display.line_count * ioEncodedFormat->u.raw_video.display.bytes_per_row;
|
||||||
fInputFrameSize = fInputSampleSize;
|
fInputFrameSize = fInputSampleSize;
|
||||||
@@ -80,10 +80,10 @@ RawDecoder::Setup(media_format *ioEncodedFormat,
|
|||||||
|
|
||||||
// since ioEncodedFormat is later passed to the application by BMediaTrack::EncodedFormat()
|
// since ioEncodedFormat is later passed to the application by BMediaTrack::EncodedFormat()
|
||||||
// we need to remove non public format specifications
|
// we need to remove non public format specifications
|
||||||
|
|
||||||
// remove non format bits, like channel order
|
// remove non format bits, like channel order
|
||||||
ioEncodedFormat->u.raw_audio.format &= B_AUDIO_FORMAT_MASK;
|
ioEncodedFormat->u.raw_audio.format &= B_AUDIO_FORMAT_MASK;
|
||||||
|
|
||||||
switch (ioEncodedFormat->u.raw_audio.format) {
|
switch (ioEncodedFormat->u.raw_audio.format) {
|
||||||
case B_AUDIO_FORMAT_UINT8:
|
case B_AUDIO_FORMAT_UINT8:
|
||||||
case B_AUDIO_FORMAT_INT8:
|
case B_AUDIO_FORMAT_INT8:
|
||||||
@@ -91,20 +91,20 @@ RawDecoder::Setup(media_format *ioEncodedFormat,
|
|||||||
case B_AUDIO_FORMAT_INT32:
|
case B_AUDIO_FORMAT_INT32:
|
||||||
case B_AUDIO_FORMAT_FLOAT32:
|
case B_AUDIO_FORMAT_FLOAT32:
|
||||||
break; // ok to pass through
|
break; // ok to pass through
|
||||||
|
|
||||||
case B_AUDIO_FORMAT_INT24:
|
case B_AUDIO_FORMAT_INT24:
|
||||||
ioEncodedFormat->u.raw_audio.format = B_AUDIO_FORMAT_INT32;
|
ioEncodedFormat->u.raw_audio.format = B_AUDIO_FORMAT_INT32;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case B_AUDIO_FORMAT_FLOAT64:
|
case B_AUDIO_FORMAT_FLOAT64:
|
||||||
ioEncodedFormat->u.raw_audio.format = B_AUDIO_FORMAT_FLOAT32;
|
ioEncodedFormat->u.raw_audio.format = B_AUDIO_FORMAT_FLOAT32;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
TRACE("RawDecoder::Setup: unknown input format\n");
|
TRACE("RawDecoder::Setup: unknown input format\n");
|
||||||
return B_ERROR;
|
return B_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
// since we can translate to a different buffer size,
|
// since we can translate to a different buffer size,
|
||||||
// suggest something nicer than delivered by the
|
// suggest something nicer than delivered by the
|
||||||
// file reader (perhaps we should even report wildcard?)
|
// file reader (perhaps we should even report wildcard?)
|
||||||
@@ -142,7 +142,7 @@ status_t
|
|||||||
RawDecoder::NegotiateAudioOutputFormat(media_format *ioDecodedFormat)
|
RawDecoder::NegotiateAudioOutputFormat(media_format *ioDecodedFormat)
|
||||||
{
|
{
|
||||||
char s[1024];
|
char s[1024];
|
||||||
|
|
||||||
string_for_format(*ioDecodedFormat, s, sizeof(s));
|
string_for_format(*ioDecodedFormat, s, sizeof(s));
|
||||||
TRACE("RawDecoder::NegotiateAudioOutputFormat enter: %s\n", s);
|
TRACE("RawDecoder::NegotiateAudioOutputFormat enter: %s\n", s);
|
||||||
|
|
||||||
@@ -158,7 +158,7 @@ RawDecoder::NegotiateAudioOutputFormat(media_format *ioDecodedFormat)
|
|||||||
case media_raw_audio_format::B_AUDIO_INT:
|
case media_raw_audio_format::B_AUDIO_INT:
|
||||||
ioDecodedFormat->u.raw_audio.valid_bits = fInputFormat.u.raw_audio.valid_bits;
|
ioDecodedFormat->u.raw_audio.valid_bits = fInputFormat.u.raw_audio.valid_bits;
|
||||||
break; // we can produce this on request
|
break; // we can produce this on request
|
||||||
|
|
||||||
default:
|
default:
|
||||||
switch (fInputFormat.u.raw_audio.format & B_AUDIO_FORMAT_MASK) {
|
switch (fInputFormat.u.raw_audio.format & B_AUDIO_FORMAT_MASK) {
|
||||||
case media_raw_audio_format::B_AUDIO_SHORT:
|
case media_raw_audio_format::B_AUDIO_SHORT:
|
||||||
@@ -167,13 +167,13 @@ RawDecoder::NegotiateAudioOutputFormat(media_format *ioDecodedFormat)
|
|||||||
ioDecodedFormat->u.raw_audio.format = fInputFormat.u.raw_audio.format & B_AUDIO_FORMAT_MASK;
|
ioDecodedFormat->u.raw_audio.format = fInputFormat.u.raw_audio.format & B_AUDIO_FORMAT_MASK;
|
||||||
ioDecodedFormat->u.raw_audio.valid_bits = 0;
|
ioDecodedFormat->u.raw_audio.valid_bits = 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case media_raw_audio_format::B_AUDIO_INT:
|
case media_raw_audio_format::B_AUDIO_INT:
|
||||||
case B_AUDIO_FORMAT_INT24:
|
case B_AUDIO_FORMAT_INT24:
|
||||||
ioDecodedFormat->u.raw_audio.format = media_raw_audio_format::B_AUDIO_INT;
|
ioDecodedFormat->u.raw_audio.format = media_raw_audio_format::B_AUDIO_INT;
|
||||||
ioDecodedFormat->u.raw_audio.valid_bits = fInputFormat.u.raw_audio.valid_bits;
|
ioDecodedFormat->u.raw_audio.valid_bits = fInputFormat.u.raw_audio.valid_bits;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case media_raw_audio_format::B_AUDIO_FLOAT:
|
case media_raw_audio_format::B_AUDIO_FLOAT:
|
||||||
case B_AUDIO_FORMAT_FLOAT64:
|
case B_AUDIO_FORMAT_FLOAT64:
|
||||||
default:
|
default:
|
||||||
@@ -191,13 +191,13 @@ RawDecoder::NegotiateAudioOutputFormat(media_format *ioDecodedFormat)
|
|||||||
|
|
||||||
fOutputSampleSize = (ioDecodedFormat->u.raw_audio.format & B_AUDIO_FORMAT_SIZE_MASK);
|
fOutputSampleSize = (ioDecodedFormat->u.raw_audio.format & B_AUDIO_FORMAT_SIZE_MASK);
|
||||||
fOutputFrameSize = fOutputSampleSize * ioDecodedFormat->u.raw_audio.channel_count;
|
fOutputFrameSize = fOutputSampleSize * ioDecodedFormat->u.raw_audio.channel_count;
|
||||||
|
|
||||||
if (ioDecodedFormat->u.raw_audio.byte_order == 0)
|
if (ioDecodedFormat->u.raw_audio.byte_order == 0)
|
||||||
ioDecodedFormat->u.raw_audio.byte_order = B_MEDIA_HOST_ENDIAN;
|
ioDecodedFormat->u.raw_audio.byte_order = B_MEDIA_HOST_ENDIAN;
|
||||||
|
|
||||||
ioDecodedFormat->u.raw_audio.channel_mask = 0;
|
ioDecodedFormat->u.raw_audio.channel_mask = 0;
|
||||||
ioDecodedFormat->u.raw_audio.matrix_mask = 0;
|
ioDecodedFormat->u.raw_audio.matrix_mask = 0;
|
||||||
|
|
||||||
if (ioDecodedFormat->u.raw_audio.buffer_size < 128 || ioDecodedFormat->u.raw_audio.buffer_size > 65536) {
|
if (ioDecodedFormat->u.raw_audio.buffer_size < 128 || ioDecodedFormat->u.raw_audio.buffer_size > 65536) {
|
||||||
ioDecodedFormat->u.raw_audio.buffer_size = AudioBufferSize(
|
ioDecodedFormat->u.raw_audio.buffer_size = AudioBufferSize(
|
||||||
ioDecodedFormat->u.raw_audio.channel_count,
|
ioDecodedFormat->u.raw_audio.channel_count,
|
||||||
@@ -207,9 +207,9 @@ RawDecoder::NegotiateAudioOutputFormat(media_format *ioDecodedFormat)
|
|||||||
// round down to exact multiple of output frame size
|
// round down to exact multiple of output frame size
|
||||||
ioDecodedFormat->u.raw_audio.buffer_size = (ioDecodedFormat->u.raw_audio.buffer_size / fOutputFrameSize) * fOutputFrameSize;
|
ioDecodedFormat->u.raw_audio.buffer_size = (ioDecodedFormat->u.raw_audio.buffer_size / fOutputFrameSize) * fOutputFrameSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
fOutputBufferFrameCount = ioDecodedFormat->u.raw_audio.buffer_size / fOutputFrameSize;
|
fOutputBufferFrameCount = ioDecodedFormat->u.raw_audio.buffer_size / fOutputFrameSize;
|
||||||
|
|
||||||
// setup input swapping function
|
// setup input swapping function
|
||||||
if (fInputFormat.u.raw_audio.byte_order == B_MEDIA_HOST_ENDIAN) {
|
if (fInputFormat.u.raw_audio.byte_order == B_MEDIA_HOST_ENDIAN) {
|
||||||
fSwapInput = 0;
|
fSwapInput = 0;
|
||||||
@@ -288,7 +288,7 @@ RawDecoder::NegotiateAudioOutputFormat(media_format *ioDecodedFormat)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case B_AUDIO_FORMAT_INT8:
|
case B_AUDIO_FORMAT_INT8:
|
||||||
switch (ioDecodedFormat->u.raw_audio.format) {
|
switch (ioDecodedFormat->u.raw_audio.format) {
|
||||||
case B_AUDIO_FORMAT_UINT8:
|
case B_AUDIO_FORMAT_UINT8:
|
||||||
@@ -431,14 +431,14 @@ RawDecoder::NegotiateAudioOutputFormat(media_format *ioDecodedFormat)
|
|||||||
debugger("RawDecoder::NegotiateAudioOutputFormat unknown input format\n");
|
debugger("RawDecoder::NegotiateAudioOutputFormat unknown input format\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
fChunkBuffer = 0;
|
fChunkBuffer = 0;
|
||||||
fChunkSize = 0;
|
fChunkSize = 0;
|
||||||
fStartTime = 0;
|
fStartTime = 0;
|
||||||
|
|
||||||
string_for_format(*ioDecodedFormat, s, sizeof(s));
|
string_for_format(*ioDecodedFormat, s, sizeof(s));
|
||||||
TRACE("RawDecoder::NegotiateAudioOutputFormat leave: %s\n", s);
|
TRACE("RawDecoder::NegotiateAudioOutputFormat leave: %s\n", s);
|
||||||
|
|
||||||
if (ioDecodedFormat->type == 0)
|
if (ioDecodedFormat->type == 0)
|
||||||
debugger("RawDecoder::NegotiateAudioOutputFormat ioDecodedFormat->type == 0");
|
debugger("RawDecoder::NegotiateAudioOutputFormat ioDecodedFormat->type == 0");
|
||||||
/*
|
/*
|
||||||
@@ -499,7 +499,7 @@ RawDecoder::Decode(void *buffer, int64 *frameCount,
|
|||||||
}
|
}
|
||||||
// XXX should change channel order here for
|
// XXX should change channel order here for
|
||||||
// B_AUDIO_FORMAT_CHANNEL_ORDER_WAVE and B_AUDIO_FORMAT_CHANNEL_ORDER_AIFF
|
// B_AUDIO_FORMAT_CHANNEL_ORDER_WAVE and B_AUDIO_FORMAT_CHANNEL_ORDER_AIFF
|
||||||
|
|
||||||
if (fSwapOutput)
|
if (fSwapOutput)
|
||||||
fSwapOutput(buffer, *frameCount * fInputFormat.u.raw_audio.channel_count);
|
fSwapOutput(buffer, *frameCount * fInputFormat.u.raw_audio.channel_count);
|
||||||
return *frameCount ? B_OK : B_ERROR;
|
return *frameCount ? B_OK : B_ERROR;
|
||||||
|
|||||||
Reference in New Issue
Block a user