mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 19:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ogl render.

Browse source
This commit is contained in:
Ghislain MARY 2017-11-28 14:47:06 +01:00
parent 7d16001da2
commit ec74e66eb7
6 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/c-wrapper/api/c-call.cpp
View file

@ -1056,15 +1056,7 @@ bool_t linphone_call_media_in_progress (const LinphoneCall *call) {
}
void linphone_call_ogl_render (const LinphoneCall *call) {
#if 0
#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
L_GET_CPP_PTR_FROM_C_OBJECT(call)->oglRender();
}
LinphoneStatus linphone_call_send_info_message (LinphoneCall *call, const LinphoneInfoMessage *info) {

6
src/call/call.cpp
View file

@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "c-wrapper/c-wrapper.h"
#include "call-p.h"
#include "conference/local-conference.h"
#include "conference/participant-p.h"
@ -276,6 +277,11 @@ LinphoneStatus Call::decline (const LinphoneErrorInfo *ei) {
return d->getActiveSession()->decline(ei);
}
void Call::oglRender () const {
L_D();
static_pointer_cast<MediaSession>(d->getActiveSession())->getPrivate()->oglRender();
}
LinphoneStatus Call::pause () {
L_D();
return static_cast<MediaSession *>(d->getActiveSession().get())->pause();

1
src/call/call.h
View file

@ -53,6 +53,7 @@ public:
LinphoneStatus acceptUpdate (const MediaSessionParams *msp);
LinphoneStatus decline (LinphoneReason reason);
LinphoneStatus decline (const LinphoneErrorInfo *ei);
void oglRender () const;
LinphoneStatus pause ();
LinphoneStatus redirect (const std::string &redirectUri);
LinphoneStatus resume ();

1
src/conference/session/media-session-p.h
View file

@ -54,6 +54,7 @@ public:
void updating (bool isUpdate) override;
void enableSymmetricRtp (bool value);
void oglRender () const;
void sendVfu ();
void clearIceCheckList (IceCheckList *cl);

8
src/conference/session/media-session.cpp
View file

@ -40,6 +40,7 @@
#include <mediastreamer2/mseventqueue.h>
#include <mediastreamer2/msfileplayer.h>
#include <mediastreamer2/msjpegwriter.h>
#include <mediastreamer2/msogl.h>
#include <mediastreamer2/msrtt4103.h>
#include <mediastreamer2/msvolume.h>
#include <ortp/b64.h>
@ -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 () {
#ifdef VIDEO_ENABLED
if (videoStream)

1
src/conference/session/media-session.h
View file

@ -32,6 +32,7 @@ class IceAgent;
class MediaSessionPrivate;
class LINPHONE_PUBLIC MediaSession : public CallSession {
friend class Call;
friend class CallPrivate;
friend class IceAgent;