[prev in list] [next in list] [prev in thread] [next in thread]
List: haiku-commits
Subject: [haiku-commits] haiku: hrev52697 - src/kits/codec src/kits/media headers/private/media headers/priva
From: Barrett17 <b.vitruvio () gmail ! com>
Date: 2018-12-28 22:03:23
Message-ID: 20181228220323.27F9523DEB () turing ! freelists ! org
[Download RAW message or body]
hrev52697 adds 2 changesets to branch 'master'
old head: 49a4b18141f934bff1a6366cf8014c61348d8e20
new head: e7933432e96e6d28cf057ea08570962b6b2f32f3
overview: https://git.haiku-os.org/haiku/log/?qt=range&q=e7933432e96e+%5E49a4b18141f9
----------------------------------------------------------------------------
fa911df6e63e: Move FormatManager back to the media_kit
* We don't aim to replicate this functionality. I don't
think this will be useful at all in future iterations.
Originally I planned to rewrite it on top of the new
BMediaFormat, but now I am of the hopinion this is
greatly unneeded.
e7933432e96e: BCodecRoster: Remove MakeFormatFor
* I want to introduce a new way for plugins to
register for a format. Supporting the old FormatManager is
too painful at this point and not worth the effort.
[ Barrett17 <b.vitruvio@gmail.com> ]
----------------------------------------------------------------------------
7 files changed, 3 insertions(+), 20 deletions(-)
headers/os/codec/CodecRoster.h | 8 --------
headers/private/{codec => media}/FormatManager.h | 0
src/kits/codec/CodecRoster.cpp | 10 ----------
src/kits/codec/Jamfile | 2 +-
src/kits/{codec => media}/FormatManager.cpp | 0
src/kits/media/Jamfile | 1 +
src/kits/media/MediaFormats.cpp | 2 +-
############################################################################
Commit: fa911df6e63e184bde1c57303db7d93329b011ad
URL: https://git.haiku-os.org/haiku/commit/?id=fa911df6e63e
Author: Barrett17 <b.vitruvio@gmail.com>
Date: Fri Dec 28 00:03:21 2018 UTC
Move FormatManager back to the media_kit
* We don't aim to replicate this functionality. I don't
think this will be useful at all in future iterations.
Originally I planned to rewrite it on top of the new
BMediaFormat, but now I am of the hopinion this is
greatly unneeded.
----------------------------------------------------------------------------
diff --git a/headers/private/codec/FormatManager.h b/headers/private/media/FormatManager.h
similarity index 100%
rename from headers/private/codec/FormatManager.h
rename to headers/private/media/FormatManager.h
diff --git a/src/kits/codec/Jamfile b/src/kits/codec/Jamfile
index ddf4814fcb..41451f571d 100644
--- a/src/kits/codec/Jamfile
+++ b/src/kits/codec/Jamfile
@@ -36,11 +36,11 @@ for architectureObject in [ MultiArchSubDirSetup ] {
# Internal Functionality
ChunkCache.cpp
AddOnManager.cpp
- FormatManager.cpp
PluginManager.cpp
# We need this to do not depend on libmedia
# will be removed when libmedia2 is introduced
+ FormatManager.cpp
MediaDefs.cpp
MediaFormats.cpp
RealtimeAlloc.cpp
diff --git a/src/kits/codec/FormatManager.cpp b/src/kits/media/FormatManager.cpp
similarity index 100%
rename from src/kits/codec/FormatManager.cpp
rename to src/kits/media/FormatManager.cpp
diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile
index 40f3207a68..b5bc95de95 100644
--- a/src/kits/media/Jamfile
+++ b/src/kits/media/Jamfile
@@ -60,6 +60,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
DataExchange.cpp
DefaultMediaTheme.cpp
DormantNodeManager.cpp
+ FormatManager.cpp
MediaRecorderNode.cpp
Notifications.cpp
request_data.cpp
############################################################################
Revision: hrev52697
Commit: e7933432e96e6d28cf057ea08570962b6b2f32f3
URL: https://git.haiku-os.org/haiku/commit/?id=e7933432e96e
Author: Barrett17 <b.vitruvio@gmail.com>
Date: Fri Dec 28 22:01:02 2018 UTC
BCodecRoster: Remove MakeFormatFor
* I want to introduce a new way for plugins to
register for a format. Supporting the old FormatManager is
too painful at this point and not worth the effort.
----------------------------------------------------------------------------
diff --git a/headers/os/codec/CodecRoster.h b/headers/os/codec/CodecRoster.h
index 47ea7c175d..33535d77b9 100644
--- a/headers/os/codec/CodecRoster.h
+++ b/headers/os/codec/CodecRoster.h
@@ -56,14 +56,6 @@ public:
// To choose the API I did a search among the Haiku codebase and
// programs for which we have the source available.
- // TODO: At some point move all implementations here
-
- static status_t MakeFormatFor(
- const media_format_description* descriptions,
- int32 descriptionCount,
- media_format& format, uint32 flags,
- void* _reserved);
-
// TODO: media_format_family: really?
static status_t GetCodecInfo(media_codec_info* _codecInfo,
media_format_family* _formatFamily,
diff --git a/src/kits/codec/CodecRoster.cpp b/src/kits/codec/CodecRoster.cpp
index 37c47be58e..7e492b8ca4 100644
--- a/src/kits/codec/CodecRoster.cpp
+++ b/src/kits/codec/CodecRoster.cpp
@@ -269,14 +269,4 @@ BCodecRoster::GetCodecInfo(media_codec_info* codecInfo,
}
-status_t
-BCodecRoster::MakeFormatFor(const media_format_description* descriptions,
- int32 descriptionCount, media_format& format, uint32 flags,
- void* _reserved)
-{
- return FormatManager::GetInstance()->MakeFormatFor(descriptions,
- descriptionCount, format, flags, _reserved);
-}
-
-
} // namespace BCodecKit
diff --git a/src/kits/media/MediaFormats.cpp b/src/kits/media/MediaFormats.cpp
index fe87985e98..37c1be4780 100644
--- a/src/kits/media/MediaFormats.cpp
+++ b/src/kits/media/MediaFormats.cpp
@@ -524,7 +524,7 @@ BMediaFormats::MakeFormatFor(const media_format_description* descriptions,
int32 descriptionCount, media_format* format, uint32 flags,
void* _reserved)
{
- return BCodecKit::BCodecRoster::MakeFormatFor(descriptions,
+ return FormatManager::GetInstance()->MakeFormatFor(descriptions,
descriptionCount, *format, flags, _reserved);
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic