Pedro Beschorner Marin
2097b611ed
Merge remote-tracking branch 'prlanzarin/1.1-transcode-screenshare-merge' into bigbluebutton/bbb-2.x-mconf
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
record-and-playback/core/scripts/rap-process-worker.rb
2017-07-11 20:41:38 +00:00
prlanzarin
4b0b155d53
Added video-broadcast path to RTP->RTMP transcoder
...
Will turn that into a parameter later
2017-07-06 16:17:29 +00:00
prlanzarin
a9bbdd11aa
Now correctly pointed akka-transcode ffmpeg path
...
Reverted akka-apps video-broadcast application.conf
2017-07-06 15:33:04 +00:00
prlanzarin
2d8e04ffd8
Transcoder now only relays RTP to RTMP video
...
Updated akka-transcode base SDP to use AVPF. Will make it dynamic later
Changed akka-transcode ffmpeg base path to packaged ffmpeg
2017-07-06 13:02:29 +00:00
Pedro Beschorner Marin
397c373148
Moved webcam h263 conversion to akka-transcode
2017-06-06 18:29:15 +00:00
Pedro Beschorner Marin
9a9810a4c9
Rotating videos in akka-bbb-transcode
2017-06-06 13:20:14 +00:00
Pedro Beschorner Marin
7fa799eb16
Included transcode rotate events in bbb-video
2017-05-19 19:59:33 +00:00
Pedro Beschorner Marin
481a05233b
Included video rotation and h263 convertion in akka-transcode
2017-05-18 19:47:06 +00:00
Mario Gasparoni
3a8d915927
Index transcoder per meeting
...
Basically we now allow two or more instances of the same transcoder's ID, since they are in different meetings
2017-05-17 17:45:07 +00:00
Mario Gasparoni
9a3fc66687
Stop Meeting Transcoders
...
Stop any remaining transcoder used by the meeting. Useful for mediaSource transcoders.
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
2017-05-17 17:43:30 +00:00
Mario Gasparoni
34fd6b0aad
Using DESTINATION_IP_ADDRESS instead of SIP_HOST in akka-transcode
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VoiceApp.scala
2017-05-17 17:37:51 +00:00
Mario Gasparoni
16698f7489
Introducing bbb-transcode-akka
...
Conflicts:
akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VoiceApp.scala
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/VideoTranscoderObserver.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegCommand.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffmpeg/FFmpegConstants.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/ffprobe/FFProbeCommand.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitor.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessMonitorObserver.java
akka-bbb-transcode/src/main/java/org/bigbluebutton/transcode/core/processmonitor/ProcessStream.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/Constants.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/IMessagingService.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessageHandler.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Service.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgentObserver.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/GlobalCall.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java
bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
2017-05-17 15:54:44 +00:00
