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

Media Kit: Update private code

Browse Source
This commit is contained in:
Barrett17
2018-11-25 13:02:02 +01:00
parent be805d02d7
commit ee09c29148
8 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/media/MediaDecoder.h
+4 -4
View File
@@ -5,12 +5,12 @@
#include <MediaFormats.h> #include <MediaFormats.h>
namespace BPrivate { namespace BPrivate {
class Decoder; class BDecoder;
} }
namespace BPrivate { namespace BPrivate {
namespace media { namespace media {
class Decoder; class BDecoder;
class DecoderPlugin; class BDecoderPlugin;
} }
} }
@@ -47,7 +47,7 @@ class BMediaDecoder {
status_t AttachToDecoder(); status_t AttachToDecoder();
BPrivate::media::Decoder *fDecoder; BPrivate::media::BDecoder* fDecoder;
status_t fInitStatus; status_t fInitStatus;
/* fbc data and virtuals */ /* fbc data and virtuals */
headers/os/media/MediaEncoder.h
+3 -3
View File
@@ -10,8 +10,8 @@
namespace BPrivate { namespace BPrivate {
namespace media { namespace media {
class Encoder; class BEncoder;
class EncoderPlugin; class BEncoderPlugin;
} }
} }
@@ -84,7 +84,7 @@ private:
void ReleaseEncoder(); void ReleaseEncoder();
uint32 _reserved_was_fEncoderMgr; uint32 _reserved_was_fEncoderMgr;
Encoder* fEncoder; BEncoder* fEncoder;
int32 fEncoderID; int32 fEncoderID;
bool fFormatValid; bool fFormatValid;
headers/os/media/MediaFile.h
+6 -6
View File
@@ -15,9 +15,9 @@
namespace BPrivate { namespace BPrivate {
namespace media { namespace media {
class MediaExtractor; class BMediaExtractor;
class MediaStreamer; class BMediaStreamer;
class MediaWriter; class BMediaWriter;
} }
class _AddonManager; class _AddonManager;
} }
@@ -162,18 +162,18 @@ private:
status_t ControlFile(int32 selector, void* ioData, status_t ControlFile(int32 selector, void* ioData,
size_t size); size_t size);
BPrivate::media::MediaExtractor* fExtractor; BPrivate::media::BMediaExtractor* fExtractor;
int32 _reserved_BMediaFile_was_fExtractorID; int32 _reserved_BMediaFile_was_fExtractorID;
int32 fTrackNum; int32 fTrackNum;
status_t fErr; status_t fErr;
BPrivate::_AddonManager* fEncoderMgr; BPrivate::_AddonManager* fEncoderMgr;
BPrivate::_AddonManager* fWriterMgr; BPrivate::_AddonManager* fWriterMgr;
BPrivate::media::MediaWriter* fWriter; BPrivate::media::BMediaWriter* fWriter;
int32 fWriterID; int32 fWriterID;
media_file_format fMFI; media_file_format fMFI;
BPrivate::media::MediaStreamer* fStreamer; BPrivate::media::BMediaStreamer* fStreamer;
bool fFileClosed; bool fFileClosed;
bool fDeleteSource; bool fDeleteSource;
headers/os/media/MediaTrack.h
+11 -11
View File
@@ -10,10 +10,10 @@
namespace BPrivate { namespace media { namespace BPrivate { namespace media {
class Decoder; class BDecoder;
class Encoder; class BEncoder;
class MediaExtractor; class BMediaExtractor;
class MediaWriter; class BMediaWriter;
} } } }
class BMessage; class BMessage;
@@ -219,12 +219,12 @@ private:
// For read-only access to a BMediaTrack // For read-only access to a BMediaTrack
BMediaTrack( BMediaTrack(
BPrivate::media::MediaExtractor* extractor, BPrivate::media::BMediaExtractor* extractor,
int32 streamIndex); int32 streamIndex);
// For write-only access to a BMediaTrack // For write-only access to a BMediaTrack
BMediaTrack( BMediaTrack(
BPrivate::media::MediaWriter* writer, BPrivate::media::BMediaWriter* writer,
int32 streamIndex, media_format* format, int32 streamIndex, media_format* format,
const media_codec_info* codecInfo); const media_codec_info* codecInfo);
@@ -235,9 +235,9 @@ private:
private: private:
status_t fInitStatus; status_t fInitStatus;
BPrivate::media::Decoder* fDecoder; BPrivate::media::BDecoder* fDecoder;
BPrivate::media::Decoder* fRawDecoder; BPrivate::media::BDecoder* fRawDecoder;
BPrivate::media::MediaExtractor* fExtractor; BPrivate::media::BMediaExtractor* fExtractor;
int32 fStream; int32 fStream;
int64 fCurrentFrame; int64 fCurrentFrame;
@@ -245,9 +245,9 @@ private:
media_codec_info fCodecInfo; media_codec_info fCodecInfo;
BPrivate::media::Encoder* fEncoder; BPrivate::media::BEncoder* fEncoder;
int32 fEncoderID; int32 fEncoderID;
BPrivate::media::MediaWriter* fWriter; BPrivate::media::BMediaWriter* fWriter;
media_format fFormat; media_format fFormat;
uint32 fWorkaroundFlags; uint32 fWorkaroundFlags;
src/kits/media/MediaDecoder.cpp
+1 -1
View File
@@ -199,7 +199,7 @@ BMediaDecoder::BMediaDecoder & operator=(const BMediaDecoder &);
status_t status_t
BMediaDecoder::AttachToDecoder() BMediaDecoder::AttachToDecoder()
{ {
class MediaDecoderChunkProvider : public ChunkProvider { class MediaDecoderChunkProvider : public BChunkProvider {
private: private:
BMediaDecoder * fDecoder; BMediaDecoder * fDecoder;
public: public:
src/kits/media/MediaEncoder.cpp
+1 -1
View File
@@ -226,7 +226,7 @@ BMediaEncoder::ReleaseEncoder()
status_t status_t
BMediaEncoder::_AttachToEncoder() BMediaEncoder::_AttachToEncoder()
{ {
class MediaEncoderChunkWriter : public ChunkWriter { class MediaEncoderChunkWriter : public BChunkWriter {
public: public:
MediaEncoderChunkWriter(BMediaEncoder* encoder) MediaEncoderChunkWriter(BMediaEncoder* encoder)
{ {
src/kits/media/MediaFile.cpp
+3 -3
View File
@@ -526,7 +526,7 @@ BMediaFile::_InitReader(BDataIO* source, const BUrl* url, int32 flags)
if (fErr != B_OK) if (fErr != B_OK)
return; return;
fExtractor = new(std::nothrow) MediaExtractor(source, flags); fExtractor = new(std::nothrow) BMediaExtractor(source, flags);
if (fExtractor == NULL) if (fExtractor == NULL)
fErr = B_NO_MEMORY; fErr = B_NO_MEMORY;
@@ -574,7 +574,7 @@ BMediaFile::_InitWriter(BDataIO* target, const BUrl* url,
return; return;
} }
fWriter = new(std::nothrow) MediaWriter(target, fMFI); fWriter = new(std::nothrow) BMediaWriter(target, fMFI);
if (fWriter == NULL) if (fWriter == NULL)
fErr = B_NO_MEMORY; fErr = B_NO_MEMORY;
@@ -597,7 +597,7 @@ BMediaFile::_InitStreamer(const BUrl& url, BDataIO** adapter)
TRACE(url.UrlString()); TRACE(url.UrlString());
fStreamer = new(std::nothrow) MediaStreamer(url); fStreamer = new(std::nothrow) BMediaStreamer(url);
if (fStreamer == NULL) { if (fStreamer == NULL) {
fErr = B_NO_MEMORY; fErr = B_NO_MEMORY;
return; return;
src/kits/media/MediaTrack.cpp
+7 -7
View File
@@ -58,9 +58,9 @@ enum {
// TODO: move this (after name change?) to MediaDefs.h // TODO: move this (after name change?) to MediaDefs.h
class RawDecoderChunkProvider : public ChunkProvider { class RawDecoderChunkProvider : public BChunkProvider {
public: public:
RawDecoderChunkProvider(Decoder* decoder, RawDecoderChunkProvider(BDecoder* decoder,
int buffer_size, int frame_size); int buffer_size, int frame_size);
virtual ~RawDecoderChunkProvider(); virtual ~RawDecoderChunkProvider();
@@ -69,7 +69,7 @@ public:
media_header* mediaHeader); media_header* mediaHeader);
private: private:
Decoder* fDecoder; BDecoder* fDecoder;
void* fBuffer; void* fBuffer;
int fBufferSize; int fBufferSize;
int fFrameSize; int fFrameSize;
@@ -839,7 +839,7 @@ BMediaTrack::Perform(int32 selector, void* data)
// #pragma mark - private // #pragma mark - private
BMediaTrack::BMediaTrack(BPrivate::media::MediaExtractor* extractor, BMediaTrack::BMediaTrack(BPrivate::media::BMediaExtractor* extractor,
int32 stream) int32 stream)
{ {
CALLED(); CALLED();
@@ -871,7 +871,7 @@ BMediaTrack::BMediaTrack(BPrivate::media::MediaExtractor* extractor,
} }
BMediaTrack::BMediaTrack(BPrivate::media::MediaWriter* writer, BMediaTrack::BMediaTrack(BPrivate::media::BMediaWriter* writer,
int32 streamIndex, media_format* format, int32 streamIndex, media_format* format,
const media_codec_info* codecInfo) const media_codec_info* codecInfo)
{ {
@@ -971,7 +971,7 @@ BMediaTrack::SetupFormatTranslation(const media_format &from, media_format* to)
* from.u.raw_audio.channel_count; * from.u.raw_audio.channel_count;
media_format fromNotConst = from; media_format fromNotConst = from;
ChunkProvider* chunkProvider BChunkProvider* chunkProvider
= new (std::nothrow) RawDecoderChunkProvider(fDecoder, buffer_size, = new (std::nothrow) RawDecoderChunkProvider(fDecoder, buffer_size,
frame_size); frame_size);
if (chunkProvider == NULL) { if (chunkProvider == NULL) {
@@ -1087,7 +1087,7 @@ status_t BMediaTrack::_Reserved_BMediaTrack_46(int32 arg, ...) { return B_ERROR;
status_t BMediaTrack::_Reserved_BMediaTrack_47(int32 arg, ...) { return B_ERROR; } status_t BMediaTrack::_Reserved_BMediaTrack_47(int32 arg, ...) { return B_ERROR; }
RawDecoderChunkProvider::RawDecoderChunkProvider(Decoder* decoder, RawDecoderChunkProvider::RawDecoderChunkProvider(BDecoder* decoder,
int buffer_size, int frame_size) int buffer_size, int frame_size)
{ {
// printf("RawDecoderChunkProvider: buffer_size %d, frame_size %d\n", // printf("RawDecoderChunkProvider: buffer_size %d, frame_size %d\n",