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

Read Extra Data needed by MSADPCM and others

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31004 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
David McPaul
2009-06-10 02:53:26 +00:00
parent cbec1ef4af
commit 16a89fee58
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/avcodec/avcodec.cpp
+10 -4
View File
@@ -186,7 +186,7 @@ avCodec::Setup(media_format *ioEncodedFormat, const void *infoBuffer,
} }
TRACE("avCodec: found decoder %s\n",fCodec->name); TRACE("avCodec: found decoder %s\n",fCodec->name);
if (gCodecTable[i].family == B_WAV_FORMAT_FAMILY && infoSize == sizeof(wave_format_ex)) { if (gCodecTable[i].family == B_WAV_FORMAT_FAMILY && infoSize >= sizeof(wave_format_ex)) {
const wave_format_ex *wfmt_data const wave_format_ex *wfmt_data
= (const wave_format_ex *)infoBuffer; = (const wave_format_ex *)infoBuffer;
size_t wfmt_size = infoSize; size_t wfmt_size = infoSize;
@@ -595,9 +595,15 @@ avCodec::Decode(void *out_buffer, int64 *out_frameCount,
diff2 += prof_t3 - prof_t2; diff2 += prof_t3 - prof_t2;
prof_cnt++; prof_cnt++;
if (!(fFrame % 10)) { if (!(fFrame % 10)) {
TRACE("[%c] profile: d1 = %lld, d2 = %lld (%Ld)\n", if (info) {
isAudio?('a'):('v'), diff1/prof_cnt, diff2/prof_cnt, TRACE("[%c] profile: d1 = %lld, d2 = %lld (%Ld) required %Ld\n",
fFrame); isAudio?('a'):('v'), diff1/prof_cnt, diff2/prof_cnt,
fFrame, info->time_to_decode);
} else {
TRACE("[%c] profile: d1 = %lld, d2 = %lld (%Ld) required %Ld\n",
isAudio?('a'):('v'), diff1/prof_cnt, diff2/prof_cnt,
fFrame, bigtime_t(1000000LL / fOutputFrameRate));
}
} }
#endif #endif
} }