- Implemented MediaExtractor::Copyright, which just calls the instantiated reader
- Implemented BMediaFile::Copyright, which just calls Copyright() of the extractor. So this is just a simple pass through. - Style cleanup (mostly whitespaces) Problem is that our readers currently return the copyright of the source code, not the copyright of the MediaFile itself, like the BeBook documents. Thus, we might need to change all readers to return appropiate data or behave differently for Haiku readers. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25356 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -32,6 +32,8 @@ public:
|
|||||||
|
|
||||||
int32 StreamCount();
|
int32 StreamCount();
|
||||||
|
|
||||||
|
const char* Copyright();
|
||||||
|
|
||||||
const media_format * EncodedFormat(int32 stream);
|
const media_format * EncodedFormat(int32 stream);
|
||||||
int64 CountFrames(int32 stream) const;
|
int64 CountFrames(int32 stream) const;
|
||||||
bigtime_t Duration(int32 stream) const;
|
bigtime_t Duration(int32 stream) const;
|
||||||
@@ -45,7 +47,8 @@ public:
|
|||||||
const void **chunkBuffer, size_t *chunkSize,
|
const void **chunkBuffer, size_t *chunkSize,
|
||||||
media_header *mediaHeader);
|
media_header *mediaHeader);
|
||||||
|
|
||||||
status_t CreateDecoder(int32 stream, Decoder **decoder, media_codec_info *mci);
|
status_t CreateDecoder(int32 stream, Decoder **decoder,
|
||||||
|
media_codec_info *mci);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static int32 extractor_thread(void *arg);
|
static int32 extractor_thread(void *arg);
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
** Copyright 2004-2007, Marcus Overhagen. All rights reserved.
|
** Copyright 2004-2007, Marcus Overhagen. All rights reserved.
|
||||||
|
** Copyright 2008, Maurice Kalinowski. All rights reserved.
|
||||||
** Distributed under the terms of the MIT License.
|
** Distributed under the terms of the MIT License.
|
||||||
*/
|
*/
|
||||||
#include "MediaExtractor.h"
|
#include "MediaExtractor.h"
|
||||||
@@ -132,6 +133,13 @@ MediaExtractor::StreamCount()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const char*
|
||||||
|
MediaExtractor::Copyright()
|
||||||
|
{
|
||||||
|
return fReader->Copyright();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
const media_format *
|
const media_format *
|
||||||
MediaExtractor::EncodedFormat(int32 stream)
|
MediaExtractor::EncodedFormat(int32 stream)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -153,8 +153,7 @@ BMediaFile::GetFileFormatInfo(media_file_format *mfi) const
|
|||||||
const char *
|
const char *
|
||||||
BMediaFile::Copyright(void) const
|
BMediaFile::Copyright(void) const
|
||||||
{
|
{
|
||||||
UNIMPLEMENTED();
|
return fExtractor->Copyright();
|
||||||
return "";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user