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

* ChunkCache::fLocker is now aggregated.

Browse Source 
* Cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34239 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-11-25 11:51:24 +00:00
parent 40fddd06d6
commit 608d959d73
4 changed files with 229 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/media/MediaExtractor.h
+46 -39
View File
@@ -1,78 +1,85 @@
/*
* Copyright 2004-2007, Marcus Overhagen. All rights reserved.
* Copyright 2008, Maurice Kalinowski. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _MEDIA_EXTRACTOR_H
#define _MEDIA_EXTRACTOR_H
#include "ReaderPlugin.h"
#include "DecoderPlugin.h"
namespace BPrivate {
namespace media {
class ChunkCache;
struct stream_info
{
struct stream_info {
status_t status;
void * cookie;
void* cookie;
bool hasCookie;
const void * infoBuffer;
const void* infoBuffer;
size_t infoBufferSize;
ChunkCache * chunkCache;
ChunkCache* chunkCache;
media_format encodedFormat;
};
class MediaExtractor
{
class MediaExtractor {
public:
MediaExtractor(BDataIO * source, int32 flags);
~MediaExtractor();
MediaExtractor(BDataIO* source, int32 flags);
~MediaExtractor();
status_t InitCheck();
status_t InitCheck();
void GetFileFormatInfo(media_file_format *mfi) const;
void GetFileFormatInfo(
media_file_format* fileFormat) const;
int32 StreamCount();
int32 StreamCount();
const char* Copyright();
const char* Copyright();
const media_format * EncodedFormat(int32 stream);
int64 CountFrames(int32 stream) const;
bigtime_t Duration(int32 stream) const;
const media_format* EncodedFormat(int32 stream);
int64 CountFrames(int32 stream) const;
bigtime_t Duration(int32 stream) const;
status_t Seek(int32 stream, uint32 seekTo,
int64 *frame, bigtime_t *time);
status_t FindKeyFrame(int32 stream, uint32 seekTo,
int64 *frame, bigtime_t *time) const;
status_t Seek(int32 stream, uint32 seekTo, int64* _frame,
bigtime_t* _time);
status_t FindKeyFrame(int32 stream, uint32 seekTo,
int64* _frame, bigtime_t* _time) const;
status_t GetNextChunk(int32 stream,
const void **chunkBuffer, size_t *chunkSize,
media_header *mediaHeader);
status_t GetNextChunk(int32 stream,
const void** _chunkBuffer,
size_t* _chunkSize,
media_header* mediaHeader);
status_t CreateDecoder(int32 stream, Decoder **decoder,
media_codec_info *mci);
status_t CreateDecoder(int32 stream, Decoder** _decoder,
media_codec_info* codecInfo);
private:
static int32 extractor_thread(void *arg);
void ExtractorThread();
static int32 _ExtractorEntry(void* arg);
void _ExtractorThread();
private:
status_t fErr;
status_t fInitStatus;
sem_id fExtractorWaitSem;
thread_id fExtractorThread;
volatile bool fTerminateExtractor;
sem_id fExtractorWaitSem;
thread_id fExtractorThread;
volatile bool fTerminateExtractor;
BDataIO *fSource;
Reader *fReader;
BDataIO* fSource;
Reader* fReader;
stream_info * fStreamInfo;
int32 fStreamCount;
stream_info* fStreamInfo;
int32 fStreamCount;
media_file_format fMff;
media_file_format fFileFormat;
};
}; // namespace media
}; // namespace BPrivate
} // namespace media
} // namespace BPrivate
using namespace BPrivate::media;
#endif
#endif // _MEDIA_EXTRACTOR_H