hrev52550 adds 2 changesets to branch 'master'
old head: 121db87f5fca508c9da469fc02de546f32fb41ca
new head: b4d8bbd540c01194984b4453ba74cbdcd28724da
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=b4d8bbd540c0+%5E121db87f5fca
----------------------------------------------------------------------------
3fe994ba28f1: MediaExtractor: Move stream_info to private
b4d8bbd540c0: Codec Kit: Move Managers to private headers
* Those classes are not ready for public consumption. Ideally,
I'd add a well designed BCodecRoster wrapping them. This is part
of the general cleanup I am doing to get the code in a good state
before going to finalize the design.
* I don't plan to reintroduce BMediaFile in the media2 API, and
I'd like to remove any (explicit) usage of entry_refs and things
like that.
* I plan to introduce BMetaData and BMediaFormat which is going
to be different than what we do now.
* We need to explicitly use the mime type when it's available and
it is another design consideration when CodecRoster will be introduced.
[ Barrett17 <b.vitruvio@xxxxxxxxx> ]
----------------------------------------------------------------------------
6 files changed, 14 insertions(+), 13 deletions(-)
headers/os/codec/MediaExtractor.h | 13 +------------
headers/{os => private}/codec/AddOnManager.h | 0
headers/{os => private}/codec/FormatManager.h | 0
headers/{os => private}/codec/PluginManager.h | 0
src/kits/codec/Jamfile | 2 +-
src/kits/codec/MediaExtractor.cpp | 12 ++++++++++++
############################################################################
Commit: 3fe994ba28f120217b2343d04b5cd175ec35b185
URL: https://git.haiku-os.org/haiku/commit/?id=3fe994ba28f1
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Sun Nov 18 11:53:14 2018 UTC
MediaExtractor: Move stream_info to private
----------------------------------------------------------------------------
diff --git a/headers/os/codec/MediaExtractor.h
b/headers/os/codec/MediaExtractor.h
index e549934510..76defa5f4b 100644
--- a/headers/os/codec/MediaExtractor.h
+++ b/headers/os/codec/MediaExtractor.h
@@ -20,18 +20,7 @@ namespace media {
class ChunkCache;
struct chunk_buffer;
-
-
-struct stream_info {
- status_t status;
- void* cookie;
- bool hasCookie;
- const void* infoBuffer;
- size_t infoBufferSize;
- ChunkCache* chunkCache;
- chunk_buffer* lastChunk;
- media_format encodedFormat;
-};
+struct stream_info;
class MediaExtractor {
diff --git a/src/kits/codec/MediaExtractor.cpp
b/src/kits/codec/MediaExtractor.cpp
index 1241e76152..99023ca9fd 100644
--- a/src/kits/codec/MediaExtractor.cpp
+++ b/src/kits/codec/MediaExtractor.cpp
@@ -27,6 +27,18 @@
static const size_t kMaxCacheBytes = 3 * 1024 * 1024;
+struct BPrivate::media::stream_info {
+ status_t status;
+ void* cookie;
+ bool hasCookie;
+ const void* infoBuffer;
+ size_t infoBufferSize;
+ ChunkCache* chunkCache;
+ chunk_buffer* lastChunk;
+ media_format encodedFormat;
+};
+
+
class MediaExtractorChunkProvider : public ChunkProvider {
public:
MediaExtractorChunkProvider(MediaExtractor* extractor, int32 stream)
############################################################################
Revision: hrev52550
Commit: b4d8bbd540c01194984b4453ba74cbdcd28724da
URL: https://git.haiku-os.org/haiku/commit/?id=b4d8bbd540c0
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Sun Nov 18 12:15:35 2018 UTC
Codec Kit: Move Managers to private headers
* Those classes are not ready for public consumption. Ideally,
I'd add a well designed BCodecRoster wrapping them. This is part
of the general cleanup I am doing to get the code in a good state
before going to finalize the design.
* I don't plan to reintroduce BMediaFile in the media2 API, and
I'd like to remove any (explicit) usage of entry_refs and things
like that.
* I plan to introduce BMetaData and BMediaFormat which is going
to be different than what we do now.
* We need to explicitly use the mime type when it's available and
it is another design consideration when CodecRoster will be introduced.
----------------------------------------------------------------------------
diff --git a/headers/os/codec/AddOnManager.h
b/headers/private/codec/AddOnManager.h
similarity index 100%
rename from headers/os/codec/AddOnManager.h
rename to headers/private/codec/AddOnManager.h
diff --git a/headers/os/codec/FormatManager.h
b/headers/private/codec/FormatManager.h
similarity index 100%
rename from headers/os/codec/FormatManager.h
rename to headers/private/codec/FormatManager.h
diff --git a/headers/os/codec/PluginManager.h
b/headers/private/codec/PluginManager.h
similarity index 100%
rename from headers/os/codec/PluginManager.h
rename to headers/private/codec/PluginManager.h
diff --git a/src/kits/codec/Jamfile b/src/kits/codec/Jamfile
index 51141de33e..4dc01791aa 100644
--- a/src/kits/codec/Jamfile
+++ b/src/kits/codec/Jamfile
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src kits codec ;
-UsePrivateHeaders app media shared ;
+UsePrivateHeaders app codec media shared ;
if $(CHECK_MALLOC) {
SubDirC++Flags -D_NO_INLINE_ASM -fcheck-memory-usage ;
