media_kit: Remove most private dependencies from codec_kit

* Move to BCodecKit namespace and make extensive use
of BCodecRoster.
* This is a first step in the right direction of
decreasing private dependencies. Some APIs are being
translated to the CodecKit. I am doing an investigation
on which APIs are really used among apps, so that the new
kit can be more slim and oriented toward easy development
and can be extended in the right direction instead to
continue maintaning unuseful code.
* BMediaFormats needs still a bit of love.
* General improvements in style and code maintainability.
This commit is contained in:
Barrett17
2018-11-27 11:38:05 +01:00
parent 5232a91136
commit 278d03da22
10 changed files with 74 additions and 85 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef MEDIADECODER_H
#define MEDIADECODER_H
#include <MediaDefs.h>
#include <MediaFormats.h>
+4 -8
View File
@@ -8,14 +8,10 @@
#include <MediaFormats.h>
namespace BPrivate {
namespace media {
class BEncoder;
class BEncoderPlugin;
}
}
using namespace BPrivate::media;
namespace BCodecKit {
class BEncoder;
}
class BMediaEncoder {
@@ -84,7 +80,7 @@ private:
void ReleaseEncoder();
uint32 _reserved_was_fEncoderMgr;
BEncoder* fEncoder;
BCodecKit::BEncoder* fEncoder;
int32 fEncoderID;
bool fFormatValid;
+9 -8
View File
@@ -13,12 +13,13 @@
#include <StorageDefs.h>
namespace BCodecKit {
class BMediaExtractor;
class BMediaStreamer;
class BMediaWriter;
}
namespace BPrivate {
namespace media {
class BMediaExtractor;
class BMediaStreamer;
class BMediaWriter;
}
class _AddonManager;
}
@@ -162,18 +163,18 @@ private:
status_t ControlFile(int32 selector, void* ioData,
size_t size);
BPrivate::media::BMediaExtractor* fExtractor;
BCodecKit::BMediaExtractor* fExtractor;
int32 _reserved_BMediaFile_was_fExtractorID;
int32 fTrackNum;
status_t fErr;
BPrivate::_AddonManager* fEncoderMgr;
BPrivate::_AddonManager* fWriterMgr;
BPrivate::media::BMediaWriter* fWriter;
BCodecKit::BMediaWriter* fWriter;
int32 fWriterID;
media_file_format fMFI;
BPrivate::media::BMediaStreamer* fStreamer;
BCodecKit::BMediaStreamer* fStreamer;
bool fFileClosed;
bool fDeleteSource;
+9 -9
View File
@@ -9,12 +9,12 @@
#include <MediaFormats.h>
namespace BPrivate { namespace media {
namespace BCodecKit {
class BDecoder;
class BEncoder;
class BMediaExtractor;
class BMediaWriter;
} }
}
class BMessage;
class BView;
@@ -219,12 +219,12 @@ private:
// For read-only access to a BMediaTrack
BMediaTrack(
BPrivate::media::BMediaExtractor* extractor,
BCodecKit::BMediaExtractor* extractor,
int32 streamIndex);
// For write-only access to a BMediaTrack
BMediaTrack(
BPrivate::media::BMediaWriter* writer,
BCodecKit::BMediaWriter* writer,
int32 streamIndex, media_format* format,
const media_codec_info* codecInfo);
@@ -235,9 +235,9 @@ private:
private:
status_t fInitStatus;
BPrivate::media::BDecoder* fDecoder;
BPrivate::media::BDecoder* fRawDecoder;
BPrivate::media::BMediaExtractor* fExtractor;
BCodecKit::BDecoder* fDecoder;
BCodecKit::BDecoder* fRawDecoder;
BCodecKit::BMediaExtractor* fExtractor;
int32 fStream;
int64 fCurrentFrame;
@@ -245,9 +245,9 @@ private:
media_codec_info fCodecInfo;
BPrivate::media::BEncoder* fEncoder;
BCodecKit::BEncoder* fEncoder;
int32 fEncoderID;
BPrivate::media::BMediaWriter* fWriter;
BCodecKit::BMediaWriter* fWriter;
media_format fFormat;
uint32 fWorkaroundFlags;