Commit ec74e66e authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix ogl render.

parent 7d16001d
...@@ -1056,15 +1056,7 @@ bool_t linphone_call_media_in_progress (const LinphoneCall *call) { ...@@ -1056,15 +1056,7 @@ bool_t linphone_call_media_in_progress (const LinphoneCall *call) {
} }
void linphone_call_ogl_render (const LinphoneCall *call) { void linphone_call_ogl_render (const LinphoneCall *call) {
#if 0 L_GET_CPP_PTR_FROM_C_OBJECT(call)->oglRender();
#ifdef VIDEO_ENABLED
VideoStream *stream = call->videostream;
if (stream && stream->output && ms_filter_get_id(stream->output) == MS_OGL_ID)
ms_filter_call_method(stream->output, MS_OGL_RENDER, nullptr);
#endif
#endif
} }
LinphoneStatus linphone_call_send_info_message (LinphoneCall *call, const LinphoneInfoMessage *info) { LinphoneStatus linphone_call_send_info_message (LinphoneCall *call, const LinphoneInfoMessage *info) {
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "c-wrapper/c-wrapper.h"
#include "call-p.h" #include "call-p.h"
#include "conference/local-conference.h" #include "conference/local-conference.h"
#include "conference/participant-p.h" #include "conference/participant-p.h"
...@@ -276,6 +277,11 @@ LinphoneStatus Call::decline (const LinphoneErrorInfo *ei) { ...@@ -276,6 +277,11 @@ LinphoneStatus Call::decline (const LinphoneErrorInfo *ei) {
return d->getActiveSession()->decline(ei); return d->getActiveSession()->decline(ei);
} }
void Call::oglRender () const {
L_D();
static_pointer_cast<MediaSession>(d->getActiveSession())->getPrivate()->oglRender();
}
LinphoneStatus Call::pause () { LinphoneStatus Call::pause () {
L_D(); L_D();
return static_cast<MediaSession *>(d->getActiveSession().get())->pause(); return static_cast<MediaSession *>(d->getActiveSession().get())->pause();
......
...@@ -53,6 +53,7 @@ public: ...@@ -53,6 +53,7 @@ public:
LinphoneStatus acceptUpdate (const MediaSessionParams *msp); LinphoneStatus acceptUpdate (const MediaSessionParams *msp);
LinphoneStatus decline (LinphoneReason reason); LinphoneStatus decline (LinphoneReason reason);
LinphoneStatus decline (const LinphoneErrorInfo *ei); LinphoneStatus decline (const LinphoneErrorInfo *ei);
void oglRender () const;
LinphoneStatus pause (); LinphoneStatus pause ();
LinphoneStatus redirect (const std::string &redirectUri); LinphoneStatus redirect (const std::string &redirectUri);
LinphoneStatus resume (); LinphoneStatus resume ();
......
...@@ -54,6 +54,7 @@ public: ...@@ -54,6 +54,7 @@ public:
void updating (bool isUpdate) override; void updating (bool isUpdate) override;
void enableSymmetricRtp (bool value); void enableSymmetricRtp (bool value);
void oglRender () const;
void sendVfu (); void sendVfu ();
void clearIceCheckList (IceCheckList *cl); void clearIceCheckList (IceCheckList *cl);
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <mediastreamer2/mseventqueue.h> #include <mediastreamer2/mseventqueue.h>
#include <mediastreamer2/msfileplayer.h> #include <mediastreamer2/msfileplayer.h>
#include <mediastreamer2/msjpegwriter.h> #include <mediastreamer2/msjpegwriter.h>
#include <mediastreamer2/msogl.h>
#include <mediastreamer2/msrtt4103.h> #include <mediastreamer2/msrtt4103.h>
#include <mediastreamer2/msvolume.h> #include <mediastreamer2/msvolume.h>
#include <ortp/b64.h> #include <ortp/b64.h>
...@@ -457,6 +458,13 @@ void MediaSessionPrivate::enableSymmetricRtp (bool value) { ...@@ -457,6 +458,13 @@ void MediaSessionPrivate::enableSymmetricRtp (bool value) {
} }
} }
void MediaSessionPrivate::oglRender () const {
#ifdef VIDEO_ENABLED
if (videoStream && videoStream->output && (ms_filter_get_id(videoStream->output) == MS_OGL_ID))
ms_filter_call_method(videoStream->output, MS_OGL_RENDER, nullptr);
#endif
}
void MediaSessionPrivate::sendVfu () { void MediaSessionPrivate::sendVfu () {
#ifdef VIDEO_ENABLED #ifdef VIDEO_ENABLED
if (videoStream) if (videoStream)
......
...@@ -32,6 +32,7 @@ class IceAgent; ...@@ -32,6 +32,7 @@ class IceAgent;
class MediaSessionPrivate; class MediaSessionPrivate;
class LINPHONE_PUBLIC MediaSession : public CallSession { class LINPHONE_PUBLIC MediaSession : public CallSession {
friend class Call;
friend class CallPrivate; friend class CallPrivate;
friend class IceAgent; friend class IceAgent;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment