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

support for non stereo data (like mono, or 4 channel)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6587 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper 2004-02-14 01:09:03 +00:00
parent 6647639ac6
commit 39be96dee0
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/add-ons/media/plugins/avcodec/avcodec.cpp
View File

@ -243,7 +243,8 @@ avCodec::NegotiateOutputFormat(media_format *inout_format)
PRINT(("audio: bit_rate = %d, sample_rate = %d, chans = %d\n", ffc->bit_rate, ffc->sample_rate, ffc->channels));
fStartTime = 0;
fOutputFrameCount = outputAudioFormat.buffer_size / (2 * outputAudioFormat.channel_count);
fOutputFrameSize = 2 * outputAudioFormat.channel_count;
fOutputFrameCount = outputAudioFormat.buffer_size / fOutputFrameSize;
fOutputFrameRate = outputAudioFormat.frame_rate;
fChunkBuffer = 0;
fChunkBufferOffset = 0;
@ -349,11 +350,11 @@ avCodec::Decode(void *out_buffer, int64 *out_frameCount,
}
if (fOutputBufferSize > 0) {
int32 frames = min_c(fOutputFrameCount - *out_frameCount, fOutputBufferSize / 4);
memcpy(output_buffer, fOutputBuffer + fOutputBufferOffset, frames * 4);
fOutputBufferOffset += frames * 4;
fOutputBufferSize -= frames * 4;
output_buffer += frames * 4;
int32 frames = min_c(fOutputFrameCount - *out_frameCount, fOutputBufferSize / fOutputFrameSize);
memcpy(output_buffer, fOutputBuffer + fOutputBufferOffset, frames * fOutputFrameSize);
fOutputBufferOffset += frames * fOutputFrameSize;
fOutputBufferSize -= frames * fOutputFrameSize;
output_buffer += frames * fOutputFrameSize;
*out_frameCount += frames;
fStartTime += (bigtime_t)((1000000LL * frames) / fOutputFrameRate);
continue;

1
src/add-ons/media/plugins/avcodec/avcodec.h
View File

@ -81,6 +81,7 @@ class avCodec : public Decoder
bigtime_t fStartTime;
int32 fOutputFrameCount;
float fOutputFrameRate;
int fOutputFrameSize; // sample size * channel count
char * fChunkBuffer;
int32 fChunkBufferOffset;