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

MediaExtractor: fix cache size computation for audio

Browse Source 
Untested. If audio is not decoding well, try increasing the constant.

Change-Id: I151764e6bb3e69088904d33bfeb683bf0569bd23
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3605
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
This commit is contained in:
Adrien Destugues 2021-01-06 18:32:29 +01:00 committed by Alex von Gluck IV
parent 437df0a3fb
commit d753645e3f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/kits/media/MediaExtractor.cpp
View File

@ -438,13 +438,20 @@ MediaExtractor::_ExtractorEntry(void* extractor)
size_t
MediaExtractor::_CalculateChunkBuffer(int32 stream)
{
const media_format* format = EncodedFormat(stream);
size_t cacheSize = 3 * 1024 * 1024;
int32 rowSize = BPrivate::get_bytes_per_row(format->ColorSpace(),
format->Width());
if (rowSize > 0) {
// Frame size, multipled by 2 for good measure
cacheSize = rowSize * format->Height() * 2;
const media_format* format = EncodedFormat(stream);
if (format->IsVideo()) {
// For video, have space for at least two frames
int32 rowSize = BPrivate::get_bytes_per_row(format->ColorSpace(),
format->Width());
if (rowSize > 0) {
cacheSize = rowSize * format->Height() * 2;
}
} else if (format->IsAudio()) {
// For audio, have space for 2000 "frames" (that's 2000/44100 = 45ms
// at 44100Hz for example)
cacheSize = format->AudioFrameSize() * 2000;
}
return ROUND_UP_TO_PAGE(cacheSize);
}