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

NegotiateOutputFormat can not error in any situation -- really

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6431 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2004-01-30 09:21:22 +00:00
parent ba47158dc9
commit d7f45f5855
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/speex/speexCodecPlugin.cpp
+2 -5
View File
@@ -203,6 +203,8 @@ SpeexDecoder::NegotiateOutputFormat(media_format *ioDecodedFormat)
// that will be output; this can be different if you // that will be output; this can be different if you
// specified any wildcards. // specified any wildcards.
// //
// Be R5 behavior seems to be that we can never fail. If we
// don't support the requested format, just return one we do.
media_format format = speex_decoded_media_format(); media_format format = speex_decoded_media_format();
format.u.raw_audio.frame_rate = (float)fHeader->rate; format.u.raw_audio.frame_rate = (float)fHeader->rate;
format.u.raw_audio.channel_count = fHeader->nb_channels; format.u.raw_audio.channel_count = fHeader->nb_channels;
@@ -216,12 +218,7 @@ SpeexDecoder::NegotiateOutputFormat(media_format *ioDecodedFormat)
buffer_size = ((buffer_size - 1) / output_length + 1) * output_length; buffer_size = ((buffer_size - 1) / output_length + 1) * output_length;
format.u.raw_audio.buffer_size = buffer_size; format.u.raw_audio.buffer_size = buffer_size;
if (!format_is_compatible(format,*ioDecodedFormat)) { if (!format_is_compatible(format,*ioDecodedFormat)) {
#ifdef NegotiateOutputFormat_AS_BEBOOK_SPEC
return B_ERROR;
#else
// Be R5 behavior: never fail (?) => nuke the input format
*ioDecodedFormat = format; *ioDecodedFormat = format;
#endif
} }
ioDecodedFormat->SpecializeTo(&format); ioDecodedFormat->SpecializeTo(&format);
// setup output variables // setup output variables
src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.cpp
+2 -5
View File
@@ -125,6 +125,8 @@ VorbisDecoder::NegotiateOutputFormat(media_format *ioDecodedFormat)
// that will be output; this can be different if you // that will be output; this can be different if you
// specified any wildcards. // specified any wildcards.
// //
// Be R5 behavior seems to be that we can never fail. If we
// don't support the requested format, just return one we do.
media_format format = vorbis_decoded_media_format(); media_format format = vorbis_decoded_media_format();
format.u.raw_audio.frame_rate = (float)fInfo.rate; format.u.raw_audio.frame_rate = (float)fInfo.rate;
format.u.raw_audio.channel_count = fInfo.channels; format.u.raw_audio.channel_count = fInfo.channels;
@@ -133,12 +135,7 @@ VorbisDecoder::NegotiateOutputFormat(media_format *ioDecodedFormat)
format.u.raw_audio.buffer_size = AudioBufferSize(&format.u.raw_audio); format.u.raw_audio.buffer_size = AudioBufferSize(&format.u.raw_audio);
} }
if (!format_is_compatible(format,*ioDecodedFormat)) { if (!format_is_compatible(format,*ioDecodedFormat)) {
#ifdef NegotiateOutputFormat_AS_BEBOOK_SPEC
return B_ERROR;
#else
// Be R5 behavior: never fail (?) => nuke the input format
*ioDecodedFormat = format; *ioDecodedFormat = format;
#endif
} }
ioDecodedFormat->SpecializeTo(&format); ioDecodedFormat->SpecializeTo(&format);
// setup output variables // setup output variables