From d33bd9ec7b1eeb693eb9971bb24aacee02e60170 Mon Sep 17 00:00:00 2001 From: Barrett17 Date: Mon, 26 Nov 2018 13:18:35 +0100 Subject: [PATCH] Codec Kit: Introduce BCodecKit namespace --- headers/os/codec/AdapterIO.h | 7 ++ headers/os/codec/CodecRoster.h | 9 +- headers/os/codec/Decoder.h | 13 +-- headers/os/codec/Encoder.h | 14 +-- headers/os/codec/MediaExtractor.h | 10 +-- headers/os/codec/MediaIO.h | 7 ++ headers/os/codec/MediaPlugin.h | 20 +++-- headers/os/codec/MediaStreamer.h | 10 +-- headers/os/codec/MediaWriter.h | 9 +- headers/os/codec/MetaData.h | 9 +- headers/os/codec/Reader.h | 14 +-- headers/os/codec/Streamer.h | 12 +-- headers/os/codec/Writer.h | 15 ++-- headers/os/media/MediaDecoder.h | 14 ++- headers/private/codec/AddOnManager.h | 7 +- headers/private/codec/PluginManager.h | 12 ++- .../media/plugins/ffmpeg/AVCodecDecoder.h | 1 + .../media/plugins/ffmpeg/AVCodecEncoder.h | 1 + .../media/plugins/ffmpeg/AVFormatReader.h | 2 + .../media/plugins/ffmpeg/AVFormatWriter.h | 2 + .../media/plugins/ffmpeg/FFmpegPlugin.h | 2 + src/kits/codec/AdapterIO.cpp | 8 +- src/kits/codec/AddOnManager.cpp | 5 +- src/kits/codec/ChunkCache.cpp | 8 ++ src/kits/codec/ChunkCache.h | 6 +- src/kits/codec/CodecRoster.cpp | 6 ++ src/kits/codec/Decoder.cpp | 6 ++ src/kits/codec/Encoder.cpp | 6 ++ src/kits/codec/MediaExtractor.cpp | 11 ++- src/kits/codec/MediaIO.cpp | 6 ++ src/kits/codec/MediaPlugin.cpp | 6 ++ src/kits/codec/MediaStreamer.cpp | 6 ++ src/kits/codec/MediaWriter.cpp | 6 ++ src/kits/codec/MetaData.cpp | 89 ++++++++++--------- src/kits/codec/PluginManager.cpp | 8 ++ src/kits/codec/Reader.cpp | 6 ++ src/kits/codec/Streamer.cpp | 6 ++ src/kits/codec/Writer.cpp | 6 ++ src/kits/media/MediaDecoder.cpp | 9 +- 39 files changed, 258 insertions(+), 136 deletions(-) diff --git a/headers/os/codec/AdapterIO.h b/headers/os/codec/AdapterIO.h index 81910065e3..82ef19b4a2 100644 --- a/headers/os/codec/AdapterIO.h +++ b/headers/os/codec/AdapterIO.h @@ -12,6 +12,9 @@ #include +namespace BCodecKit { + + class BAdapterIO; class RelativePositionIO; @@ -95,4 +98,8 @@ private: uint32 _reserved[5]; }; + +} // namespace BCodecKit + + #endif // _ADAPTER_IO_H diff --git a/headers/os/codec/CodecRoster.h b/headers/os/codec/CodecRoster.h index 1d8bd2a746..b7be6c4657 100644 --- a/headers/os/codec/CodecRoster.h +++ b/headers/os/codec/CodecRoster.h @@ -5,6 +5,7 @@ #ifndef _CODEC_ROSTER_H #define _CODEC_ROSTER_H + #include #include #include @@ -13,8 +14,7 @@ #include -namespace BPrivate { -namespace media { +namespace BCodecKit { class BCodecRoster { @@ -118,9 +118,8 @@ public: static status_t GetNextEncoder(int32* cookie, media_codec_info* _codecInfo); }; -} // namespace media -} // namespace BPrivate -using namespace BPrivate::media; +} // namespace BCodecKit + #endif // _CODEC_ROSTER_H diff --git a/headers/os/codec/Decoder.h b/headers/os/codec/Decoder.h index a2f65dc53b..8dfcdda74a 100644 --- a/headers/os/codec/Decoder.h +++ b/headers/os/codec/Decoder.h @@ -8,9 +8,12 @@ #include "MediaPlugin.h" -namespace BPrivate { namespace media { +namespace BCodecKit { + +namespace BPrivate { + class PluginManager; +} -class PluginManager; class BChunkProvider { public: @@ -63,7 +66,7 @@ private: BMediaPlugin* fMediaPlugin; // needed for plug-in reference count management - friend class PluginManager; + friend class BCodecKit::BPrivate::PluginManager; virtual void _ReservedDecoder1(); virtual void _ReservedDecoder2(); @@ -84,8 +87,8 @@ public: size_t* count) = 0; }; -} } // namespace BPrivate::media -using namespace BPrivate::media; +} // namespace BCodecKit + #endif // _DECODER_PLUGIN_H diff --git a/headers/os/codec/Encoder.h b/headers/os/codec/Encoder.h index 8ce5034320..c4a94a6ff5 100644 --- a/headers/os/codec/Encoder.h +++ b/headers/os/codec/Encoder.h @@ -6,16 +6,18 @@ #define _ENCODER_PLUGIN_H +#include #include #include #include -#include "MediaPlugin.h" +namespace BCodecKit { -namespace BPrivate { namespace media { +namespace BPrivate { + class PluginManager; +} -class PluginManager; class BChunkWriter { public: @@ -94,7 +96,7 @@ private: BMediaPlugin* fMediaPlugin; // needed for plug-in reference count management - friend class PluginManager; + friend class BCodecKit::BPrivate::PluginManager; virtual void _ReservedEncoder1(); virtual void _ReservedEncoder2(); @@ -139,8 +141,8 @@ public: media_format* outputFormat) = 0; }; -} } // namespace BPrivate::media -using namespace BPrivate::media; +} + #endif // _ENCODER_PLUGIN_H diff --git a/headers/os/codec/MediaExtractor.h b/headers/os/codec/MediaExtractor.h index 978fcf42d1..df79b12334 100644 --- a/headers/os/codec/MediaExtractor.h +++ b/headers/os/codec/MediaExtractor.h @@ -14,12 +14,9 @@ #include -namespace BPrivate { -namespace media { +namespace BCodecKit { -class ChunkCache; -struct chunk_buffer; struct stream_info; @@ -85,9 +82,8 @@ private: uint32 fReserved[5]; }; -} // namespace media -} // namespace BPrivate -using namespace BPrivate::media; +} // namespace BCodecKit + #endif // _MEDIA_EXTRACTOR_H diff --git a/headers/os/codec/MediaIO.h b/headers/os/codec/MediaIO.h index 260c4de131..1a86862a99 100644 --- a/headers/os/codec/MediaIO.h +++ b/headers/os/codec/MediaIO.h @@ -10,6 +10,9 @@ #include +namespace BCodecKit { + + enum media_io_flags { B_MEDIA_STREAMING = 0x00000001, @@ -41,4 +44,8 @@ private: uint32 _reserved[5]; }; + +} // namespace BCodecKit + + #endif // _MEDIA_IO_H diff --git a/headers/os/codec/MediaPlugin.h b/headers/os/codec/MediaPlugin.h index da62cb0386..d3809b40a7 100644 --- a/headers/os/codec/MediaPlugin.h +++ b/headers/os/codec/MediaPlugin.h @@ -5,9 +5,15 @@ #ifndef _MEDIA_PLUGIN_H #define _MEDIA_PLUGIN_H + #include -namespace BPrivate { namespace media { + +namespace BCodecKit { + +namespace BPrivate { + class PluginManager; +} // TODO: Shouldn't this be a BReferenceable? @@ -23,7 +29,7 @@ private: int32 fRefCount; // needed for plug-in reference count management - friend class PluginManager; + friend class BCodecKit::BPrivate::PluginManager; virtual void _ReservedMediaPlugin1(); virtual void _ReservedMediaPlugin2(); @@ -31,13 +37,11 @@ private: uint32 fReserved[5]; }; -class BDecoder; -class BReader; - -} } // namespace BPrivate::media - -using namespace BPrivate::media; extern "C" BMediaPlugin* instantiate_plugin(); + +} // namespace BCodecKit + + #endif // _MEDIA_PLUGIN_H diff --git a/headers/os/codec/MediaStreamer.h b/headers/os/codec/MediaStreamer.h index 7daa4e738a..5c6e4fe11d 100644 --- a/headers/os/codec/MediaStreamer.h +++ b/headers/os/codec/MediaStreamer.h @@ -6,13 +6,11 @@ #define _MEDIA_STREAMER_H +#include #include -#include "Streamer.h" - -namespace BPrivate { -namespace media { +namespace BCodecKit { class BMediaStreamer { @@ -33,9 +31,7 @@ private: }; -}; // namespace media -}; // namespace BPrivate +} // namespace BCodecKit -using namespace BPrivate::media; #endif diff --git a/headers/os/codec/MediaWriter.h b/headers/os/codec/MediaWriter.h index cce6e74540..3b6fda0db1 100644 --- a/headers/os/codec/MediaWriter.h +++ b/headers/os/codec/MediaWriter.h @@ -5,6 +5,7 @@ #ifndef _MEDIA_WRITER_H #define _MEDIA_WRITER_H + #include #include #include @@ -12,8 +13,7 @@ #include "TList.h" -namespace BPrivate { -namespace media { +namespace BCodecKit { class BMediaWriter { @@ -63,10 +63,7 @@ private: }; -}; // namespace media -}; // namespace BPrivate - -using namespace BPrivate::media; +} // namespace BCodecKit #endif // _MEDIA_WRITER_H diff --git a/headers/os/codec/MetaData.h b/headers/os/codec/MetaData.h index 836dc012cc..d9881d786f 100644 --- a/headers/os/codec/MetaData.h +++ b/headers/os/codec/MetaData.h @@ -2,7 +2,6 @@ * Copyright 2018, Dario Casalinuovo. All rights reserved. * Distributed under the terms of the MIT License. */ - #ifndef _META_DATA_H #define _META_DATA_H @@ -10,8 +9,7 @@ #include -namespace BPrivate { -namespace media { +namespace BCodecKit { // Playback capabilities @@ -114,9 +112,8 @@ private: BMetaData(const BMetaData&); }; -} // namespace media -} // namespace BPrivate -using namespace BPrivate::media; +} // namespace BCodecKit + #endif // _META_DATA_H diff --git a/headers/os/codec/Reader.h b/headers/os/codec/Reader.h index d9efde83f9..fc9f4aeb75 100644 --- a/headers/os/codec/Reader.h +++ b/headers/os/codec/Reader.h @@ -8,9 +8,12 @@ #include "MediaPlugin.h" -namespace BPrivate { namespace media { +namespace BCodecKit { + +namespace BPrivate { + class PluginManager; +} -class PluginManager; enum { B_MEDIA_SEEK_TO_TIME = 0x10000, @@ -62,8 +65,7 @@ private: BMediaPlugin* fMediaPlugin; // needed for plug-in reference count management - friend class PluginManager; - friend class MediaExtractor; + friend class BCodecKit::BPrivate::PluginManager; virtual void _ReservedReader1(); virtual void _ReservedReader2(); @@ -80,8 +82,8 @@ public: virtual BReader* NewReader() = 0; }; -} } // namespace BPrivate::media -using namespace BPrivate::media; +} // namespace BCodecKit + #endif // _READER_PLUGIN_H diff --git a/headers/os/codec/Streamer.h b/headers/os/codec/Streamer.h index 5519e295af..1391b6bf13 100644 --- a/headers/os/codec/Streamer.h +++ b/headers/os/codec/Streamer.h @@ -12,9 +12,11 @@ #include "MediaPlugin.h" -namespace BPrivate { namespace media { +namespace BCodecKit { -class PluginManager; +namespace BPrivate { + class PluginManager; +} class BStreamer { @@ -28,8 +30,7 @@ protected: private: BMediaPlugin* fMediaPlugin; - friend class PluginManager; - friend class MediaStreamer; + friend class BCodecKit::BPrivate::PluginManager; virtual void _ReservedStreamer1(); virtual void _ReservedStreamer2(); @@ -48,9 +49,8 @@ public: virtual BStreamer* NewStreamer() = 0; }; -} } // namespace BPrivate::media -using namespace BPrivate::media; +} // namespace BCodecKit #endif // _STREAMER_PLUGIN_H diff --git a/headers/os/codec/Writer.h b/headers/os/codec/Writer.h index c7498b2b95..d226c2de91 100644 --- a/headers/os/codec/Writer.h +++ b/headers/os/codec/Writer.h @@ -6,9 +6,13 @@ #include "MediaPlugin.h" -namespace BPrivate { namespace media { -class PluginManager; +namespace BCodecKit { + +namespace BPrivate { + class PluginManager; +} + class BWriter { public: @@ -51,7 +55,7 @@ private: BMediaPlugin* fMediaPlugin; // needed for plug-in reference count management - friend class PluginManager; + friend class BCodecKit::BPrivate::PluginManager; friend class BMediaWriter; virtual void _ReservedWriter1(); @@ -70,11 +74,10 @@ public: virtual status_t GetSupportedFileFormats( const media_file_format** _fileFormats, size_t* _count) = 0; - }; -} } // namespace BPrivate::media -using namespace BPrivate::media; +} // namespace BCodecKit + #endif // _WRITER_PLUGIN_H diff --git a/headers/os/media/MediaDecoder.h b/headers/os/media/MediaDecoder.h index 0177fa2ae9..b4bda5b621 100644 --- a/headers/os/media/MediaDecoder.h +++ b/headers/os/media/MediaDecoder.h @@ -4,15 +4,11 @@ #include #include -namespace BPrivate { + +namespace BCodecKit { class BDecoder; } -namespace BPrivate { - namespace media { - class BDecoder; - class BDecoderPlugin; - } -} + class BMediaDecoder { public: @@ -47,8 +43,8 @@ class BMediaDecoder { status_t AttachToDecoder(); - BPrivate::media::BDecoder* fDecoder; - status_t fInitStatus; + BCodecKit::BDecoder* fDecoder; + status_t fInitStatus; /* fbc data and virtuals */ diff --git a/headers/private/codec/AddOnManager.h b/headers/private/codec/AddOnManager.h index 858b39b414..9f3c2beded 100644 --- a/headers/private/codec/AddOnManager.h +++ b/headers/private/codec/AddOnManager.h @@ -26,8 +26,9 @@ #include "TList.h" +namespace BCodecKit { namespace BPrivate { -namespace media { + class AddOnManager { public: @@ -131,7 +132,9 @@ private: static AddOnManager sInstance; }; -} // namespace media + } // namespace BPrivate +} // namespace BCodecKit + #endif // _ADD_ON_MANAGER_H diff --git a/headers/private/codec/PluginManager.h b/headers/private/codec/PluginManager.h index baac9a5cd2..b3204eca4e 100644 --- a/headers/private/codec/PluginManager.h +++ b/headers/private/codec/PluginManager.h @@ -20,7 +20,10 @@ #include "TList.h" -namespace BPrivate { namespace media { +namespace BCodecKit { + +namespace BPrivate { + class PluginManager { public: @@ -87,10 +90,11 @@ private: BLocker fLocker; }; -} } // namespace BPrivate::media -using namespace BPrivate::media; +} } // namespace BCodecKit::BPrivate + + +extern BCodecKit::BPrivate::PluginManager gPluginManager; -extern PluginManager gPluginManager; #endif // _PLUGIN_MANAGER_H diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h index 5d9d11dca8..3d89cb9dbc 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h +++ b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h @@ -17,6 +17,7 @@ #include #include +using namespace BCodecKit; extern "C" { #include "avcodec.h" diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h b/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h index baedbee30d..6bbbec41a0 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h +++ b/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h @@ -9,6 +9,7 @@ #include #include +using namespace BCodecKit; extern "C" { #include "avcodec.h" diff --git a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.h b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.h index 5276beba47..f0ca4db463 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.h +++ b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.h @@ -10,6 +10,8 @@ #include #include +using namespace BCodecKit; + class AVFormatReader : public BReader { public: diff --git a/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h b/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h index fd25730ad7..1c1c2770b2 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h +++ b/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h @@ -9,6 +9,8 @@ #include #include +using namespace BCodecKit; + extern "C" { #include "avformat.h" diff --git a/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h b/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h index 3cbdabd906..b7a4cb0fa2 100644 --- a/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h +++ b/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h @@ -17,6 +17,8 @@ #include #include +using namespace BCodecKit; + class FFmpegPlugin : public BReaderPlugin, public BDecoderPlugin, public BWriterPlugin, public BEncoderPlugin { diff --git a/src/kits/codec/AdapterIO.cpp b/src/kits/codec/AdapterIO.cpp index 19b0c55b1c..cc419c6faa 100644 --- a/src/kits/codec/AdapterIO.cpp +++ b/src/kits/codec/AdapterIO.cpp @@ -5,7 +5,7 @@ */ -#include "AdapterIO.h" +#include #include @@ -14,6 +14,9 @@ #include "MediaDebug.h" +namespace BCodecKit { + + #define TIMEOUT_QUANTA 100000 @@ -461,3 +464,6 @@ void BAdapterIO::_ReservedAdapterIO5() {} void BInputAdapter::_ReservedInputAdapter1() {} void BInputAdapter::_ReservedInputAdapter2() {} + + +} // namespace BCodecKit diff --git a/src/kits/codec/AddOnManager.cpp b/src/kits/codec/AddOnManager.cpp index 5f01e4cbbe..c8a506e220 100644 --- a/src/kits/codec/AddOnManager.cpp +++ b/src/kits/codec/AddOnManager.cpp @@ -29,9 +29,8 @@ #include "MetaFormat.h" +namespace BCodecKit { namespace BPrivate { -namespace media { - // #pragma mark - ImageLoader @@ -675,5 +674,5 @@ AddOnManager::_GetReaders(const BPath& path, entry_ref* outRefs, } -} // namespace media } // namespace BPrivate +} // namespace BCodecKit diff --git a/src/kits/codec/ChunkCache.cpp b/src/kits/codec/ChunkCache.cpp index a52651c297..2d083a62a2 100644 --- a/src/kits/codec/ChunkCache.cpp +++ b/src/kits/codec/ChunkCache.cpp @@ -15,6 +15,10 @@ // #pragma mark - +namespace BCodecKit { +namespace BPrivate { + + ChunkCache::ChunkCache(sem_id waitSem, size_t maxBytes) : BLocker("media chunk cache"), @@ -156,3 +160,7 @@ ChunkCache::ReadNextChunk(BReader* reader, void* cookie) fChunkCache.push(chunk); return chunk->status == B_OK; } + + +} // namespace BPrivate +} // namespace BCodecKit diff --git a/src/kits/codec/ChunkCache.h b/src/kits/codec/ChunkCache.h index f29a8d1166..64e04fcb34 100644 --- a/src/kits/codec/ChunkCache.h +++ b/src/kits/codec/ChunkCache.h @@ -14,8 +14,8 @@ #include +namespace BCodecKit { namespace BPrivate { -namespace media { // Limit to 10 entries, we might want to instead limit to a length of time #define CACHE_MAX_ENTRIES 10 @@ -54,9 +54,9 @@ private: }; -} // namespace media } // namespace BPrivate +} // namespace BCodecKit -using namespace BPrivate::media; +//using namespace BPrivate::media; #endif // _CHUNK_CACHE_H diff --git a/src/kits/codec/CodecRoster.cpp b/src/kits/codec/CodecRoster.cpp index 59d213752c..d56790e60b 100644 --- a/src/kits/codec/CodecRoster.cpp +++ b/src/kits/codec/CodecRoster.cpp @@ -10,6 +10,9 @@ #include "PluginManager.h" +namespace BCodecKit { + + status_t BCodecRoster::InstantiateReader(BReader** reader, int32* streamCount, media_file_format* mff, BDataIO* source) @@ -131,3 +134,6 @@ BCodecRoster::GetNextEncoder(int32* cookie, media_codec_info* _codecInfo) { return get_next_encoder(cookie, _codecInfo); } + + +} // namespace BCodecKit diff --git a/src/kits/codec/Decoder.cpp b/src/kits/codec/Decoder.cpp index 515c59fb41..644a2a1d86 100644 --- a/src/kits/codec/Decoder.cpp +++ b/src/kits/codec/Decoder.cpp @@ -12,6 +12,9 @@ #include +namespace BCodecKit { + + BDecoder::BDecoder() : fChunkProvider(NULL), @@ -69,3 +72,6 @@ BChunkProvider::BChunkProvider() BChunkProvider::~BChunkProvider() { } + + +} // namespace BCodecKit diff --git a/src/kits/codec/Encoder.cpp b/src/kits/codec/Encoder.cpp index fa102f8607..4c700abf7c 100644 --- a/src/kits/codec/Encoder.cpp +++ b/src/kits/codec/Encoder.cpp @@ -13,6 +13,9 @@ #include +namespace BCodecKit { + + BEncoder::BEncoder() : fChunkWriter(NULL), @@ -146,3 +149,6 @@ BChunkWriter::BChunkWriter() BChunkWriter::~BChunkWriter() { } + + +} // namespace BCodecKit diff --git a/src/kits/codec/MediaExtractor.cpp b/src/kits/codec/MediaExtractor.cpp index fb3c157318..e26998b97e 100644 --- a/src/kits/codec/MediaExtractor.cpp +++ b/src/kits/codec/MediaExtractor.cpp @@ -20,6 +20,12 @@ #include "PluginManager.h" +namespace BCodecKit { + +using BCodecKit::BPrivate::ChunkCache; +using BCodecKit::BPrivate::chunk_buffer; + + // should be 0, to disable the chunk cache set it to 1 #define DISABLE_CHUNK_CACHE 0 @@ -27,7 +33,7 @@ static const size_t kMaxCacheBytes = 3 * 1024 * 1024; -struct BPrivate::media::stream_info { +struct stream_info { status_t status; void* cookie; bool hasCookie; @@ -481,3 +487,6 @@ BMediaExtractor::_ExtractorThread() } while (streamsFilled < fStreamCount); } } + + +} // namespace BCodecKit diff --git a/src/kits/codec/MediaIO.cpp b/src/kits/codec/MediaIO.cpp index 48e07d5f5f..e120895e51 100644 --- a/src/kits/codec/MediaIO.cpp +++ b/src/kits/codec/MediaIO.cpp @@ -8,6 +8,9 @@ #include +namespace BCodecKit { + + BMediaIO::BMediaIO() { } @@ -30,3 +33,6 @@ void BMediaIO::_ReservedMediaIO2() {} void BMediaIO::_ReservedMediaIO3() {} void BMediaIO::_ReservedMediaIO4() {} void BMediaIO::_ReservedMediaIO5() {} + + +} // namespace BCodecKit diff --git a/src/kits/codec/MediaPlugin.cpp b/src/kits/codec/MediaPlugin.cpp index e2fb6c4751..8c3c5ffaf2 100644 --- a/src/kits/codec/MediaPlugin.cpp +++ b/src/kits/codec/MediaPlugin.cpp @@ -7,6 +7,9 @@ #include "MediaPlugin.h" +namespace BCodecKit { + + BMediaPlugin::BMediaPlugin() : fRefCount(0) @@ -22,3 +25,6 @@ BMediaPlugin::~BMediaPlugin() // FBC void BMediaPlugin::_ReservedMediaPlugin1() {} void BMediaPlugin::_ReservedMediaPlugin2() {} + + +} // namespace BCodecKit diff --git a/src/kits/codec/MediaStreamer.cpp b/src/kits/codec/MediaStreamer.cpp index 2050b22a44..28c8a205d5 100644 --- a/src/kits/codec/MediaStreamer.cpp +++ b/src/kits/codec/MediaStreamer.cpp @@ -14,6 +14,9 @@ #include "PluginManager.h" +namespace BCodecKit { + + BMediaStreamer::BMediaStreamer(BUrl url) : fStreamer(NULL) @@ -45,3 +48,6 @@ BMediaStreamer::CreateAdapter(BDataIO** adapter) return gPluginManager.CreateStreamer(&fStreamer, fUrl, adapter); } + + +} // namespace BCodecKit diff --git a/src/kits/codec/MediaWriter.cpp b/src/kits/codec/MediaWriter.cpp index 03b5c29b42..234e7fe664 100644 --- a/src/kits/codec/MediaWriter.cpp +++ b/src/kits/codec/MediaWriter.cpp @@ -18,6 +18,9 @@ #include "PluginManager.h" +namespace BCodecKit { + + class BMediaExtractorChunkWriter : public BChunkWriter { public: BMediaExtractorChunkWriter(BMediaWriter* writer, int32 streamIndex) @@ -234,3 +237,6 @@ BMediaWriter::WriteChunk(int32 streamIndex, const void* chunkBuffer, return fWriter->WriteChunk(info->cookie, chunkBuffer, chunkSize, encodeInfo); } + + +} // namespace BCodecKit diff --git a/src/kits/codec/MetaData.cpp b/src/kits/codec/MetaData.cpp index 9126b15c75..fb59d16dac 100644 --- a/src/kits/codec/MetaData.cpp +++ b/src/kits/codec/MetaData.cpp @@ -10,56 +10,56 @@ #include #include -#define P BPrivate::media -const char* P::kCanPause = "canpause"; -const char* P::kCanSeekBackward = "canseekbackward"; -const char* P::kCanSeekForward = "canseekforward"; -const char* P::kCanSeek = "canseek"; +namespace BCodecKit { -const char* P::kAudioBitRate = "audiobitrate"; -const char* P::kVideoBitRate = "videobitrate"; -const char* P::kAudioSampleRate = "audiosamplerate"; -const char* P::kVideoFrameRate = "videoframerate"; -const char* P::kMimeType = "mime"; -const char* P::kAudioCodec = "audiocodec"; -const char* P::kVideoCodec = "videocodec"; -const char* P::kVideoHeight = "videoheight"; -const char* P::kVideoWidth = "videowidth"; -const char* P::kNumTracks = "numtracks"; -const char* P::kDrmCrippled = "drmcrippled"; +const char* kCanPause = "canpause"; +const char* kCanSeekBackward = "canseekbackward"; +const char* kCanSeekForward = "canseekforward"; +const char* kCanSeek = "canseek"; -const char* P::kTitle = "title"; -const char* P::kComment = "comment"; -const char* P::kCopyright = "copyright"; -const char* P::kAlbum = "album"; -const char* P::kArtist = "artist"; -const char* P::kAuthor = "author"; -const char* P::kComposer = "composer"; -const char* P::kGenre = "genre"; -const char* P::kDuration = "duration"; -const char* P::kRating = "rating"; -const char* P::kCDTrackNum = "cdtracknumber"; -const char* P::kCDTrackMax = "cdtrackmax"; -const char* P::kDate = "date"; -const char* P::kEncodedBy = "encoded_by"; -const char* P::kLanguage = "language"; -const char* P::kAlbumArtist = "album_artist"; -const char* P::kPerformer = "performer"; -const char* P::kDisc = "disc"; -const char* P::kPublisher = "publisher"; -const char* P::kTrack = "track"; -const char* P::kEncoder = "encoder"; -const char* P::kYear = "year"; +const char* kAudioBitRate = "audiobitrate"; +const char* kVideoBitRate = "videobitrate"; +const char* kAudioSampleRate = "audiosamplerate"; +const char* kVideoFrameRate = "videoframerate"; -const char* P::kChapter = "be:chapter"; -const char* P::kChapterStart = "be:chapter:start"; -const char* P::kChapterEnd = "be:chapter:end"; +const char* kMimeType = "mime"; +const char* kAudioCodec = "audiocodec"; +const char* kVideoCodec = "videocodec"; +const char* kVideoHeight = "videoheight"; +const char* kVideoWidth = "videowidth"; +const char* kNumTracks = "numtracks"; +const char* kDrmCrippled = "drmcrippled"; -const char* P::kProgramData = "be:program"; +const char* kTitle = "title"; +const char* kComment = "comment"; +const char* kCopyright = "copyright"; +const char* kAlbum = "album"; +const char* kArtist = "artist"; +const char* kAuthor = "author"; +const char* kComposer = "composer"; +const char* kGenre = "genre"; +const char* kDuration = "duration"; +const char* kRating = "rating"; +const char* kCDTrackNum = "cdtracknumber"; +const char* kCDTrackMax = "cdtrackmax"; +const char* kDate = "date"; +const char* kEncodedBy = "encoded_by"; +const char* kLanguage = "language"; +const char* kAlbumArtist = "album_artist"; +const char* kPerformer = "performer"; +const char* kDisc = "disc"; +const char* kPublisher = "publisher"; +const char* kTrack = "track"; +const char* kEncoder = "encoder"; +const char* kYear = "year"; -#undef P +const char* kChapter = "be:chapter"; +const char* kChapterStart = "be:chapter:start"; +const char* kChapterEnd = "be:chapter:end"; + +const char* kProgramData = "be:program"; BMetaData::BMetaData() @@ -189,3 +189,6 @@ BMetaData::operator=(const BMetaData& other) fMessage = new BMessage(*other.fMessage); return *this; } + + +} // namespace BCodecKit diff --git a/src/kits/codec/PluginManager.cpp b/src/kits/codec/PluginManager.cpp index d785abfa87..0ab69d76e9 100644 --- a/src/kits/codec/PluginManager.cpp +++ b/src/kits/codec/PluginManager.cpp @@ -21,6 +21,10 @@ #include "MediaDebug.h" +namespace BCodecKit { +namespace BPrivate { + + PluginManager gPluginManager; #define BLOCK_SIZE 4096 @@ -814,3 +818,7 @@ PluginManager::_LoadPlugin(const entry_ref& ref, BMediaPlugin** plugin, *image = id; return B_OK; } + + +} // namespace BPrivate +} // namespace BCodecKit diff --git a/src/kits/codec/Reader.cpp b/src/kits/codec/Reader.cpp index d1a4c6e5a7..4e5c84a96f 100644 --- a/src/kits/codec/Reader.cpp +++ b/src/kits/codec/Reader.cpp @@ -12,6 +12,9 @@ #include +namespace BCodecKit { + + BReader::BReader() : fSource(NULL), @@ -79,3 +82,6 @@ void BReader::_ReservedReader2() {} void BReader::_ReservedReader3() {} void BReader::_ReservedReader4() {} void BReader::_ReservedReader5() {} + + +} // namespace BCodecKit diff --git a/src/kits/codec/Streamer.cpp b/src/kits/codec/Streamer.cpp index 9459f12cbe..5d36b5d072 100644 --- a/src/kits/codec/Streamer.cpp +++ b/src/kits/codec/Streamer.cpp @@ -7,6 +7,9 @@ #include +namespace BCodecKit { + + BStreamer::BStreamer() : fMediaPlugin(NULL) @@ -29,3 +32,6 @@ void BStreamer::_ReservedStreamer5() {} BStreamerPlugin::BStreamerPlugin() { } + + +} diff --git a/src/kits/codec/Writer.cpp b/src/kits/codec/Writer.cpp index 797fa7b620..5206b1286f 100644 --- a/src/kits/codec/Writer.cpp +++ b/src/kits/codec/Writer.cpp @@ -10,6 +10,9 @@ #include +namespace BCodecKit { + + BWriter::BWriter() : fTarget(NULL), @@ -49,3 +52,6 @@ void BWriter::_ReservedWriter2() {} void BWriter::_ReservedWriter3() {} void BWriter::_ReservedWriter4() {} void BWriter::_ReservedWriter5() {} + + +} diff --git a/src/kits/media/MediaDecoder.cpp b/src/kits/media/MediaDecoder.cpp index aefc2424fa..651fdcf5c2 100644 --- a/src/kits/media/MediaDecoder.cpp +++ b/src/kits/media/MediaDecoder.cpp @@ -3,12 +3,17 @@ * FILE: MediaDecoder.cpp * DESCR: ***********************************************************************/ -#include +#include #include +#include + #include -#include "PluginManager.h" + #include "MediaDebug.h" +using namespace BCodecKit; + + /************************************************************* * public BMediaDecoder *************************************************************/