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

Slightly improved error reporting for CreateDecoder (now with error code).

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6238 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-01-23 07:11:15 +00:00
parent 0f34281e3e
commit 68b80bbdb9
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/MediaExtractor.cpp
+13 -9
View File
@@ -1,25 +1,28 @@
#include "MediaExtractor.h" #include "MediaExtractor.h"
#include "PluginManager.h" #include "PluginManager.h"
#include "debug.h" #include "debug.h"
#include <stdio.h>
#include <string.h>
#include <Autolock.h> #include <Autolock.h>
MediaExtractor::MediaExtractor(BDataIO * source, int32 flags) #include <stdio.h>
#include <string.h>
MediaExtractor::MediaExtractor(BDataIO *source, int32 flags)
{ {
CALLED(); CALLED();
fSource = source; fSource = source;
fStreamInfo = 0; fStreamInfo = 0;
fErr = _CreateReader(&fReader, &fStreamCount, &fMff, source); fErr = _CreateReader(&fReader, &fStreamCount, &fMff, source);
if (fErr) { if (fErr) {
fStreamCount = 0; fStreamCount = 0;
fReader = 0; fReader = 0;
return; return;
} }
fStreamInfo = new stream_info[fStreamCount]; fStreamInfo = new stream_info[fStreamCount];
// initialize stream infos // initialize stream infos
for (int32 i = 0; i < fStreamCount; i++) { for (int32 i = 0; i < fStreamCount; i++) {
fStreamInfo[i].status = B_OK; fStreamInfo[i].status = B_OK;
@@ -28,7 +31,7 @@ MediaExtractor::MediaExtractor(BDataIO * source, int32 flags)
fStreamInfo[i].infoBufferSize = 0; fStreamInfo[i].infoBufferSize = 0;
memset(&fStreamInfo[i].encodedFormat, 0, sizeof(fStreamInfo[i].encodedFormat)); memset(&fStreamInfo[i].encodedFormat, 0, sizeof(fStreamInfo[i].encodedFormat));
} }
// create all stream cookies // create all stream cookies
for (int32 i = 0; i < fStreamCount; i++) { for (int32 i = 0; i < fStreamCount; i++) {
if (B_OK != fReader->AllocateCookie(i, &fStreamInfo[i].cookie)) { if (B_OK != fReader->AllocateCookie(i, &fStreamInfo[i].cookie)) {
@@ -192,11 +195,12 @@ MediaExtractor::CreateDecoder(int32 stream, Decoder **decoder, media_codec_info
return res; return res;
} }
(*decoder)->Setup(new MediaExtractorChunkProvider(this,stream)); (*decoder)->Setup(new MediaExtractorChunkProvider(this, stream));
res = (*decoder)->Setup(&fStreamInfo[stream].encodedFormat, fStreamInfo[stream].infoBuffer , fStreamInfo[stream].infoBufferSize); res = (*decoder)->Setup(&fStreamInfo[stream].encodedFormat, fStreamInfo[stream].infoBuffer , fStreamInfo[stream].infoBufferSize);
if (res != B_OK) { if (res != B_OK) {
printf("MediaExtractor::CreateDecoder Setup failed for stream %ld\n", stream); printf("MediaExtractor::CreateDecoder Setup failed for stream %ld: %ld (%s)\n",
stream, res, strerror(res));
} }
return res; return res;
} }