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

* Split debug output into general, audio and video (video output not done).

Browse Source 
* Set the AVContext->frame_size, though I don't think it has any effect.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37707 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2010-07-23 09:16:18 +00:00
parent 5061b3521f
commit ba0f80c46b
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
View File

@ -24,8 +24,12 @@
//#define TRACE_AV_CODEC //#define TRACE_AV_CODEC
#ifdef TRACE_AV_CODEC #ifdef TRACE_AV_CODEC
# define TRACE(x...) printf(x) # define TRACE(x...) printf(x)
# define TRACE_AUDIO(x...) printf(x)
# define TRACE_VIDEO(x...) printf(x)
#else #else
# define TRACE(x...) # define TRACE(x...)
# define TRACE_AUDIO(x...)
# define TRACE_VIDEO(x...)
#endif #endif
//#define LOG_STREAM_TO_FILE //#define LOG_STREAM_TO_FILE
@ -370,6 +374,7 @@ AVCodecDecoder::_NegotiateAudioOutputFormat(media_format* inOutFormat)
inOutFormat->u.raw_audio = outputAudioFormat; inOutFormat->u.raw_audio = outputAudioFormat;
fContext->bit_rate = (int)fInputFormat.u.encoded_audio.bit_rate; fContext->bit_rate = (int)fInputFormat.u.encoded_audio.bit_rate;
fContext->frame_size = (int)fInputFormat.u.encoded_audio.frame_size;
fContext->sample_rate fContext->sample_rate
= (int)fInputFormat.u.encoded_audio.output.frame_rate; = (int)fInputFormat.u.encoded_audio.output.frame_rate;
fContext->channels = fInputFormat.u.encoded_audio.output.channel_count; fContext->channels = fInputFormat.u.encoded_audio.output.channel_count;
@ -545,18 +550,20 @@ status_t
AVCodecDecoder::_DecodeAudio(void* outBuffer, int64* outFrameCount, AVCodecDecoder::_DecodeAudio(void* outBuffer, int64* outFrameCount,
media_header* mediaHeader, media_decode_info* info) media_header* mediaHeader, media_decode_info* info)
{ {
// TRACE("audio start_time %.6f\n", mediaHeader->start_time / 1000000.0); TRACE_AUDIO("AVCodecDecoder::_DecodeAudio()\n");
// TRACE_AUDIO(" audio start_time %.6f\n",
// mediaHeader->start_time / 1000000.0);
char* output_buffer = (char*)outBuffer; char* output_buffer = (char*)outBuffer;
*outFrameCount = 0; *outFrameCount = 0;
while (*outFrameCount < fOutputFrameCount) { while (*outFrameCount < fOutputFrameCount) {
if (fOutputBufferSize < 0) { if (fOutputBufferSize < 0) {
TRACE("############ fOutputBufferSize %ld\n", TRACE_AUDIO(" ############ fOutputBufferSize %ld\n",
fOutputBufferSize); fOutputBufferSize);
fOutputBufferSize = 0; fOutputBufferSize = 0;
} }
if (fChunkBufferSize < 0) { if (fChunkBufferSize < 0) {
TRACE("############ fChunkBufferSize %ld\n", TRACE_AUDIO(" ############ fChunkBufferSize %ld\n",
fChunkBufferSize); fChunkBufferSize);
fChunkBufferSize = 0; fChunkBufferSize = 0;
} }
@ -576,9 +583,11 @@ AVCodecDecoder::_DecodeAudio(void* outBuffer, int64* outFrameCount,
if (fChunkBufferSize == 0) { if (fChunkBufferSize == 0) {
media_header chunkMediaHeader; media_header chunkMediaHeader;
status_t err; status_t err;
err = GetNextChunk(&fChunkBuffer, &fChunkBufferSize, &chunkMediaHeader); err = GetNextChunk(&fChunkBuffer, &fChunkBufferSize,
&chunkMediaHeader);
if (err == B_LAST_BUFFER_ERROR) { if (err == B_LAST_BUFFER_ERROR) {
TRACE("Last Chunk with chunk size %ld\n",fChunkBufferSize); TRACE_AUDIO(" Last Chunk with chunk size %ld\n",
fChunkBufferSize);
fChunkBufferSize = 0; fChunkBufferSize = 0;
return err; return err;
} }
@ -601,7 +610,7 @@ AVCodecDecoder::_DecodeAudio(void* outBuffer, int64* outFrameCount,
fChunkBufferSize); fChunkBufferSize);
if (len < 0) { if (len < 0) {
if (!fAudioDecodeError) { if (!fAudioDecodeError) {
TRACE("########### audio decode error, " printf("########### audio decode error, "
"fChunkBufferSize %ld, fChunkBufferOffset %ld\n", "fChunkBufferSize %ld, fChunkBufferOffset %ld\n",
fChunkBufferSize, fChunkBufferOffset); fChunkBufferSize, fChunkBufferOffset);
fAudioDecodeError = true; fAudioDecodeError = true;
@ -619,6 +628,7 @@ AVCodecDecoder::_DecodeAudio(void* outBuffer, int64* outFrameCount,
fOutputBufferSize = out_size; fOutputBufferSize = out_size;
} }
} }
TRACE_AUDIO(" frame count: %lld\n", *outFrameCount);
fFrame += *outFrameCount; fFrame += *outFrameCount;
// TRACE("Played %Ld frames at time %Ld\n",*outFrameCount, mediaHeader->start_time); // TRACE("Played %Ld frames at time %Ld\n",*outFrameCount, mediaHeader->start_time);