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

* Use tracing facilities in BMediaTrack.

Browse Source 
* Turn off tracing in the Media Kit.
* Notify of unimplemented functions regardless of tracing.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24473 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-03-19 17:12:05 +00:00
parent c2848f102b
commit c844c20840
2 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/media/debug.h
+2 -2
View File
@@ -2,7 +2,7 @@
#define _MEDIA_DEBUG_OLD_H_ #define _MEDIA_DEBUG_OLD_H_
#ifndef DEBUG #ifndef DEBUG
#define DEBUG 1 #define DEBUG 0
#endif #endif
#include <Debug.h> #include <Debug.h>
@@ -40,7 +40,7 @@
#define PRINT_FORMAT(_text, _fmt) ((void)0) #define PRINT_FORMAT(_text, _fmt) ((void)0)
#define PRINT_INPUT(_text, _in) ((void)0) #define PRINT_INPUT(_text, _in) ((void)0)
#define PRINT_OUTPUT(_text, _out) ((void)0) #define PRINT_OUTPUT(_text, _out) ((void)0)
#define UNIMPLEMENTED() ((void)0) #define UNIMPLEMENTED() printf("UNIMPLEMENTED %s\n",__PRETTY_FUNCTION__)
#define BROKEN() ((void)0) #define BROKEN() ((void)0)
#define CALLED() ((void)0) #define CALLED() ((void)0)
#define PRINT(l, a...) ((void)0) #define PRINT(l, a...) ((void)0)
src/kits/media/MediaTrack.cpp
+45 -20
View File
@@ -32,6 +32,20 @@
#include "PluginManager.h" #include "PluginManager.h"
#include "debug.h" #include "debug.h"
//#define TRACE_MEDIA_TRACK
#ifdef TRACE_MEDIA_TRACK
#ifndef TRACE
#define TRACE printf
#endif
#else
#ifndef TRACE
#define TRACE(a...)
#endif
#endif
#define ERROR(a...) fprintf(stderr, a)
#define CONVERT_TO_INT32 0 // XXX test! this triggers a few bugs! #define CONVERT_TO_INT32 0 // XXX test! this triggers a few bugs!
// flags used for workarounds // flags used for workarounds
@@ -112,9 +126,11 @@ BMediaTrack::EncodedFormat(media_format *out_format) const
*out_format = *fExtractor->EncodedFormat(fStream); *out_format = *fExtractor->EncodedFormat(fStream);
#ifdef TRACE_MEDIA_TRACK
char s[200]; char s[200];
string_for_format(*out_format, s, sizeof(s)); string_for_format(*out_format, s, sizeof(s));
printf("BMediaTrack::EncodedFormat: %s\n", s); printf("BMediaTrack::EncodedFormat: %s\n", s);
#endif
return B_OK; return B_OK;
} }
@@ -141,10 +157,11 @@ BMediaTrack::DecodedFormat(media_format *inout_format, uint32 flags)
_plugin_manager.DestroyDecoder(fRawDecoder); _plugin_manager.DestroyDecoder(fRawDecoder);
fRawDecoder = 0; fRawDecoder = 0;
#ifdef TRACE_MEDIA_TRACK
char s[200]; char s[200];
string_for_format(*inout_format, s, sizeof(s)); string_for_format(*inout_format, s, sizeof(s));
printf("BMediaTrack::DecodedFormat: req1: %s\n", s); printf("BMediaTrack::DecodedFormat: req1: %s\n", s);
#endif
if ((fWorkaroundFlags & FORCE_RAW_AUDIO) || ((fWorkaroundFlags & IGNORE_ENCODED_AUDIO) && inout_format->type == B_MEDIA_ENCODED_AUDIO)) { if ((fWorkaroundFlags & FORCE_RAW_AUDIO) || ((fWorkaroundFlags & IGNORE_ENCODED_AUDIO) && inout_format->type == B_MEDIA_ENCODED_AUDIO)) {
inout_format->type = B_MEDIA_RAW_AUDIO; inout_format->type = B_MEDIA_RAW_AUDIO;
@@ -165,8 +182,10 @@ BMediaTrack::DecodedFormat(media_format *inout_format, uint32 flags)
inout_format->u.raw_audio.format = media_raw_audio_format::B_AUDIO_FLOAT; inout_format->u.raw_audio.format = media_raw_audio_format::B_AUDIO_FLOAT;
} }
#ifdef TRACE_MEDIA_TRACK
string_for_format(*inout_format, s, sizeof(s)); string_for_format(*inout_format, s, sizeof(s));
printf("BMediaTrack::DecodedFormat: req2: %s\n", s); printf("BMediaTrack::DecodedFormat: req2: %s\n", s);
#endif
media_format requested_format = *inout_format; media_format requested_format = *inout_format;
@@ -174,8 +193,10 @@ BMediaTrack::DecodedFormat(media_format *inout_format, uint32 flags)
res = fDecoder->NegotiateOutputFormat(inout_format); res = fDecoder->NegotiateOutputFormat(inout_format);
#ifdef TRACE_MEDIA_TRACK
string_for_format(*inout_format, s, sizeof(s)); string_for_format(*inout_format, s, sizeof(s));
printf("BMediaTrack::DecodedFormat: nego: %s\n", s); printf("BMediaTrack::DecodedFormat: nego: %s\n", s);
#endif
if (inout_format->type == 0) if (inout_format->type == 0)
debugger("Decoder didn't set output format type"); debugger("Decoder didn't set output format type");
@@ -284,7 +305,7 @@ BMediaTrack::ReadFrames(void *out_buffer,
fCurFrame += *out_frameCount; fCurFrame += *out_frameCount;
fCurTime = header.start_time; fCurTime = header.start_time;
} else { } else {
printf("BMediaTrack::ReadFrames: decoder returned error 0x%08lx (%s)\n", result, strerror(result)); ERROR("BMediaTrack::ReadFrames: decoder returned error 0x%08lx (%s)\n", result, strerror(result));
*out_frameCount = 0; *out_frameCount = 0;
} }
if (mh) if (mh)
@@ -330,20 +351,20 @@ BMediaTrack::SeekToTime(bigtime_t *inout_time,
time = seekTime; time = seekTime;
result = fExtractor->Seek(fStream, seekTo, &frame, &time); result = fExtractor->Seek(fStream, seekTo, &frame, &time);
if (result != B_OK) { if (result != B_OK) {
printf("BMediaTrack::SeekToTime: extractor seek failed\n"); ERROR("BMediaTrack::SeekToTime: extractor seek failed\n");
return result; return result;
} }
result = fDecoder->Seek(seekTo, 0, &frame, seekTime, &time); result = fDecoder->Seek(seekTo, 0, &frame, seekTime, &time);
if (result != B_OK) { if (result != B_OK) {
printf("BMediaTrack::SeekToTime: decoder seek failed\n"); ERROR("BMediaTrack::SeekToTime: decoder seek failed\n");
return result; return result;
} }
if (fRawDecoder) { if (fRawDecoder) {
result = fRawDecoder->Seek(seekTo, 0, &frame, seekTime, &time); result = fRawDecoder->Seek(seekTo, 0, &frame, seekTime, &time);
if (result != B_OK) { if (result != B_OK) {
printf("BMediaTrack::SeekToTime: raw decoder seek failed\n"); ERROR("BMediaTrack::SeekToTime: raw decoder seek failed\n");
return result; return result;
} }
} }
@@ -381,20 +402,20 @@ BMediaTrack::SeekToFrame(int64 *inout_frame,
frame = seekFrame; frame = seekFrame;
result = fExtractor->Seek(fStream, seekTo, &frame, &time); result = fExtractor->Seek(fStream, seekTo, &frame, &time);
if (result != B_OK) { if (result != B_OK) {
printf("BMediaTrack::SeekToFrame: extractor seek failed\n"); ERROR("BMediaTrack::SeekToFrame: extractor seek failed\n");
return result; return result;
} }
result = fDecoder->Seek(seekTo, seekFrame, &frame, 0, &time); result = fDecoder->Seek(seekTo, seekFrame, &frame, 0, &time);
if (result != B_OK) { if (result != B_OK) {
ERROR("BMediaTrack::SeekToFrame: decoder seek failed\n");
return result; return result;
printf("BMediaTrack::SeekToFrame: decoder seek failed\n");
} }
if (fRawDecoder) { if (fRawDecoder) {
result = fRawDecoder->Seek(seekTo, seekFrame, &frame, 0, &time); result = fRawDecoder->Seek(seekTo, seekFrame, &frame, 0, &time);
if (result != B_OK) { if (result != B_OK) {
printf("BMediaTrack::SeekToFrame: raw decoder seek failed\n"); ERROR("BMediaTrack::SeekToFrame: raw decoder seek failed\n");
return result; return result;
} }
} }
@@ -707,18 +728,18 @@ BMediaTrack::SetupWorkaround()
bool bool
BMediaTrack::SetupFormatTranslation(const media_format &from, media_format *to) BMediaTrack::SetupFormatTranslation(const media_format &from, media_format *to)
{ {
char s[200];
status_t res;
_plugin_manager.DestroyDecoder(fRawDecoder); _plugin_manager.DestroyDecoder(fRawDecoder);
fRawDecoder = NULL; fRawDecoder = NULL;
#ifdef TRACE_MEDIA_TRACK
char s[200];
string_for_format(from, s, sizeof(s)); string_for_format(from, s, sizeof(s));
printf("BMediaTrack::SetupFormatTranslation: from: %s\n", s); printf("BMediaTrack::SetupFormatTranslation: from: %s\n", s);
#endif
res = _plugin_manager.CreateDecoder(&fRawDecoder, from); status_t res = _plugin_manager.CreateDecoder(&fRawDecoder, from);
if (res != B_OK) { if (res != B_OK) {
printf("BMediaTrack::SetupFormatTranslation: CreateDecoder failed\n"); ERROR("BMediaTrack::SetupFormatTranslation: CreateDecoder failed\n");
return false; return false;
} }
@@ -729,28 +750,32 @@ BMediaTrack::SetupFormatTranslation(const media_format &from, media_format *to)
ChunkProvider *chunkProvider = new(std::nothrow) RawDecoderChunkProvider(fDecoder, buffer_size, frame_size); ChunkProvider *chunkProvider = new(std::nothrow) RawDecoderChunkProvider(fDecoder, buffer_size, frame_size);
if (!chunkProvider) { if (!chunkProvider) {
printf("BMediaTrack::SetupFormatTranslation: can't create chunk provider\n"); ERROR("BMediaTrack::SetupFormatTranslation: can't create chunk provider\n");
goto error; goto error;
} }
fRawDecoder->SetChunkProvider(chunkProvider); fRawDecoder->SetChunkProvider(chunkProvider);
res = fRawDecoder->Setup(&notconstFrom, 0, 0); res = fRawDecoder->Setup(&notconstFrom, 0, 0);
if (res != B_OK) { if (res != B_OK) {
printf("BMediaTrack::SetupFormatTranslation: Setup failed\n"); ERROR("BMediaTrack::SetupFormatTranslation: Setup failed\n");
goto error; goto error;
} }
#ifdef TRACE_MEDIA_TRACK
string_for_format(*to, s, sizeof(s)); string_for_format(*to, s, sizeof(s));
printf("BMediaTrack::SetupFormatTranslation: to: %s\n", s); printf("BMediaTrack::SetupFormatTranslation: to: %s\n", s);
#endif
res = fRawDecoder->NegotiateOutputFormat(to); res = fRawDecoder->NegotiateOutputFormat(to);
if (res != B_OK) { if (res != B_OK) {
printf("BMediaTrack::SetupFormatTranslation: NegotiateOutputFormat failed\n"); ERROR("BMediaTrack::SetupFormatTranslation: NegotiateOutputFormat failed\n");
goto error; goto error;
} }
#ifdef TRACE_MEDIA_TRACK
string_for_format(*to, s, sizeof(s)); string_for_format(*to, s, sizeof(s));
printf("BMediaTrack::SetupFormatTranslation: res: %s\n", s); printf("BMediaTrack::SetupFormatTranslation: res: %s\n", s);
#endif
return true; return true;
@@ -843,7 +868,7 @@ RawDecoderChunkProvider::GetNextChunk(const void **chunkBuffer, size_t *chunkSiz
*chunkSize = frames * fFrameSize; *chunkSize = frames * fFrameSize;
// printf("RawDecoderChunkProvider::GetNextChunk, %Ld frames, %ld bytes, start-time %Ld\n", frames, *chunkSize, mediaHeader->start_time); // printf("RawDecoderChunkProvider::GetNextChunk, %Ld frames, %ld bytes, start-time %Ld\n", frames, *chunkSize, mediaHeader->start_time);
} else { } else {
printf("RawDecoderChunkProvider::GetNextChunk failed\n"); ERROR("RawDecoderChunkProvider::GetNextChunk failed\n");
} }
return res; return res;
} }