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

code simplifications, initialize output in Setup for now

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6828 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty 2004-02-29 22:59:49 +00:00
parent c1381da97c
commit 681619c2ba
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.cpp
View File

@ -17,11 +17,26 @@
#define DECODE_BUFFER_SIZE (32 * 1024) #define DECODE_BUFFER_SIZE (32 * 1024)
inline size_t
AudioBufferSize(const media_raw_audio_format &raf, bigtime_t buffer_duration = 50000 /* 50 ms */) inline void
AdjustBufferSize(media_raw_audio_format * raf, bigtime_t buffer_duration = 50000 /* 50 ms */)
{ {
return (raf.format & 0xf) * (raf.channel_count) int frame_size = (raf->format & 0xf) * raf->channel_count;
* (size_t)((raf.frame_rate * buffer_duration) / 1000000.0); if (raf->buffer_size == 0) {
raf->buffer_size = frame_size * (size_t)((raf->frame_rate * buffer_duration) / 1000000.0);
} else {
raf->buffer_size = (raf->buffer_size / frame_size) * frame_size;
}
}
static media_format
vorbis_decoded_media_format()
{
media_format format;
format.type = B_MEDIA_RAW_AUDIO;
init_vorbis_media_raw_audio_format(&format.u.raw_audio);
return format;
} }
@ -93,8 +108,10 @@ VorbisDecoder::Setup(media_format *inputFormat,
// initialize decoder // initialize decoder
vorbis_synthesis_init(&fDspState,&fInfo); vorbis_synthesis_init(&fDspState,&fInfo);
vorbis_block_init(&fDspState,&fBlock); vorbis_block_init(&fDspState,&fBlock);
// setup default output
return B_OK; media_format requested_format = vorbis_decoded_media_format();
((media_raw_audio_format)requested_format.u.raw_audio) = inputFormat->u.encoded_audio.output;
return NegotiateOutputFormat(&requested_format);
} }
@ -115,24 +132,18 @@ VorbisDecoder::NegotiateOutputFormat(media_format *ioDecodedFormat)
// //
// Be R5 behavior seems to be that we can never fail. If we // Be R5 behavior seems to be that we can never fail. If we
// don't support the requested format, just return one we do. // don't support the requested format, just return one we do.
media_format format = vorbis_decoded_media_format();
ioDecodedFormat->type = B_MEDIA_RAW_AUDIO; format.u.raw_audio.frame_rate = (float)fInfo.rate;
ioDecodedFormat->u.raw_audio.format = media_raw_audio_format::B_AUDIO_FLOAT; format.u.raw_audio.channel_count = fInfo.channels;
ioDecodedFormat->u.raw_audio.byte_order = B_MEDIA_HOST_ENDIAN; format.u.raw_audio.channel_mask = B_CHANNEL_LEFT | (fInfo.channels != 1 ? B_CHANNEL_RIGHT : 0);
ioDecodedFormat->u.raw_audio.frame_rate = (float)fInfo.rate; if (!format_is_compatible(format,*ioDecodedFormat)) {
ioDecodedFormat->u.raw_audio.channel_count = fInfo.channels; *ioDecodedFormat = format;
if (ioDecodedFormat->u.raw_audio.channel_mask == 0) }
ioDecodedFormat->u.raw_audio.channel_mask = (fInfo.channels == 1) ? B_CHANNEL_LEFT : (B_CHANNEL_LEFT | B_CHANNEL_RIGHT); ioDecodedFormat->SpecializeTo(&format);
AdjustBufferSize(&ioDecodedFormat->u.raw_audio);
int frame_size = (ioDecodedFormat->u.raw_audio.format & 0xf) * ioDecodedFormat->u.raw_audio.channel_count;
if (ioDecodedFormat->u.raw_audio.buffer_size == 0 || (ioDecodedFormat->u.raw_audio.buffer_size % frame_size) != 0)
ioDecodedFormat->u.raw_audio.buffer_size = AudioBufferSize(ioDecodedFormat->u.raw_audio);
// setup output variables // setup output variables
fFrameSize = (ioDecodedFormat->u.raw_audio.format & 0xf) * fFrameSize = ioDecodedFormat->AudioFrameSize();
(ioDecodedFormat->u.raw_audio.channel_count);
fOutputBufferSize = ioDecodedFormat->u.raw_audio.buffer_size; fOutputBufferSize = ioDecodedFormat->u.raw_audio.buffer_size;
return B_OK; return B_OK;
} }