Calvin Walton
0f9b36bc11
recording: Escape custom poll answers in gnuplot file
...
Custom poll answers were previously printed into the gnuplot control
file directly, between double-quotes. As a result, if a poll answer
contains a double-quote, it could cause a syntax error in the gnuplot
script, or worse.
Gnuplot accepts standard C-style double-quoted string escapes, so I can
just use ruby's "inspect" method to generate a safetly escaped string.
Note that within the string, % still has to be escaped separately
(doubled) to avoid issues with the string formatting. As well, I have
disabled "enhanced" mode which allows using special characters for
formatting commands.
Fixes #3039
2016-03-07 11:26:17 -05:00
Anton Georgiev
a0aebf3cdc
Merge branch 'screenshare-with-cursor-capture' of github.com:ritzalam/bigbluebutton
2016-03-05 16:50:13 +00:00
Felipe Cecagno
bbcfe1f34a
Merge remote-tracking branch 'bigbluebutton/master' into mconf
...
Conflicts:
bigbluebutton-html5/app/client/globals.js
bigbluebutton-html5/app/client/main.html
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
2016-03-04 20:19:55 -03:00
RafaFP
89ac2fd60a
Improved the code to meet the peer review results.
...
refs #1931
2016-03-04 17:40:48 +00:00
Calvin Walton
3a3d349553
recording: Restore the $meeting_start/end global variables
...
These were commented out, apparently by accident, when the metadata code
was being refactored. The effect was that the $meeting_end variable was
treated as if it had a value of zero, meaning that the last slide had a
start time of some positive number and an end time of zero. As a result,
it was never shown (and didn't get any shapes either).
Fixes #3021
2016-03-03 11:27:28 -05:00
RafaFP
932de9c07f
Updated class and method names to better correspond to the implemented function.
...
Improved the recording code.
refs #1931
2016-03-02 16:02:30 +00:00
Felipe Cecagno
e4da408c08
Merge branch 'mconf' into bigbluebutton/bigbluebutton@master
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingServiceHelper.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
record-and-playback/presentation/playback/presentation/0.9.0/playback.html
record-and-playback/presentation/scripts/publish/presentation.rb
2016-03-02 01:19:09 -03:00
RafaFP
32f937def8
Implemented the clearing of text in the recordings player.
...
Recordings will now clear the chat box for every clear command received during the recording.
refs #1931
2016-02-26 21:18:14 +00:00
Richard Alam
95c043860b
- add archiving of new screenshare
2016-02-25 17:59:29 +00:00
jfederico
503b748b22
record-and-playback: Placed code for producing the initial metadata.xml file at the top
2016-02-12 12:08:33 -05:00
jfederico
0c2eaf5f11
record-and-playback: Fixed bug in original state of recordings.
2016-02-09 17:26:29 -05:00
Richard Alam
c31857b9da
Merge pull request #3001 from bigbluebutton/getRecordings-merged-enhancements
...
Get recordings merged enhancements
2016-02-04 17:01:03 -05:00
Fred Dixon
b9c6c62810
Added <meta charset=utf-8 /> to playback.html Fixes #2975
2016-01-30 19:46:58 -05:00
jfederico
c9abb24a06
record-and-playback: Formatted xml produced for metadata.xml after adding playback
2016-01-28 10:13:45 -05:00
jfederico
983e58922e
record-and-playback: metadata.xml is generated by process script instead of publish
2016-01-26 17:16:28 -05:00
jfederico
1204ae9f2a
recording-and-playback: Added initial metadata.xml as part of the processing
2016-01-26 14:25:02 -05:00
jfederico
371557ecb4
recording-and-playback: Added directory to be cleaned up for deleted status
2016-01-19 14:57:30 -05:00
jfederico
8e3c0ea983
recording-and-playback: Changed initial state on recording metadata.xml to published
2016-01-19 14:53:33 -05:00
jfederico
8bc75ab2f6
recording-and-playback: Converted tabs to spaces on presentation/scripts/* and core/scripts/*
...
Signed-off-by: jfederico <jesus@123it.ca>
2016-01-19 14:52:28 -05:00
Felipe Cecagno
019cfa6cfb
Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/CustomRichTextEditor.as
2016-01-04 15:14:27 -02:00
Felipe Cecagno
8f08e13dcc
Merge remote-tracking branch 'bigbluebutton/master' into mconf
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
2015-12-30 18:35:13 -02:00
Felipe Cecagno
de75b79eab
changed the method of pack and unpack the encrypted format, from zip to tar, and making it by an external command instead of doing it in ruby (more efficient)
2015-12-15 16:45:22 -02:00
Anton Georgiev
7bf1d4ce8c
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3
...
Conflicts:
record-and-playback/core/scripts/bigbluebutton.yml
2015-11-30 21:44:04 +00:00
Felipe Cecagno
555e037d79
fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0
2015-11-30 01:06:38 -02:00
Pedro Beschorner Marin
36bbcc06d6
Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge
...
Conflicts:
akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-video/.classpath
bbb-video/build.gradle
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
bbb-video/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/es_LA/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-client/src/BigBlueButton.mxml
bigbluebutton-client/src/SharedNotesModule.mxml
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
bigbluebutton-client/src/org/bigbluebutton/core/services/StreamMonitor.as
bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
bigbluebutton-client/src/org/bigbluebutton/main/model/NetworkStatsData.as
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeMyRole.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeRoleEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/LowerHandEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/StreamStoppedEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/AddButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/Client.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/HTTPServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/XMLServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/GraphicsWrapper.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
bigbluebutton-config/bigbluebutton-release
bigbluebutton-config/bin/bbb-conf
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisStorageService.java
bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
2015-11-25 15:58:36 +00:00
Leonardo Crauss Daronco
234843b422
Better volume slider in the media player in the playback page
2015-11-20 15:00:23 -02:00
Leonardo Crauss Daronco
a640426de3
Better swap of presentation/video and spinner in the playback page
...
Now it keeps playing if it was playing before and shows the current slide
properly.
2015-11-20 14:22:08 -02:00
Leonardo Crauss Daronco
3bc61690c3
Better style for the video player in the playback page, cleanup css
2015-11-19 10:54:43 -02:00
Leonardo Crauss Daronco
c2de1cab07
Finished thhe new presentation/video swap in the playback page
...
Now it's done in the application and positioning is not hard-coded
inside acorn player, so it works in a responsive page.
Still not 100%, the playback jumps back and pauses on swap. Have to
make the transition seamless.
2015-11-19 10:18:23 -02:00
Leonardo Crauss Daronco
8bbaf8a13f
Move css/bbb-playback2.css to playback.css
2015-11-18 17:42:47 -02:00
Leonardo Crauss Daronco
32986bc6f9
First version of a responsive playback page for recordings
...
Includes a custom theme for acorn media player.
Uses the Foundation framework, version 5.5.3
2015-11-18 17:28:52 -02:00
Calvin Walton
fc299487e4
recording: Allow configuring recording metadata to use https
...
This allows configuring a server to use https without having to edit
any ruby files directly.
(Ideally, the metadata files wouldn't include the server name/protocol
at all; that should be set dynamically by bbb-web, but this is what we
have for now.)
2015-11-06 11:49:36 -05:00
Calvin Walton
39cc6a80a6
recording: Use relative url for loading presentation data
...
This fixes loading the shapes svg, and the events and cursor xml files
on servers configured with https support. (Otherwise they'll be loaded
off http:// and trigger mixed-content errors).
2015-11-06 11:49:31 -05:00
Felipe Cecagno
7a182e67b6
Merge branch 'feature-1734' into mconf-live0.7.3 (refs #1734 )
2015-10-23 12:47:08 -02:00
Felipe Cecagno
c3c4a9c64c
extracted the custom hash class to a different file, loaded by recordandplayback.rb; removed the hardcoded path to /var/bigbluebutton/published/presentation because it can change, and it's always different depending on the playback format (refs #1734 )
2015-10-23 12:46:26 -02:00
Anton Georgiev
8e407df405
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-fsesl/build.sbt
bbb-common-message/build.sbt
bigbluebutton-apps/build.gradle
2015-10-22 20:46:30 +00:00
Felipe Cecagno
f9eaa32a12
publish recording immediately after the process phase, before processing other recordings; fix step_succeeded vs. phase_succeeded
2015-10-19 17:40:30 -02:00
Felipe Cecagno
c4ff37e292
fixed recording size inclusion when processing presentation_export
2015-10-19 17:39:26 -02:00
Felipe Cecagno
83ae244485
Merge branch 'mconf-live0.7.1-ssl' into mconf-live0.7.3
2015-10-19 11:49:36 -02:00
Felipe Cecagno
7069a4a6d7
Recording: Also tell ffmpeg to ignore the length of the intermediate wav file
2015-10-16 14:09:32 -04:00
Felipe Cecagno
762d1e9a56
another patch to fix the long wav files problem
2015-10-16 14:53:20 -03:00
Calvin Walton
fe8cf13b11
Convert audio_size to a number before subtracting header size
2015-10-15 15:11:45 -03:00
Calvin Walton
43e943d61d
Need to convert bit_rate to an integer
2015-10-15 15:11:44 -03:00
Calvin Walton
30e6a98a8b
Fix some reference errors in wav detection
2015-10-15 15:11:44 -03:00
Calvin Walton
8332daf093
record-and-playback: Handle FreeSWITCH wav files >4GB
...
FreeSWITCH writes wav files >4GB long with incorrect values in the length
field in the header. Recalculate the length based on file size, and ensure
that ffmpeg reads the complete audio file rather than stopping.
2015-10-15 15:11:44 -03:00
Anton Georgiev
f08cd5262e
temp changes
2015-10-13 19:00:50 +00:00
Anton Georgiev
6b8626d40f
cleaning up and reverting unnecessary config
2015-09-29 16:03:40 +00:00
Anton Georgiev
1d1c8a421b
deskshare edl for webrtc
2015-09-28 20:49:24 +00:00
Calvin Walton
a6d6001040
Convert audio_size to a number before subtracting header size
2015-09-25 14:11:25 -04:00
Calvin Walton
d44b458b49
Need to convert bit_rate to an integer
2015-09-25 14:08:17 -04:00
Anton Georgiev
366b01fff7
webrtc deskshare work on recording scripts
2015-09-25 18:05:54 +00:00
Calvin Walton
530799776d
Fix some reference errors in wav detection
2015-09-25 14:01:30 -04:00
Calvin Walton
1dcd49e180
record-and-playback: Handle FreeSWITCH wav files >4GB
...
FreeSWITCH writes wav files >4GB long with incorrect values in the length
field in the header. Recalculate the length based on file size, and ensure
that ffmpeg reads the complete audio file rather than stopping.
2015-09-24 15:54:20 -04:00
RafaFP
0284ee0048
Latest version of the implementation of the feature #1734 .
...
Data on Playback, Metadata and Download are now present on the publish_ended event.
If the related content is absent it will be returned empty, if otherwise present all child tags and data will be presented.
refs 1734
2015-09-14 15:55:06 +00:00
RafaFP
4325e98bf2
Implemented the code to add the "playback", "meta" and "download" tags from the XML to the publish_ended.
...
Added code to guarantee that a hash is passed even when the tags do not exist in the XML.
#feature 1734
2015-09-11 21:12:09 +00:00
RafaFP
2a85811d40
Implemented hash data gathering dinamically, still have to use TRY to catch the nil exception.
...
If the hash is nil the publish_ended post is skipped.
Must validate the tag values and add the download tag.
2015-09-11 18:20:47 +00:00
Felipe Cecagno
ed366e6b21
Merge branch '090-recordings-size' into mconf-live0.7.3
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
2015-09-08 17:43:20 -03:00
Felipe Cecagno
32957898f6
refactored part of the bbb-0.9-recording-size code in order to include the size on the download size for mconf_encrypted and the playback size for the others; included raw_size for all available formats
2015-09-08 17:18:02 -03:00
RafaFP
eb1b5aee49
Included playback data to the event of "publish_ended"
...
#refs 1734
2015-09-01 16:13:10 +00:00
RafaFP
8602d3c263
Added the link and duration info to the publish_ended event.
...
#refs 1734
2015-08-31 20:29:00 +00:00
Calvin Walton
cc23f30c2b
Fix poll in recording when there are 0 responders
...
There were a couple of problems:
* A division by 0 when calculating the percentages
* Positioning of the number of results counter was incorrect
Fixes #2739
2015-08-24 14:42:31 -04:00
Fred Dixon
c99da48041
Removed uneeded script
2015-08-13 17:32:03 -04:00
Calvin Walton
e3e0f0ef61
Add poll result display to the 'presentation' recording format
...
Note that this requires a new dependency be added to the
"bbb-playback-presentation" format; the "gnuplot" package is now
required (it's used to actually generate the chart images)
2015-08-11 14:55:59 -04:00
Felipe Cecagno
3e567f4493
Merge branch '090-encrypted-recording' into mconf-live0.7.0
2015-07-18 10:47:59 -03:00
Felipe Cecagno
31a67490d2
changed permissions over mconf-recording-decrypter, so we can run it
2015-07-18 10:37:10 -03:00
Felipe Cecagno
eef0398885
changing permissions over bbb-0.9-recording-size, which is now executable
2015-07-15 17:16:04 -03:00
Felipe Cecagno
5e326b7528
do not create a copy of the raw data to create the mconf_encrypted format, just use the data from the raw dir directly
2015-07-04 17:02:50 -03:00
Felipe Cecagno
6929b4817e
fix the condition for mconf-decrypter job to process an encrypted recording
...
because of the wrong condition, mconf-decrypter was reprocessing all the recordings available
2015-07-04 17:02:03 -03:00
Pedro Beschorner Marin
60a1ae6436
Cleanup
2015-06-10 17:14:14 +00:00
Pedro Beschorner Marin
cbfe8b8859
Added an update script for sizes injection in old recordings metadata and some refactoring
2015-06-10 17:07:11 +00:00
Pedro Beschorner Marin
9932a4c4fe
Fixing metadata.xml identation
2015-06-10 00:39:55 +00:00
Pedro Beschorner Marin
f8ff4a6725
Injecting format size in metadata.xml
2015-06-09 21:06:57 +00:00
Pedro Beschorner Marin
6ef2bf6b27
Getting playback and full meeting published sizes
2015-06-09 14:39:35 +00:00
Pedro Beschorner Marin
4225a87abd
Refactoring and cleanup
2015-06-04 16:03:20 +00:00
Pedro Beschorner Marin
a1a7096c3e
Getting the raw size of the meeting data
2015-06-03 15:19:41 +00:00
Pedro Beschorner Marin
cc55e6f6a4
Adding new attributes to bbb-web
2015-06-02 18:58:11 +00:00
Felipe Cecagno
6d7c4b5d6e
Merge branch '090-encrypted-recording' into mconf-live0.6.3
2015-05-19 00:03:19 -03:00
Felipe Cecagno
f9ef1b4edd
replaced the way we download the encrypted file in the recording server - wget uses much less memory than the previous method
2015-05-19 00:03:08 -03:00
Felipe Cecagno
7cb12f8b49
Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release
...
Conflicts:
bbb-api-demo/src/main/webapp/demo10_helper.jsp
bbb-video/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-client/locale/bg_BG/bbbResources.properties
bigbluebutton-client/locale/cs_CZ/bbbResources.properties
bigbluebutton-client/locale/cy_GB/bbbResources.properties
bigbluebutton-client/locale/de_DE/bbbResources.properties
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/es_419/bbbResources.properties
bigbluebutton-client/locale/es_ES/bbbResources.properties
bigbluebutton-client/locale/et_EE/bbbResources.properties
bigbluebutton-client/locale/fa_IR/bbbResources.properties
bigbluebutton-client/locale/fr_CA/bbbResources.properties
bigbluebutton-client/locale/fr_FR/bbbResources.properties
bigbluebutton-client/locale/hu_HU/bbbResources.properties
bigbluebutton-client/locale/hy_AM/bbbResources.properties
bigbluebutton-client/locale/it_IT/bbbResources.properties
bigbluebutton-client/locale/ms_MY/bbbResources.properties
bigbluebutton-client/locale/no_NO/bbbResources.properties
bigbluebutton-client/locale/pl_PL/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/locale/ru_RU/bbbResources.properties
bigbluebutton-client/locale/sk_SK/bbbResources.properties
bigbluebutton-client/locale/tr_TR/bbbResources.properties
bigbluebutton-client/locale/uk_UA/bbbResources.properties
bigbluebutton-client/locale/zh_CN/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
bigbluebutton-client/resources/prod/lib/deployJava.js
bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2015-05-17 19:25:26 -03:00
Mateus Dalepiane
0662a242aa
Merge branch 'bigbluebutton/master' into 090-new-videodock
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
2015-04-29 12:10:41 -03:00
Calvin Walton
301665a35b
Fix off-by-one error in slide clear events
...
In 0.9.0, the slide clear events changed from using 1-based page numbers to
using 0-based page numbers.
Add 1 to the page number for recordings generated on a 0.9.0+ server to
fix the issue; at this point it's too late in the release to change the value,
and there's too big of a body of existing recordings out there.
2015-04-14 17:33:49 -04:00
Calvin Walton
c96f9f0cfe
Add a function to compare BBB version numbers
...
This can be used to check if e.g. recording is from a 0.9.0 or newer server
2015-04-14 17:33:49 -04:00
Felipe Cecagno
c9185e9ba0
Merge branch '090-encrypted-recording' into mconf-live0.6.2
2015-04-06 17:06:41 -03:00
Felipe Cecagno
795c4c0af5
do not check anymore for archived.done file before processing the encrypted recording, because the archived flag is removed after the recording is published
2015-04-06 17:06:08 -03:00
Calvin Walton
e1e2d78e50
Skip the 'ser' repair if there are no webcam videos
...
This was causing the sanity check to fail.
2015-03-24 21:15:49 -03:00
Calvin Walton
34b13eb807
Attempt to repair red5 'ser' files in sanity script
2015-03-24 21:15:49 -03:00
Felipe Cecagno
d8174e3d78
Merge branch '090-encrypted-recording' into mconf-live0.6.2
2015-03-24 21:15:44 -03:00
Felipe Cecagno
d4f0c2c229
fixed the start and end time on the encrypted format metadata, which is now based on epoch
2015-03-24 21:15:25 -03:00
Calvin Walton
694213cf9b
Recording: Fix video EDL merge function on EDLs with recording marks applied
...
If the video EDL merge function is applied to an EDL that has already
been edited to apply recording marks, the merge function will change the
video start times to incorrect values on edit points during the timestamp
recalculation.
The fix is pretty simple; just pull in the timestamps from the entry that's
being merged in and apply them to the relevant videos.
This bug doesn't currently cause any issues in the BigBlueButton recording
scripts, since the existing code does the merge before the start/stop marks
are applied. But to avoid surprises later, it would be good to fix this.
2015-03-23 11:10:43 -04:00
Calvin Walton
5a2c7bae69
Fix beta recording update script
...
It had some leftover debug code that caused it to only convert the
first 10 recordings instead of all of them.
The name of the '.done' file is changed so the update will be re-run
automatically.
2015-03-20 17:48:05 -03:00
Calvin Walton
e75bb15ad0
Fix beta recording update script
...
It had some leftover debug code that caused it to only convert the
first 10 recordings instead of all of them.
The name of the '.done' file is changed so the update will be re-run
automatically.
2015-03-18 14:56:00 -04:00
Calvin Walton
eedbafa94f
Adjust recording system to archive, but not process, recordings with no marks
...
This allows them to be preserved for a period of time, rather than be
deleted immediately. Useful for recovering recordings when someone forgot
to press the record button during the session.
2015-03-11 13:40:56 -04:00
Felipe Cecagno
9edb77fff1
Merge branch '090-encrypted-recording' into mconf-live0.6.2
2015-02-05 14:33:21 -02:00
Felipe Cecagno
91067c5172
handling the case when the getRecordings url for the mconf-decrypter is not set
2015-02-05 14:32:48 -02:00
Felipe Cecagno
e8f4e55d5f
updating the mconf logo on presentation_export
2015-02-02 20:50:12 -02:00
Felipe Cecagno
c6c3122afa
Merge branch '090-presentation-export' into mconf-live0.6.2
2015-02-02 20:36:15 -02:00
Felipe Cecagno
4f46e37727
changing permissions of the presentation export zipped file
2015-02-02 20:36:06 -02:00
Felipe Cecagno
cb50a8a304
Merge branch '090-presentation-export' into mconf-live0.6.2
2015-02-02 14:06:40 -02:00
Felipe Cecagno
ad25125b19
reverted back the previous implementation of presentation_export as process/publish scripts instead of just one publish script; now rap-worker cleans the workspace when the presentation format is published, so presentation dependet formats can execute in the next run
2015-02-02 14:06:20 -02:00
Felipe Cecagno
d1bcfe9189
do not run the publish script if the process script failed
2015-02-02 13:59:29 -02:00
Felipe Cecagno
1de10b2339
protect rap-worker to write the processing_time file when the directory isn't there yet
2015-02-02 13:58:57 -02:00
Calvin Walton
c90e5f8990
Skip the 'ser' repair if there are no webcam videos
...
This was causing the sanity check to fail.
2015-01-30 10:11:44 -05:00
Felipe Cecagno
9a7bae79a8
Merge branch '090-new-videodock' into HEAD
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
record-and-playback/deploy.sh
2015-01-28 20:33:28 -02:00
Felipe Cecagno
fe348e0065
fixed the deploy scripts for record and playback
2015-01-28 19:20:11 -02:00
Calvin Walton
c6f976db4b
Attempt to repair red5 'ser' files in sanity script
2015-01-27 14:01:29 -05:00
Felipe Cecagno
a7e286ae33
Merge branch '090-mconf-branding' into mconf-live0.6.2
2015-01-25 12:00:59 -02:00
Felipe Cecagno
0843ec1361
Merge branch '090-mconf-branding' into HEAD
...
Conflicts:
bigbluebutton-client/locale/ru_RU/bbbResources.properties
bigbluebutton-config/web/default.pdf
2015-01-25 11:59:45 -02:00
Felipe Cecagno
38e27ecfca
Merge branch '090-presentation-export' into mconf-live0.6.2
...
Conflicts:
record-and-playback/deploy.sh
2015-01-23 14:50:06 -02:00
Felipe Cecagno
871705d38a
cleanup
2015-01-23 14:17:07 -02:00
Felipe Cecagno
1255f4520f
made presentation_export a post_publish script
2015-01-23 14:11:45 -02:00
Felipe Cecagno
b3daaf72b3
Merge branch 'presentation-export' into 090-presentation-export
2015-01-22 15:58:16 -02:00
Felipe Cecagno
2761c31e52
Merge branch '090-encrypted-recording' into mconf-live0.6.2
...
Conflicts:
bbb-video/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/locale/de_DE/bbbResources.properties
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
2015-01-21 18:11:56 -02:00
Felipe Cecagno
8e12c909c5
Merge branch '090-encrypted-recording' into HEAD
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
record-and-playback/core/Gemfile
record-and-playback/deploy.sh
2015-01-21 15:51:29 -02:00
Felipe Cecagno
12f7aacf4b
Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-client/locale/fr_CA/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
2014-12-09 16:52:43 -02:00
Calvin Walton
65bb9ce47e
recording: Strip out the 'event:' from the beginning of urls in chat
2014-12-08 11:43:26 -05:00
Felipe Cecagno
f077cc1f98
do not generate a .fail file during the archive phase if no recording marks were detected
2014-11-26 15:37:19 -02:00
Felipe Cecagno
6b863595b2
removing the keys during the archive phase if there's no recording marks in the recording
2014-11-26 12:06:15 -02:00
ern
7bf4a81039
checkUrl returns true for only 200 status
2014-11-25 13:11:57 -05:00
Felipe Cecagno
a3acb00893
Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1
...
Conflicts:
bbb-video/build.gradle
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
bigbluebutton-config/web/default.pdf
2014-11-22 20:28:39 -02:00
ern
8c023cbebd
Any 200 status in checkUrl should be valid
2014-11-18 09:00:27 -05:00
Calvin Walton
213dc07c19
Merge pull request #428 from mconf/rap-publish-events
...
Rap publish events
2014-11-14 12:08:44 -02:00
Felipe Cecagno
1c143c74a1
refactored rap-worker so variable names make more sense than before
2014-11-13 23:10:22 -02:00
Calvin Walton
3e8019f5a0
Delete the 'slides' processing scripts
...
The slides processing scripts have never been updated for 0.9.0 events,
and probably never will be. They're still using older video/audio
processing apis that have poor sync, too. Just remove them.
The playback support files will still be installed, to allow recordings
from old BigBlueButton servers to be copied to a 0.9.0 server.
2014-11-13 11:15:43 -02:00
Felipe Cecagno
0cefee5534
now the rap scripts publish to redis pubsub (channel bigbluebutton:from-rap) when a rap phase begins and ends - it includes archive, sanity, post_archive, process, post_process, publish and post_publish; if there's more than one workflow, it should work without any modification
2014-11-12 17:28:33 -02:00
Felipe Cecagno
f52a0299a6
fixed the deploy script used to deploy the rap dev environment
2014-11-12 17:21:54 -02:00
Felipe Cecagno
b451b4cf84
removed god code on the record scripts
2014-11-12 17:20:10 -02:00
Fred Dixon
9cdc47d16d
Merge pull request #426 from kepstin/recording-updates-2
...
Load bigbluebutton.yml from current path
2014-11-12 16:30:34 -02:00
Calvin Walton
30fdd13af8
Load bigbluebutton.yml from current path
2014-11-12 16:25:52 -02:00
Fred Dixon
48b9c5a01d
Merge pull request #403 from kepstin/recording-updates-2
...
Version the playback files for the presentation recording format
2014-11-12 16:02:13 -02:00
Calvin Walton
98efa28316
Add a script to handle updating links in existing recordings
...
This adds the version number to the playback links so that
recordings select the correct version-specific playback support
files.
This script may be run automatically during upgrade; in that
case it should be run like
.../bbb-0.9-beta-recording-update --quiet
After copying recordings from an old BigBlueButton server, you
may want to manually re-run the script, and it takes the option
--force to recheck all recordings even if it has previously been
run.
2014-11-12 15:54:45 -02:00
Fred Dixon
fd06539c43
Merge pull request #423 from kepstin/recording-updates
...
Add delay before recording archiving to workaround Red5 race
2014-11-12 12:18:32 -02:00
Calvin Walton
961898c1e9
Add delay before recording archiving to workaround Red5 race
...
Right now there is a possibility that the rap-worker process might
see the recording.done file (written by bbb-web) prior to Red5 having
completed writing the video files to disk.
This happens most often when a meeting end api request is sent while a
webcam is visible.
Add a delay (currently 2 minutes) before the archive scripts are run
to work around the issue. Real fix is far more complicated...
2014-11-12 11:13:57 -02:00
Felipe Cecagno
3db4ead6e4
Merge branch '090-listen-only-by-default' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-client/locale/ru_RU/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
2014-10-15 00:22:27 -03:00
Richard Alam
8f38fa1f30
- find audio wav files even if they are located in sub dirs
2014-10-08 13:50:41 -07:00
Calvin Walton
49b66d6eb6
Fix publish step failing when multiple recordings processed in one run
...
The logic for deleting the process done files was wrong, resulting in
the script (attempting and failing) deleting all of the done files for
all of the processed recordings after the publish completes for one of
them.
Fix the logic to only delete the process done file for the recording that
just completed publishing.
2014-10-08 11:08:22 -04:00
Calvin Walton
1078aef49d
Add a note to the nginx config to tell 0.9.0 beta users of a possible upgrade path
2014-10-06 17:30:32 -04:00
Calvin Walton
630ef4c72c
Move 0.81 files to a subdir, add nginx redirect for them.
...
Now the 0.81 presentation playback files are in an appropriate versioned
directory. If desired, the recording metadata can be updated to reference
the versioned files directly, but an nginx redirect has been added so
that unmodified recordings will also work.
2014-10-06 17:17:20 -04:00
Calvin Walton
8673d353bb
Use the directory presentation/0.9.0 instead of presentation2
...
This makes it a bit more obvious how the versioning can work going
forwards, and makes it so that we do not need to update the nginx
config each time we have a new version of the playback files.
The 0.81 files remain at the top level of the presentation directory
for compatibility reasons.
2014-10-06 16:46:55 -04:00
Calvin Walton
852ea7b822
Revert 'presentation' dir to 0.81 code, add 'presentation2' for 0.9
...
This fixes an issue where recordings copied from a 0.81 server might
not play back correctly on a 0.9 server.
This changes the 0.9 recording scripts to use playback support files
from a different subdirectory, 'presentation2', while existing 0.81
recordings continue to use the 'presentation' directory.
If the raw files from an old recording are reprocessed, it will
switch to using the newer playback support files.
2014-10-06 16:15:25 -04:00
Felipe Cecagno
59debc5d1e
Merge branch '090-mconf-branding' into mconf-live0.6.1
2014-10-05 23:32:43 -03:00
Felipe Cecagno
015d708d7c
Merge branch 'mconf-branding-0.81' into 090-mconf-branding
...
Used the following command to comment the default copyright label for all languages except en_US
find -name bbbResources.properties | xargs sed -i "s:^\(bbb.mainshell.copyrightLabel2.*\):# \1:g"
Conflicts:
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/src/BigBlueButton.mxml
record-and-playback/presentation/playback/presentation/playback.html
2014-10-05 19:36:43 -03:00
Felipe Cecagno
56f20fa5d3
Merge branch '090-encrypted-recording' into HEAD
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2014-09-10 17:27:47 -03:00
Felipe Cecagno
c1f3b2c5c7
a few tweaks to fit the new rap worker
2014-09-10 17:23:17 -03:00
Calvin Walton
72fc36caef
Actually fix slide indexes.
...
While the page numbers from BigBlueButton are zero-based, the slide images
are generated as 1-based.
2014-09-09 17:15:57 -04:00
Calvin Walton
c7967810b2
Revert the presentation publish page index altering
...
This was added because BigBlueButton 0.9 started using 1-based page
numbers in the events.xml file. That change has been reverted, so as
to avoid behaviour changes from 0.81 in places where it's unnecessary.
2014-09-02 15:46:52 -04:00
Felipe Cecagno
f68b0e4a16
cleanup
2014-09-01 17:53:57 -03:00
Felipe Cecagno
dd97b8f80c
Merge branch 'encrypted-recording' into 090-encrypted-recording
...
Conflicts:
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2014-09-01 16:46:03 -03:00
Calvin Walton
15fe621523
Use the timestamp from the meeting ID to calculate the real start time
...
With the switch to a different clock source in red5, the timestamps
in the events file are no longer real-time, but are rather in
seconds since computer boot.
The timestamp in the meeting id is still realtime, so use that as
the start time. Calculate the end time by adding the meeting length
to the start time.
2014-08-29 11:19:59 -04:00
Calvin Walton
913f4a59a0
Switch recording processing to use poppler instead of ghostscript
2014-08-28 14:52:23 -04:00
Calvin Walton
b03dbfe577
RaP: video processing robustness improvements
...
Makes it handle possibly corrupted video files with less chance of
breakage. Use features from newer ffmpeg release to simplify the video
trimming - in particular, using -ss as an input option is accurate now.
2014-08-28 13:07:26 -04:00
Calvin Walton
614617c2b9
Add the 'mkclean' step for audio-only recordings
2014-08-25 11:22:55 -04:00
Calvin Walton
48735ccc70
Set the audio 'original duration' during initial events parsing
...
This is the point at which the start/stop events for the audio are
correctly matched up with eachother; doing it later can give
incorrect results if an 'end recording' event was missing from
the events file.
2014-08-25 10:48:17 -04:00
Calvin Walton
c1bb493c10
Fix the 'timestretch' fixup so that seeking is done after stretching
...
The previous version may have the beginning of the audio off by a bit,
since it was seeking in the audio file to find the start before the
stretch was applied.
2014-08-22 17:07:07 -04:00
Calvin Walton
e5b5b5d49d
Increase the audio bitrate in the video generation
...
Matches the corresponding change in the audio generation.
2014-08-22 16:58:31 -04:00
Calvin Walton
45162ce620
Explicitly use out0 in degenerate concat branch.
...
There is no i variable here, since there aren't multiple inputs to loop
over.
2014-08-22 16:43:35 -04:00
Calvin Walton
d53e7d21f3
Don't use the ffmpeg concat filter when only one audio segment
...
The concat filter requires at least 2 segments, it doesn't support
the degenerate case.
2014-08-22 16:41:16 -04:00
Calvin Walton
0841dd4233
Vorbis needs more bitrate for input with higher sample rate/stereo
2014-08-22 16:14:35 -04:00
Calvin Walton
2ac9de71a7
Use the correct timestamp for file start seek
2014-08-22 15:17:10 -04:00
Calvin Walton
7b205bdbf7
Rewrite audio processing to use ffmpeg
...
There's some fairly major changes here, including:
* All audio is resampled to 48kHz stereo on input, allowing files with
non-standard or varying rates to be mixed
* The audio processing is now done in a single pass; ffmpeg reads all
inputs, concatenates them, and outputs one file.
2014-08-22 15:04:14 -04:00
Richard Alam
c56fde0c42
Merge pull request #348 from speakserve/unify-version-number
...
Unify version number
2014-08-13 14:17:45 -04:00
Ghazi Triki
bb09eb6d75
After checking we bumped projects version and Flex locales to 0.9.0 with some fixes
2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a
Bumped projects version and Flex locales to 0.9
2014-08-13 10:28:08 +01:00
Calvin Walton
8f7bf010fd
Switch "post" scripts to be a drop-in directory.
2014-08-11 14:57:32 -04:00
Ghazi Triki
ac7af7dfea
Manually bumped all application version to the correct actual version 0.9.0-dev
2014-07-31 17:42:38 +01:00
Calvin Walton
c73fe81e50
rap-worker: Add /usr/local/bin to the path.
2014-07-28 11:02:38 -04:00
Calvin Walton
c82a25f700
recording: Add a 'mkclean' step to video generation
...
The 'mkclean' tool reorganizes the encoded webm file to optimize it for
streaming. In particular, it moves the index to the start of the file.
This fixes streaming in Chrome, which otherwise had a very long delay
before playback started since it downloaded until it saw the index
before it started playback.
This needs a new dependency added to the bbb-record-core package to
pull in the mkclean tool.
2014-07-23 09:55:03 -04:00
Calvin Walton
86e8394e70
rap-worker: Ensure status directories are created
...
In some cases, it was attempting to create a status file in a directory
that did not exist yet.
2014-07-23 09:50:52 -04:00
Calvin Walton
11045c7f4a
rap-worker: Set log level to 'INFO'
...
I had it on DEBUG temporarily for testing. The old version used ERROR,
but this made it print virtually no output which made diagnosing
issues difficult.
2014-07-21 15:00:29 -04:00
Calvin Walton
b91a54afa0
record core: Remove hardcoded ffmpeg path
...
The ffmpeg binary should be looked up using the normal PATH mechanism,
it might not always be installed in the same place.
2014-07-21 14:59:33 -04:00
Calvin Walton
efb44c9dd9
Rewrite rap-worker script in an optimized fashion
...
It now does much less directory reading, and performance should
scale far better with large numbers of recordings.
Semantics should be mostly unchanged, but there's greater use
of '.fail' files to mark errors, and '.done' files are now removed
after all of the following processing steps complete.
The rap worker no longer relies on processing scripts leaving
behind empty directories; those are now removed where appropriate.
2014-07-21 14:58:46 -04:00
Gustavo Salazar
67422a4450
set version in archive
2014-05-06 17:15:10 -05:00
Gustavo Salazar
fb013e751f
support bbb_version in events.xml
2014-05-06 14:42:03 -05:00
Gustavo Salazar
ab648a5f73
pass only meeting id to post publish script
2014-05-05 18:27:26 -05:00
Gustavo Salazar
6a47005f34
spinner in playback while loading media
2014-04-30 17:35:53 -05:00
Gustavo Salazar
efda95fed6
delete temp files
2014-04-29 10:33:23 -05:00
Gustavo Salazar
b1e82fe58d
post scripts for record and playback
2014-04-24 19:08:06 -05:00
Gustavo Salazar
7d291abcfd
delete old raw dir from published recordings
2014-04-14 15:14:14 -07:00
Gustavo Salazar
4989b195f4
set absolute path to ffmpeg
2014-04-07 12:14:47 -07:00
Richard Alam
460dfb52bf
- modify scripts so we can run it manually
2014-04-03 20:23:49 +00:00
Gustavo Salazar
ff96b6a97a
absolute path to ffmpeg and ffprobe.
2014-03-31 18:13:52 -05:00
Fred Dixon
332824a42c
Fixes so rap-worker.rb executes
2014-03-26 23:52:59 +00:00
Calvin Walton
7b48cacb59
Reverse the check for http response code.
...
There are many codes other than '404' which indicate that the media
file is not present or otherwise unusable. Instead of checking for
a particular failure mode, check for explicit success.
I ran into this on a server that had directory listing disabled, and
returned a 403 (access denied) error on non-existant files.
2014-03-05 14:42:08 -05:00
Gustavo Salazar
99866d43a7
Print audio file name with problems.
2014-01-30 10:45:43 -05:00
Gustavo Salazar
8a32c657d5
Handle negative index in slide number.
...
Related to issue #1710
2014-01-23 16:36:28 -05:00
Gustavo Salazar
614cbdde92
Fix #1711
...
Support pdf extension in uppercase https://code.google.com/p/bigbluebutton/issues/detail?id=1711
2014-01-23 14:03:09 -05:00
Felipe Cecagno
98f1d51461
fixing the handling of multiple drawings from a single shape
...
bug could be easily reproduced typing text, erase part of it and then type again
2014-01-14 18:17:39 -02:00
Felipe Cecagno
3440ed0fe3
Merge branch 'v0.81' into record-button
...
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2014-01-14 14:05:41 -02:00
Felipe Cecagno
dab7547014
added a check on presentation publish script to avoid the duplication of thumbnails for a given slide
2013-12-02 15:23:02 -02:00
Felipe Cecagno
955f9edc99
fixing the issue of the whiteboard annotations not being shown in the proper slide; cleaning the environment (events.xml, recorded flag) when the session was recorded but the record button wasn't used
2013-12-02 13:57:05 -02:00
Calvin Walton
1d488e3c56
Last-ditch fix for missing presentation images
...
We can only get here if all of the files for the presentation are
*completely* missing. One thing that can cause this is if the
presentation filename starts with a '.' character - the presentation
files aren't correctly archived then.
2013-10-31 18:56:09 -02:00
Richard Alam
e220f120cc
Merge pull request #280 from kepstin/firefox-audio-seek
...
Switch the order of the audio formats on firefox playback
2013-10-23 13:59:49 -07:00
Calvin Walton
4a45b3610b
Switch the order of the audio formats on firefox playback
...
Firefox has a bug where it can't seek in the audio-only webm files with
no cues, and it seems like they have no intention of fixing this...
Serve up the ogg files first for them.
Adding cues to audio-only webm files is *hard*, there are no standard
tools that support doing this cleanly.
2013-10-23 16:35:21 -04:00
Calvin Walton
e6fe43f9b6
Fix a logger method call in presentation script
...
This shouldn't normally be hit... but if it ever is, the processing will
fail with an error, since the Logger class doesn't have a method named
'warning'.
2013-10-23 10:01:02 -04:00
Gustavo Salazar
38f8ed5741
Support processing of images with extension .jpeg
2013-10-18 17:46:07 -05:00
Calvin Walton
de0bac6f76
Skip corrupt/empty audio files when processing recording.
...
Now when an empty/corrupt audio file is detected, it will be replaced
with silence.
2013-10-18 11:39:03 -04:00
Guilherme Augusto Dias
129e942d16
Add recording length information to metadata file
...
Add a tag containing the duration of the recording to metadata file
2013-10-15 14:29:49 +00:00
Felipe Cecagno
51e2974316
fix the last commit that removes all the previously downloaded files related to the current recording
2013-10-14 12:13:49 -03:00
Calvin Walton
8facc0899e
Check for corrupt video files, don't attempt to render them
...
A corrupt video file is defined as one where ffprobe either finds no
video stream, or it finds a video stream but cannot read any frames.
2013-10-11 11:19:40 -04:00
Guilherme Augusto Dias
dcabfc46fa
Cut off unwanted slide events
...
Ignore slide events that happened after the last stop recording timestamp
2013-10-10 13:53:32 +00:00
Guilherme Augusto Dias
0d1c64f3ae
Show thumbnail timestamp
...
The timestamp of first thumbnail is shown when the presentation starts.
2013-10-10 13:06:38 +00:00
Guilherme Augusto Dias
67fee3bff5
Correct clear/undo timestamp translation
...
Postpone the translation of timestamp for clear/undo events, so the events are applied correctly.
2013-10-09 19:51:46 +00:00
Felipe Cecagno
6e0553ed7c
Merge branch 'record-button' of github.com:guilhermedias/bigbluebutton into record-button
...
Conflicts:
record-and-playback/presentation/scripts/publish/presentation.rb
2013-10-07 22:36:31 -03:00
Guilherme Augusto Dias
8c89024084
Fix issue in multi-segment recording
...
Correctly draw shapes in multi-segment recordings.
2013-10-07 20:08:14 +00:00
Felipe Cecagno
d9dfe4a5d0
fixed partially the issue with the shapes timestamp made after the first period of recording, there's still work to do
2013-10-04 16:52:53 -03:00
Richard Alam
92a31599f9
Merge pull request #270 from kepstin/presentation-resiliance
...
Make generation of png images for pdf pages more resiliant.
2013-10-04 12:50:22 -07:00
Calvin Walton
420b0b5573
Make generation of png images for pdf pages more resiliant.
...
We now use ghostscript to output pngs directly from the original pdf,
rather than using convert on the split pages. This should make corrupt
or strange pdfs less likely to cause issues.
As well, if a pdf page conversion fails (for any reason, including that
the original pdf is missing...) it will be logged, and a blank page
generated, and processing will continue.
2013-10-04 15:25:13 -04:00
Felipe Cecagno
f49091c260
Merge branch 'record-button' of https://github.com/guilhermedias/bigbluebutton into record-button
2013-10-04 11:26:48 -03:00
Felipe Cecagno
8830951ac0
to specify the duration on ffmpeg we use -t instead of -to
2013-10-04 11:04:21 -03:00
Felipe Cecagno
00d0eb7b43
we only to the match between the video events and the record status events AFTER the webcam and deskshare merge
2013-10-04 11:03:49 -03:00
Gustavo Salazar
5dff55fb13
remove audio extension in webcam processing for matterhorn
2013-10-03 13:50:31 -05:00
Guilherme Augusto Dias
9d1dd1d8d2
Fix shape/image matching test
...
Fix iteration range when checking if a shape is within an image
2013-10-02 22:32:16 +00:00
Guilherme Augusto Dias
1b6c5a5b58
Highlight thumbnail
...
The thumbnail of the first slide starts highlighted
2013-10-02 22:31:10 +00:00
Felipe Cecagno
5eaa9a562d
added a new protection for the recording server decrypt script; before start to process a new encrypted recording, the server removes all files related to that recording; it will guarantee that if it fails for any reason, the next run will start fresh
2013-10-02 17:37:35 -03:00
Felipe Cecagno
d8b3375f48
we don't want to archive recordings in which there's no mark to start the recording; it would be the same as if the meeting would be created with record=false - the only difference is that the events are archived to recordings/raw/meeting_id/events.xml, and the recorded .done flag is created as well
2013-10-02 14:18:26 -03:00
Gustavo Salazar
ca6e32bc93
separate scaling and padding commands for deskshare
2013-10-01 17:11:23 -05:00
Gustavo Salazar
cfc6b3385b
set sample rate
2013-10-01 17:05:55 -05:00
Gustavo Salazar
c5e4820f25
don't pass the file extension
2013-10-01 17:02:36 -05:00
Gustavo Salazar
5d5d135557
set video quality
2013-10-01 16:53:39 -05:00
Felipe Cecagno
9a2c605866
Merge branch 'master' into multicamera-0.81
...
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
2013-09-29 21:19:29 -03:00
Guilherme Augusto Dias
00d4c69f78
Fix audio processing issue
...
Fix an issue that occurs on processing recordings with no audio
2013-09-27 19:26:33 +00:00
Felipe Cecagno
322176ddf3
Merge branch 'record-button' of https://github.com/guilhermedias/bigbluebutton into record-button
...
Conflicts:
record-and-playback/presentation/scripts/publish/presentation.rb
2013-09-26 13:06:15 -03:00
Guilherme Augusto Dias
99b17e6f58
Change shape timestamps generation
...
The timestamps of shapes drawn during a non recording period are being correctly generated.
2013-09-26 13:32:55 +00:00
Felipe Cecagno
4abf4f76d4
if the slide time is 0 and you click on his thumbnail, you will want to see &t=0s, not &t=
2013-09-25 01:32:16 -03:00
Felipe Cecagno
32b52fefb8
start and stop recording marks are being considered in all medias (audio, video and deskshare); still needs to figure out the inconsistency when the last participant leaves the conference while it's being recorded, but couple of seconds later another participant joins the meeting; the problem is that after the last user leaves the conference, the scope is deleted so the recording flag is lost, and when the scope is created again, the recording flag has the default value, that is false; also, what should we do if the user doesn't click on the recording button? how to differentiate recordings made in a version with or without the recording button?
2013-09-25 00:34:15 -03:00
Felipe Cecagno
cf8b31591c
this commit is an unfinished work; the new code that generates the audio and video files in the recording is being adapted to take into account the recording marks; the audio is done, but video and desktop sharing is still missing
2013-09-24 18:03:12 -03:00
Felipe Cecagno
aa597fe985
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button-client
...
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
record-and-playback/core/lib/recordandplayback.rb
record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
record-and-playback/core/lib/recordandplayback/generators/events.rb
record-and-playback/core/lib/recordandplayback/generators/video.rb
record-and-playback/presentation/scripts/publish/presentation.rb
2013-09-24 15:03:44 -03:00
Felipe Cecagno
33d98bbff2
implemented the record button both client-side and server-side; still needs more work on the processing scripts; still needs to update the record button icons
2013-09-23 18:33:30 -03:00
Felipe Cecagno
b5b81c1c4d
refactored a little bit the function translateTimestamp; the images that are never displayed aren't included on the svg file anymore; still have to figure out the issue with the shapes made BEFORE start the recording - for now we cannot differentiate shapes made on the current slide and the ones made on a previous slide before start the recording
2013-09-19 15:22:22 -03:00
Felipe Cecagno
54a34b4475
Merge branch 'record-button' of github.com:fcecagno/bigbluebutton into record-button
...
Conflicts:
record-and-playback/core/lib/recordandplayback/generators/events.rb
2013-09-18 18:02:18 -03:00
Felipe Cecagno
237268424f
the timestamps of the recording events are normalized now, matching the recording marks; still need more testing when there are multiple start-stop recording events; the whiteboard actions are already working, including the slides, but slides that are outside of the recording period are still being loaded in the svg file (#TODO)
2013-09-18 17:54:51 -03:00
Guilherme Augusto Dias
1bd0d7ee4a
Draw multiple shapes
...
Playback script supports drawing multiple shapes at the same time
2013-09-18 17:59:13 +00:00
Guilherme Augusto Dias
78c77fb362
Create timestamp attribute
...
Shape tags have a timestamp attribute (id attribute no longer includes timestamp information).
2013-08-28 17:51:06 +00:00
Calvin Walton
2b5aab3224
Change the background color of the video area to white to match
...
The new scripts render the videos over white, so you get occasional
black bits sneaking in without this.
2013-08-27 11:27:13 -04:00
Felipe Cecagno
f8e63fd6f4
Merge branch 'master' into mconf-branding
...
Conflicts:
bigbluebutton-client/build.xml
bigbluebutton-client/locale/ar_SY/bbbResources.properties
bigbluebutton-client/locale/az_AZ/bbbResources.properties
bigbluebutton-client/locale/bg_BG/bbbResources.properties
bigbluebutton-client/locale/ca_ES/bbbResources.properties
bigbluebutton-client/locale/cs_CZ/bbbResources.properties
bigbluebutton-client/locale/da_DK/bbbResources.properties
bigbluebutton-client/locale/de_DE/bbbResources.properties
bigbluebutton-client/locale/el_GR/bbbResources.properties
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/es_ES/bbbResources.properties
bigbluebutton-client/locale/es_LA/bbbResources.properties
bigbluebutton-client/locale/et_EE/bbbResources.properties
bigbluebutton-client/locale/eu_EU/bbbResources.properties
bigbluebutton-client/locale/fa_IR/bbbResources.properties
bigbluebutton-client/locale/fi_FI/bbbResources.properties
bigbluebutton-client/locale/fr_CA/bbbResources.properties
bigbluebutton-client/locale/fr_FR/bbbResources.properties
bigbluebutton-client/locale/he_IL/bbbResources.properties
bigbluebutton-client/locale/hr_HR/bbbResources.properties
bigbluebutton-client/locale/hu_HU/bbbResources.properties
bigbluebutton-client/locale/id_ID/bbbResources.properties
bigbluebutton-client/locale/it_IT/bbbResources.properties
bigbluebutton-client/locale/ja_JP/bbbResources.properties
bigbluebutton-client/locale/kk_KZ/bbbResources.properties
bigbluebutton-client/locale/km_KH/bbbResources.properties
bigbluebutton-client/locale/ko_KR/bbbResources.properties
bigbluebutton-client/locale/lt_LT/bbbResources.properties
bigbluebutton-client/locale/lv_LV/bbbResources.properties
bigbluebutton-client/locale/mn_MN/bbbResources.properties
bigbluebutton-client/locale/ne_NE/bbbResources.properties
bigbluebutton-client/locale/nl_NL/bbbResources.properties
bigbluebutton-client/locale/no_NO/bbbResources.properties
bigbluebutton-client/locale/pl_PL/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/locale/pt_PT/bbbResources.properties
bigbluebutton-client/locale/ro_RO/bbbResources.properties
bigbluebutton-client/locale/ru_RU/bbbResources.properties
bigbluebutton-client/locale/si_LK/bbbResources.properties
bigbluebutton-client/locale/sk_SK/bbbResources.properties
bigbluebutton-client/locale/sr_RS/bbbResources.properties
bigbluebutton-client/locale/sv_SE/bbbResources.properties
bigbluebutton-client/locale/th_TH/bbbResources.properties
bigbluebutton-client/locale/tr_TR/bbbResources.properties
bigbluebutton-client/locale/uk_UA/bbbResources.properties
bigbluebutton-client/locale/vi_VN/bbbResources.properties
bigbluebutton-client/locale/zh_CN/bbbResources.properties
bigbluebutton-client/locale/zh_TW/bbbResources.properties
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/resources/prod/lib/bbb_blinker.js
bigbluebutton-client/src/BigBlueButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
record-and-playback/presentation/playback/presentation/playback.html
2013-08-26 21:26:44 -03:00
Calvin Walton
ca9a4c2b92
Bump the max difference for audio stretch up to 5%
2013-08-26 13:33:23 -04:00
Calvin Walton
0473682137
Reset the offset to 0; the new scripts seem to have better sync?
2013-08-26 13:23:49 -04:00
Calvin Walton
c2884bdb9d
Add missing license header to edl.rb
2013-08-26 11:44:22 -04:00
Calvin Walton
7c7540a0de
Add a video quality bump when deskshare videos are present.
2013-08-26 11:27:53 -04:00
Calvin Walton
42e195bbe8
Rewrite the audio/video encoding components for BigBlueButton.
...
I've been working on this for a while, and it's adapted from code that
has been fairly well-tested on a wide variety of recordings. I've found
it to do a more accurate job of combining multiple webcam files, and it
should be more accurate in the audio as well.
Another key feature is that it does fewer re-encoding steps during video
processing, which should both speed it up and hopefully improve quality.
The settings on the VP8 encoder have been tuned somewhat as well.
2013-08-26 11:20:33 -04:00
Chad Pilkey
7229d1a45d
added back in the playback buffering indicator and fixed some issues with it
2013-08-23 08:54:45 -07:00
Gustavo Salazar
26e6876136
Fix #1606
2013-08-19 20:17:10 -05:00
Calvin Walton
0fa60e2bc3
Use the old sox trim syntax for the version on ubuntu lucid
2013-08-15 13:36:52 -04:00
Calvin Walton
6b56c4103d
Correct variable name to refer to original audio length
2013-08-15 13:34:19 -04:00
Calvin Walton
d2afbe9383
Convert timestamps to numbers for subtraction
2013-08-15 13:30:36 -04:00
Calvin Walton
acbd0e5b7e
Stretch freeswitch audio to match event timing
...
This helps maintain audio sync with video and events when freeswitch's
internal timing differs from red5's.
2013-08-14 17:25:10 -04:00
Chad Pilkey
3f648000a2
add back in the fix for playback acorn media player swap oddities
2013-08-14 12:15:15 -07:00
Chad Pilkey
6b00d4f029
add back in playback headings
2013-08-14 12:05:55 -07:00
Chad Pilkey
b309d8a13b
changed the way the playback volume bar is exposed
2013-08-07 15:35:27 -07:00
Guilherme Augusto Dias
a762a030ec
Chat events timestamp
...
Calculating timestamp of chat events correctly
2013-08-05 20:32:04 +00:00
Guilherme Augusto Dias
963ea8a1f1
Process chat events
...
Process chat events according to START/STOP record events
2013-08-05 19:13:19 +00:00
jtrobinson
872a9c3b14
Volume slider always visible, part of tab order, does not trigger resizing bug
2013-08-02 11:53:11 -07:00
Guilherme Augusto Dias
daa32dab41
Fix slicing process
...
Fix events timestamp and duration
2013-08-01 13:59:02 +00:00
Chad Pilkey
5ce8fca8de
the tab order of the playback controls is set
2013-07-30 16:49:30 -07:00
Guilherme Augusto Dias
dc249bf347
Slice timeline
...
Slice timeline according to START/STOP record events
2013-07-29 16:45:56 +00:00
Guilherme Augusto Dias
1122f7d298
Fix playback host address
...
Fix playback host address on configuration files
2013-07-29 16:28:04 +00:00
Gustavo Salazar
7ad90a83b2
Merge pull request #216 from SenecaCDOT-BigBlueButton/second-round-accessibility-fixes
...
Second round accessibility fixes
2013-07-23 13:32:04 -07:00
Calvin Walton
a5091ba3e8
RaP: Remove the ffmpeg version check, hardcode arguments for 0.11+
...
For BigBlueButton 0.81, we just require that you install ffmpeg 0.11.x
for recordings to function correctly. I'll also add a check to bbb-conf
to verify that the correct ffmpeg is available.
2013-07-23 15:46:47 -04:00
Chad Pilkey
486bf82522
added checkbox to conditionally expose chat messages to a screen reader
2013-07-22 15:09:10 -07:00
Chad Pilkey
98b76f9bb0
added content headers to playback.html
2013-07-22 15:08:16 -07:00
Gustavo Salazar
422e7570a0
Merge pull request #213 from kepstin/opaque-recording-slides
...
RaP: Adjust the 'convert' command to make opaque images
2013-07-18 13:21:15 -07:00
Guilherme Augusto Dias
04ff2f2074
Slicing audio events list
...
The event processing method slices the audio events list according to record events
2013-07-18 14:53:33 +00:00
Guilherme Augusto Dias
f0a86a8ae9
Changed trim audio method
...
The old audio file is kept and it's possible to set the start mark
2013-07-18 13:41:29 +00:00
Guilherme Augusto Dias
d402f95776
Handling START/STOP record events
...
Changed Events module: possible to retrieve and match record events
2013-07-18 13:15:09 +00:00
Calvin Walton
ecfe8b7db4
RaP: Adjust the 'convert' command to make opaque images
...
This forces a background colour of white on the generated png images for
slides in the slides and presentation recording formats. Fixes Issue
1588.
2013-07-17 18:08:51 -04:00
Gustavo Salazar
bed598ca7a
remove events and files for webcam streams with length zero
2013-07-15 15:22:39 -05:00
Gustavo Salazar
873961509b
Recommended browsers in playback
2013-07-15 15:16:34 -05:00
Fred Dixon
1fbb437c61
Hide option to disalbe auto scroll (no localization yet), updated links to download Chrome and FireFox
2013-06-18 05:28:25 -07:00
Felipe Cecagno
6f7baabc3c
starting to develop the record button using part of guga's code ( https://github.com/gugat/bbb-record-button )
2013-06-17 14:23:45 -03:00
Fred Dixon
e08c6802d4
Update configuration to record desktop sharing by default
2013-06-15 08:25:09 -07:00
Felipe Cecagno
80a8792597
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into sync-playback
2013-07-12 22:23:52 -03:00
Chad Pilkey
77260b1bc2
turning off autoplay in the recording playback
2013-07-12 13:26:26 -07:00
Gustavo Salazar
9b5e42223f
Accept meeting id to create manifest.xml
2013-07-03 15:42:21 -05:00
Felipe Cecagno
e8b9ffab4d
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into sync-playback
2013-07-01 15:33:09 -03:00
Felipe Cecagno
b176ef090f
fixing the incorrect handling of the last timeline event on video processing
2013-07-01 15:32:25 -03:00
Gustavo Salazar
d63fbac298
Create missing start events for webcam streams fix #1561
2013-06-20 15:45:26 -05:00
Leonardo Crauss Daronco
c6da73272b
Hide unnecessary scroll bars in the playback html
2013-06-19 17:22:07 -03:00
Felipe Cecagno
e53ea59abe
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into playback-improvements
2013-06-19 12:44:38 -03:00
Felipe Cecagno
68db2b5fdc
Merge branch 'playback-improvements' of github.com:fcecagno/bigbluebutton into playback-improvements
2013-06-19 12:21:01 -03:00
Leonardo Crauss Daronco
ab73b54fb3
Fix position of elements in the playback after swapping video/presentation
...
The media controls area (acorn controls) was placed in the wrong position
after swapping video and presentation in the recording playback (and was
still wrong if swapping them again).
2013-06-18 23:19:08 -03:00
Felipe Cecagno
0551764df1
Merge branch 'playback-improvements' of github.com:daronco/bigbluebutton into playback-improvements
2013-06-18 15:53:58 -03:00
Leonardo Crauss Daronco
ce668c55b0
Fix the position of media controls in the playback with video
...
The media controls area (acorn controls) was being displayed at the
wrong place in the playback of a recording with video. Now it's always
displayed right below the presentation area, doesn't matter if the
recording has video or not.
2013-06-17 22:56:08 -03:00
Felipe Cecagno
820001214c
improving the rap deployment script
2013-06-17 14:35:23 -03:00
Leonardo Crauss Daronco
891ae0be49
Reposition auto scroll option and audio bar in the playback html
...
Audio control bar is bigger and aligns with the presentation. The auto scroll
checkbox is aligned with the thumbnails area.
2013-06-16 01:35:39 -03:00
Felipe Cecagno
fea7486ae3
implemented the possibility to include the desktop sharing streams to the presentation playback; it composes the presentation video file just like the other video streams, with the difference that while the screen is being sharing, it appears as the unique video stream in the presentation video - when the presenter stops sharing his screen, the other videos populate the video display;
...
also, the output video resolution is modified to the highest screen resolution shared during the conference, independently on the output video resolution set by the user; it was done to preserve the quality of the desktop sharing image; if there's no desktop sharing, the output video resolution is respected
2013-06-14 17:50:39 -03:00
Felipe Cecagno
fda4e203f9
extracted FFMPEG_LOG_LEVEL to a module constant, and use it in all FFmpeg commands; now it's easy to increase the log level during development
2013-06-14 17:44:10 -03:00
Felipe Cecagno
8ca4e949aa
modified the BigBlueButton.execute method so it can raise an exception when the command passed didn't finish successfully; you can optionally pass fail_on_error=false so it won't raise an exception
2013-06-14 17:39:29 -03:00
Felipe Cecagno
bf554b75a8
enabling audio_offset tested for h264
2013-06-13 17:24:37 -03:00
Felipe Cecagno
ced61d3fba
rap-worker now keeps track of the processing time of a recording; a file called processing_time is generated during the process phase, and this information is added to metadata.xml when the recording is published - this information isn't retrieved by getRecordings because no modification was done on bbb-web to include this information, but at least it's there so the sysadmin can check how long does a recording take to get processed
2013-06-13 17:13:20 -03:00
Felipe Cecagno
53c071ddc3
ref #1516
...
Refactored the code that generates the video file used in the presentation playback. The problem with the sync of video sources was related to problems of precision inside FFmpeg (sometimes the script runs FFmpeg to trim video files, and the output video file trimmed sometimes was 3+ seconds bigger or smaller than the requested).
Also it's a little more modular, so it will be easier to expand functionality. The processing steps are more explicit now, and the logs are better now to understand the final output.
A new parameter on presentation.yml was added to enable the admin to add an offset for the audio stream - this is mainly useful when the session ran with h264, because the video takes longer for the client to encode, and then in the recording we can see the huge gap between audio and video.
2013-06-13 17:10:52 -03:00
Gustavo Salazar
2483f76ee6
create audio.webm to play it in IE
2013-06-11 17:20:34 -05:00
Gustavo Salazar
e89bb22e9f
no need to publish events.xml
2013-06-11 17:02:12 -05:00
Gustavo Salazar
f1cd2f071e
publish audio files only if video is not available
2013-06-11 17:00:08 -05:00
Felipe Cecagno
ac66d49812
Create the auto scroll feature on the slides thumbnails. The idea is that everytime the slide changes because of the synchronized playback, the thumbnails div will scroll to keep the current thumbnail centered in the div. The feature can be disabled using a checkbox.
2013-06-09 15:11:50 -03:00
Felipe Cecagno
c8f2079e64
When the user clicks on a slide thumbnail, the URL changes to index that moment so if the user copies and shares the URL after click on a slide thumbnail, the URL copied will go directly to the correct moment.
2013-06-09 14:51:38 -03:00
Gustavo Salazar
0aa1c9867c
support ingest for matterhorn 1.4
2013-06-07 16:27:14 -05:00
Chad Pilkey
e6a93de055
custom start time of recording now works in firefox
2013-06-05 14:05:15 -07:00
Felipe Cecagno
6779e219b2
added the proper mconf logo on the presentation playback page
2013-06-05 15:42:45 -03:00
Felipe Cecagno
3e75f79091
the previous implementation to enable multiple get_recordings_url wasn't working; the thing is that the properties must be global to be visible inside the function definitions; now it's working properly
2013-06-03 14:23:22 -03:00
Felipe Cecagno
7ca5161068
implemented the possibility to specify an array of get_recordings_url instead of just one; fixes #788
2013-05-24 13:26:11 -03:00
Calvin Walton
80ceefa5ca
presentation: Fix presentations which are images not pdfs
...
This was broken by my earlier change to fallback the pdf filename for
really old recordings.
Rearrange the code so that the pdf logic is only used in the case when
the presentation is a pdf.
2013-05-17 14:32:14 -04:00