From efd1469d4f5462e97d20b9d41b55c703fe75734f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Thu, 30 Jul 2009 17:52:14 +0000 Subject: [PATCH] Encoders will most likely be found by media_codec_info, not by media_format, changed method signature accordingly and disabled the code for now, since the media_server communication has not been adapted yet. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31985 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/media/PluginManager.h | 5 ++--- src/kits/media/PluginManager.cpp | 17 +++++++---------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/headers/private/media/PluginManager.h b/headers/private/media/PluginManager.h index 6d88a70eee..f4e91e00eb 100644 --- a/headers/private/media/PluginManager.h +++ b/headers/private/media/PluginManager.h @@ -49,9 +49,8 @@ public: void DestroyWriter(Writer* writer); status_t CreateEncoder(Encoder** encoder, - const media_format& format); - status_t CreateEncoder(Encoder** encoder, - const media_codec_info& mci); + const media_codec_info* codecInfo, + uint32 flags); status_t GetEncoderInfo(Encoder* encoder, media_codec_info* _info) const; void DestroyEncoder(Encoder* encoder); diff --git a/src/kits/media/PluginManager.cpp b/src/kits/media/PluginManager.cpp index ea27a469f4..cc0af09f43 100644 --- a/src/kits/media/PluginManager.cpp +++ b/src/kits/media/PluginManager.cpp @@ -252,10 +252,12 @@ PluginManager::DestroyWriter(Writer* writer) status_t -PluginManager::CreateEncoder(Encoder** _encoder, const media_format& format) +PluginManager::CreateEncoder(Encoder** _encoder, + const media_codec_info* codecInfo, uint32 flags) { TRACE("PluginManager::CreateEncoder enter\n"); +#if 0 // get decoder for this format from the server server_get_encoder_for_format_request request; server_get_encoder_for_format_reply reply; @@ -295,15 +297,10 @@ PluginManager::CreateEncoder(Encoder** _encoder, const media_format& format) TRACE("PluginManager::CreateEncoder leave\n"); return B_OK; -} - - -status_t -PluginManager::CreateEncoder(Encoder** encoder, const media_codec_info& mci) -{ - // TODO - debugger("not implemented"); - return B_ERROR; +#else + TRACE("PluginManager::CreateEncoder leave\n"); + return B_NOT_SUPPORTED; +#endif }