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
Calvin Walton
366d5901a4
presentation: Support processing 0.80 rectangles and ellipses.
2013-05-17 14:29:49 -04:00
Calvin Walton
ff1e0e948a
RaP: Presentation: Fix panzoom generation to handle no slides
...
It's a pretty rare case, but I've seen some recorded meetings that had
no slides (not even the default pdf). Handle this without crashing.
2013-05-14 14:11:53 -04:00
Calvin Walton
6083403631
RaP: Presentation: Support old recordings with '.pdf' in presentation name
...
In some old recordings (0.80?) I've seen the default presentation pdf
located at the filename .../default.pdf/default.pdf. Support this old
location with fallback logic so the new scripts will work to reprocess
old recordings.
I've improved the error handling logic here a bit as well.
2013-05-14 14:02:23 -04:00
Calvin Walton
a1946007a6
RaP: Presentation: Don't process audio twice when no video.
...
The audio is unconditionally processed earlier in the script. Remove the
line that runs it again when there is no video in the recording.
2013-05-14 13:59:14 -04:00
Chad Pilkey
58a718951e
Fixed the ghost audio by pausing after duplication
2013-05-08 14:39:28 -07:00
Calvin Walton
4962cc713f
Recording: Add a fake panzoom event if none are in the events xml
...
This is required so that the 'presentation' recording format can
reprocess recordings from BigBlueButton 0.80
2013-05-06 17:01:42 -04:00
Felipe Cecagno
31fa3ec7a1
if there's no panzoom events on the events.xml, the publish script of presentation was breaking
2013-03-04 12:52:16 -03:00
Felipe Cecagno
37c9149b85
check if the private key exists was incorrect
2013-03-04 12:51:36 -03:00
Felipe Cecagno
74c023de39
changed the playback logo to use the Mconf one, and some other stuff related to branding on the playback
2013-02-28 16:54:52 -03:00
Felipe Cecagno
213b9793a8
updating record-and-playback from master
2013-02-28 16:45:09 -03:00
Felipe Cecagno
dc27467490
check if the metadata passed in the create call is empty; raise an exception if the private key isn't found on the recording server; updated the deploy script using the ideas implemented on chef
2013-02-28 16:35:22 -03:00
Felipe Cecagno
744dfac699
fixing the xpath stuff on mconf-decrypt
2013-02-26 17:42:41 -03:00
Felipe Cecagno
650d43e0f4
only runs the decrypt script if the get_recordings_url is defined and not empty; removed the logs from the part before checking for the existence of archived/<meeting_id>.done
2013-02-22 22:20:55 -03:00
Felipe Cecagno
ccb857c7e5
fixed the nginx definition for the mconf format;
...
the previous definition was making nginx load from /var/bigbluebutton/published the presentation mconf-default.pdf just because it starts with /mconf
2013-02-22 22:19:03 -03:00
Felipe Cecagno
0afa3511ae
included the fastimage gem to the record and playback Gemfile
2013-02-22 22:17:53 -03:00
Felipe Cecagno
2169dfd6b5
changed the public key metadata name to mconflb-rec-server-key to be compatible with the rest of the service
2013-02-15 14:52:58 -02:00
Felipe Cecagno
d8734f6606
fixing identation
2013-02-08 16:22:09 -02:00
Felipe Cecagno
5bb65fb5af
improved the deploy script so if no parameters are passed, it will act as a recording server; if a text parameter is passed containing "mconf", the encryptor will be deployed
2013-02-08 16:12:27 -02:00
Felipe Cecagno
25c495d123
improved and tested both Mconf encryptor and decryptor
2013-02-08 16:10:28 -02:00
Felipe Cecagno
ee1bfee1fb
changed the behavior of BigBlueButton.execute so the caller can check if the execution was successfully or not
2013-02-08 16:07:52 -02:00
Gilson Souza
a402d10129
Merge branch 'encrypted-recording' of https://github.com/mconf/bigbluebutton into encrypted-recording
...
Conflicts:
record-and-playback/mconf/scripts/publish/mconf.rb
2013-02-07 10:58:35 -02:00
Gilson Souza
36f497e00b
solving issues
2013-02-07 10:52:50 -02:00
Felipe Cecagno
d26f25f7fb
many improvements on the process and published of the encrypted format; if a public key isn't provided as metadata, the key is passed in plain text using a .txt file, otherwise a .enc file is used to store the encrypted key; fixed identation; removing all files except the published ones; handling also the files stored on /var/bigbluebutton/{meetingId} - they are now included into the zip file and will be restored on the recording server
2013-02-06 17:47:33 -02:00
Felipe Cecagno
420f5c976b
adding a patch waiting to be pulled on BigBlueButton master ( https://github.com/bigbluebutton/bigbluebutton/pull/77 )
2013-02-06 17:44:07 -02:00
Felipe Cecagno
135c8fc463
updating the record-and-playback deployment script
2013-02-04 16:42:34 -02:00
Felipe Cecagno
8531534bc7
copied the entire record-and-playback module of BigBlueButton master (pre 0.81) to the v0.8 tag; the only file merged is record-and-playback/core/lib/recordandplayback.rb
2013-02-04 15:34:54 -02:00
Felipe Cecagno
08e07fb049
cleaning up
2013-02-04 15:23:50 -02:00
Gilson Souza
2ecd0f8a99
changing publish and uncrypt files to be according to the new API specification
2013-02-04 13:34:11 -02:00
Gilson Souza
8c759146ab
uncrypting files according to new xml structure
2013-02-04 13:34:10 -02:00
Gilson Souza
7fc5db4b21
changing API to add the new object download into the getrecordings XML reply
2013-02-04 13:34:05 -02:00
Gilson Souza
8dd38bc4be
Changes to be according to specification
2013-02-04 13:34:03 -02:00
Gilson Souza
7a8fa905b6
Creating MD5 checksum file to publish
2013-02-04 13:34:02 -02:00
Gilson Souza
e1207b60e4
corrected some issues
2013-02-04 13:34:00 -02:00
Gilson Souza
61db8fe143
adding god-process to uncrypt/unzip files encrypted
2013-02-04 13:33:58 -02:00
Gilson Souza
c7d4146c25
Adding mconf scripts to process and publish records.
2013-02-04 13:31:57 -02:00
Gustavo Salazar
2ae224765e
a log file by meeting in archive phase
2013-04-29 16:03:21 -05:00
Gustavo Salazar
4c60948ae0
Merge pull request #77 from fcecagno/fixing-video-processing
...
fixing the start-stop camera events matches, so now even if there's no s...
2013-04-28 17:40:50 -07:00
Fred Dixon
cd4939d44a
Modified bbb.playback.css to hide border lines
2013-04-12 21:56:28 -04:00
Gustavo Salazar
0166939205
use the 'Crop Box' of pdf page
2013-04-05 14:00:13 -05:00
Gustavo Salazar
7fe05d349f
sanity check for webcam and deskshare
2013-04-04 15:08:49 -05:00
gustavo salazar
338ed2bc6c
store error messages in the script log file. Fix #1281
2013-04-02 18:53:08 -05:00
gustavo salazar
93ed54795e
process last 'pan and zoom' event. Fix #1451
2013-04-02 17:35:57 -05:00
gustavo salazar
25ef021b7c
Fix errors in playback with IE, fix #1342
2013-04-01 18:40:01 -05:00
Chad Pilkey
7fdbcb5152
cleaned up playback.js
2013-03-24 12:30:05 -07:00
Chad Pilkey
ccecba6374
Added button to the control bar that swaps the video and presentation area in the playback
2013-03-24 12:26:53 -07:00
Gustavo Salazar
256a9dc200
set text file only when it exists
2013-02-13 17:13:55 -05:00
Gustavo Salazar
406e467c8b
set audio sample rate according to the recorded audio file
2013-02-13 14:42:23 -05:00
Chad Pilkey
6bf3e1c6e5
fixed my botched playback merge from 3 months ago
2013-02-09 14:13:06 -05:00
Gustavo Salazar
cb07415807
load jquery from server
2013-02-08 16:19:15 -05:00
Richard Alam
93311e6464
Merge branch 'master' into merge-master-into-polling-module
...
Conflicts:
bigbluebutton-client/build.xml
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/src/BigBlueButton.mxml
2013-02-04 19:34:23 +00:00
Markos Calderon
16ef060da3
Merge remote-tracking branch 'fcecagno/playback-in-time'
2013-02-04 11:04:19 -05:00
Gustavo Salazar
c761ef0bf1
generate tail padding when processing audio
2013-01-23 12:44:20 -05:00
Gustavo Salazar
d6a5b78299
accept image extensions in uppercase
2013-01-23 12:40:01 -05:00
Chad Pilkey
9df127d339
updated popcorn.js to 1.3
2012-12-08 11:14:38 -05:00
Felipe Cecagno
4ad891293c
now you can specify &t=0h0m0s on the playback url so the presentation will start from there just like on youtube; also fixed the generation of thumbnails, that was not working properly
2012-12-06 21:31:48 -02:00
Felipe Cecagno
5176e508dd
fixing the start-stop camera events matches, so now even if there's no stop video event, the video processing will run smoothly
2012-12-06 21:28:13 -02:00
Gustavo Salazar
821e8c823d
fix 'clear page' action in playback
2012-11-28 11:42:25 -05:00
Gustavo Salazar
8f973cd1f4
fix playback of whiteboard for slides in 'portrait' mode
2012-11-27 17:41:14 -05:00
Gustavo Salazar
99ef5f4875
Increase z-index of cursor in playback
2012-10-30 10:56:38 -05:00
Chad Pilkey
0c6e5a0632
Merge remote branch 'origin/master' into poll-access
...
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/core/managers/UserManager.as
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
record-and-playback/presentation/playback/presentation/acornmediaplayer/acornmediaplayer.base.css
record-and-playback/presentation/playback/presentation/acornmediaplayer/jquery.acornmediaplayer.js
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/acorn.access.css
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-light.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-dark.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-light.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/barebones/acorn.barebones.css
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/acorn.darkglass.css
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-caption.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-exit-fullscreen.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-fullscreen.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-pause.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-play.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-transcript.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume-full.png
record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume.png
record-and-playback/presentation/playback/presentation/css/bbb.playback.css
record-and-playback/presentation/playback/presentation/playback.html
2012-10-29 16:03:09 -04:00
Gustavo Salazar
93a1f2f2a1
Increase height of text box in playback
2012-10-26 14:15:11 -05:00
Gustavo Salazar
66e8fbbdbb
Draw squares properly in the playback
2012-10-26 13:44:06 -05:00
Gustavo Salazar
5d53bdfd4a
Send one video stream(webcam OR deskshare) to Matterhorn server
2012-10-24 13:40:41 -05:00
Gustavo Salazar
ac32c59029
Extract pdf page in a temp dir
2012-10-23 13:53:43 -05:00
Gustavo Salazar
033e76f5c4
Detect and draw circles in playback
2012-10-22 13:55:44 -05:00
Chad Pilkey
ba26a3697a
fixed the firefox fullscreen bug from Issue 1345
2012-10-22 17:01:07 +00:00
Gustavo Salazar
41b9467c77
Align and wrap text
2012-10-20 15:28:20 -05:00
Gustavo Salazar
1a8d263da4
Set color in played text
2012-10-19 15:06:52 -05:00
Gustavo Salazar
d18a677bef
Fix playback of straight line
2012-10-19 13:10:37 -05:00
Gustavo Salazar
46b0f56fe8
Wrap text in playback.
2012-10-19 13:09:16 -05:00
Gustavo Salazar
bc1382cf79
Merge pull request #68 from capilkey/add-seperate-playback-controls
...
Add seperate playback controls
2012-10-18 14:48:00 -07:00
Chad Pilkey
ecd09f1f2b
in firefox the media can actually load before the jquery is called to add listeners. I fixed it
2012-10-18 18:42:11 +00:00
Chad Pilkey
a81800f822
alternate control theme
2012-10-16 20:02:30 +00:00
Chad Pilkey
451647baf8
fixed controls not displaying for audio source
2012-10-15 20:23:19 +00:00
Chad Pilkey
39bd72f7ce
acorn controls working properly
2012-10-15 19:09:56 +00:00
Chad Pilkey
e82a3efed8
initial implementation of controls
2012-10-15 16:11:10 +00:00
Felipe Cecagno
df37f484d7
insert the scroll bar on the chat automatically instead of grow the div indefinitely; little improvement on the deploy script for the recordings
2012-10-11 13:45:14 -03:00
Chad Pilkey
abad84542d
fixed new playback controls
2012-10-09 17:33:59 +00:00
Gustavo Salazar
51fe50a811
Do not play video file according to audio file.
2012-10-02 12:22:14 -05:00
Gustavo Salazar
487cf1b51f
Align components in playback.
2012-10-02 09:58:27 -05:00
Chad Pilkey
0a7ab07727
Merge remote branch 'upstream/master'
...
Conflicts:
record-and-playback/presentation/playback/presentation/playback.js
2012-10-01 21:00:32 +00:00
Gustavo Salazar
f3c8477b27
Fixed frame rate in mpg file
2012-09-28 11:52:35 -05:00
Gustavo Salazar
aa3350115d
Ask for ffmpeg version before using loop parameter.
2012-09-25 20:08:52 -05:00
Chad Pilkey
14b7b5500f
Merge remote branch 'upstream/master'
2012-09-24 19:01:04 +00:00
Gustavo Salazar
2462802d54
Change ffmpeg commands to support version 0.11.2
2012-09-21 17:27:11 -05:00
Chad Pilkey
97bfcbb068
Merge remote branch 'upstream/master'
...
Conflicts:
bigbluebutton-client/resources/prod/BigBlueButton.html
bigbluebutton-client/src/BigBlueButton.mxml
record-and-playback/presentation/playback/presentation/css/bbb.playback.css
record-and-playback/presentation/playback/presentation/playback.html
record-and-playback/presentation/playback/presentation/playback.js
2012-09-21 21:27:23 +00:00
Gustavo Salazar
f8510d749b
Always set a value to "title" in dublincore.xml
2012-09-21 15:22:23 -05:00
Chad Pilkey
a787c7c2c3
trying to implement accessibility pauses
2012-09-17 16:31:28 +00:00
Gustavo Salazar
b0cb319bf1
Set width to chat container
2012-09-16 14:38:18 -05:00
Gustavo Salazar
e2fbbef7de
Remove dependency on slides scripts
2012-09-15 21:27:10 -05:00
Gustavo Salazar
79b9cf1cab
Validate bounds in cursor events
2012-09-15 20:42:31 -05:00
Gustavo Salazar
5067940818
Validate bounds before drawing cursor
2012-09-15 20:40:23 -05:00
gustavo salazar
6d90e31b85
Set playback_host in bigbluebutton.yml
2012-09-10 16:12:10 -05:00
gustavo salazar
140376e084
"Audio" tag created in html.
2012-09-10 14:40:51 -05:00
Gustavo Salazar
6a8319ba9e
Show chat when audio is played.
2012-09-07 17:21:00 -05:00
Chad Pilkey
969824d29b
Merge remote branch 'upstream/master'
2012-09-07 18:11:18 +00:00
Gustavo Salazar
2b48e2e4cb
Increase count of text shapes.
2012-09-06 16:19:51 -05:00
Gustavo Salazar
91960e5d3f
Increase size of chat window when playing audio.
2012-09-06 15:36:25 -05:00
Gustavo Salazar
4a492c214a
Process and draw straight lines for plaback.
2012-09-06 14:21:55 -05:00
Chad Pilkey
008b3ccf35
Merge remote branch 'upstream/master'
2012-09-06 15:37:12 +00:00
Gustavo Salazar
2517405692
Load writing.js after that audio or video are chosen.
2012-09-05 15:35:23 -05:00
Gustavo Salazar
f5ee8b6cbf
Update license.
2012-09-04 16:42:13 -05:00
Gustavo Salazar
a96fbc82bc
Remove processed files for matterhorn.
2012-09-04 16:20:09 -05:00
Gustavo Salazar
803be3b3be
Play audio file if video was not recorded.
2012-09-04 16:14:07 -05:00
Gustavo Salazar
baaac401d6
Process triangles.
2012-09-03 20:14:29 -05:00
Chad Pilkey
35704cbdb9
Merge remote branch 'upstream/master'
2012-09-03 23:46:13 +00:00
Gustavo Salazar
20c6bb3722
Resize font of text events.
2012-08-30 18:55:15 -05:00
Gustavo Salazar
f5c2b9cdc5
Remove processed and published files.
2012-08-30 03:42:11 -05:00
Gustavo Salazar
4a0c27d6ca
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2012-08-30 03:28:18 -05:00
Markos Calderon
5bb870b385
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into add-sanity-check
2012-08-30 16:13:44 -05:00
Gustavo Salazar
85d66d5203
Use the event "ModifyTextEvent" to draw text.
2012-08-29 23:29:11 -05:00
Gustavo Salazar
eeca99f294
Get dataPoints for every event of "AddShapeEvent".
2012-08-29 16:05:44 -05:00
Gustavo Salazar
a8fae3bbf9
Ask if duration of video is 0.
2012-08-28 14:38:23 -05:00
Gustavo Salazar
27dd7da721
Get attributes according to the type of event.
2012-08-28 14:31:14 -05:00
Gustavo Salazar
63c421abd5
Remove options used by libx264.
2012-08-27 17:34:08 -05:00
Felipe Cecagno
96d4037ab0
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton
2012-08-27 16:23:59 -03:00
Felipe Cecagno
7be21e5e53
only copies the slides text files if they exist; this is to keep the script compatible with old recordings
2012-08-27 16:23:12 -03:00
Gustavo Salazar
efc52ca936
Merge pull request #60 from mconf/master
...
Video file generation for presentation playback format
2012-08-27 09:18:42 -07:00
Felipe Cecagno
f9d7f11d63
reverted the code used to process the video for the matterhorn integration; many fixes on the video processing for the new playback format "presentation"; now it's possible to set the output video resolution for the presentation playback - it's VGA by default but could be set to HD
2012-08-27 12:41:26 -03:00
Fred Dixon
347f0be656
Display initial slides correctly
2012-08-27 09:10:45 -04:00
Fred Dixon
3c70cf500b
Fixed syntax error for path to presenttion folder
2012-08-21 19:08:48 -04:00
Fred Dixon
bd16b27667
Removed execute permissions from slides.yml
2012-08-21 19:04:29 -04:00
Markos Calderon
0c9e45682e
added failed status
2012-08-21 16:55:41 -05:00
Chad Pilkey
f81849ae4f
added third party presentation playback controls (acornmediaplayer)
2012-08-21 16:44:54 +00:00
Markos Calderon
d75ca5dca4
finish testing of sanity check
2012-08-20 18:12:58 -05:00
Fred Dixon
ee29a96b6a
changed logging for publish/preentation.rb to /var/log/bigbluebutton/presenetation/publish-*
2012-08-19 17:20:15 -04:00
Fred Dixon
f2f75067ec
Changed logging for presentation.rb to /var/log/bigbluebutton/presentation/
2012-08-19 17:17:11 -04:00
Markos Calderon
9d9bf10e81
pending changes in rap-worker
2012-08-15 19:10:29 -05:00
Markos Calderon
7fb265e756
adding sanity check
2012-08-13 15:22:53 -05:00
Chad Pilkey
599f16863d
chat, slides, and thumbnails are all accessible now
2012-08-10 19:31:36 +00:00
Chad Pilkey
52371cf10a
Merge remote branch 'upstream/master'
2012-08-08 14:22:57 +00:00
Gustavo Salazar
a85e8c144e
Use webm for webcam in playback.
2012-08-07 16:36:52 -05:00
Chad Pilkey
cfd3446123
Merge remote branch 'upstream/master'
...
Conflicts:
README
bigbluebutton-client/.gitignore
bigbluebutton-client/resources/prod/BigBlueButton.html
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2012-08-07 19:56:23 +00:00
Gustavo Salazar
a25a5710a1
Change id of video recording.
2012-08-07 13:16:02 -05:00
Markos Calderon
b88fda975e
deleting wrong files
2012-08-06 11:36:15 -05:00
Chad Pilkey
4c13535607
starting to make playback accessible
2012-08-03 20:10:54 +00:00
Gustavo Salazar
e523dbf9e6
Merge pull request #55 from mconf/video-playback-into-master
...
Video playback
2012-08-03 09:08:25 -07:00
Markos Calderon
2e8715988b
Fix for event urls and support for https
2012-08-01 18:55:50 -05:00
Felipe Cecagno
e8dc780c37
integrated the video playback into master, but the whiteboard events playback, as well as the presentation playback, is not functional yet - it seems that the writing.js is broken on master, tried to fix it without success
2012-08-01 17:40:58 -03:00
Chad Pilkey
ad9f9ef560
added simplified chat-timeline popcorn plugin
2012-07-31 21:15:14 +00:00
Richard Alam
cbe0ee60cc
- merge some new stuff
...
Conflicts:
bigbluebutton-web/.gitignore
2012-07-29 16:06:39 +00:00
Fred Dixon
65f6318241
Fix playback race condition
2012-07-17 16:07:36 -04:00
Fred Dixon
74a28b285d
First implementation of playback of all presentation events (slides, mouse, pan/zoom, and whiteboard)
2012-07-17 15:39:44 -04:00
Ajay Gopinath
938103972d
Finished basis for text tool. Stil need to add identification for individual objects/add text customization/fix glitches.
2012-07-04 12:28:29 -04:00
Richard Alam
4ee4eb79cc
- strip controls chars from chat messages as it fails the process of recordings
2012-05-12 23:17:38 -07:00
Richard Alam
93b274f4c8
- fix http://code.google.com/p/bigbluebutton/issues/detail?id=1087
2012-05-16 19:11:00 +00:00
Richard Alam
48a6a48773
- add support for IE by installing chrome frame for playing back recording
2012-05-14 15:18:56 +00:00
Gustavo Salazar
cc1435a84c
Create .done file.
2012-05-03 20:30:49 -07:00
Gustavo Salazar
df41ce84ac
Do not process for Matterhorn if webcam, audio, or desktop are not available to be processed.
2012-05-03 20:23:18 -07:00
Richard Alam
7b1ff2d4bb
- add utf-8 encoding magic comment to recording ruby scripts
...
http://blog.grayproductions.net/articles/understanding_m17n
2012-05-03 18:56:01 +00:00
Gustavo Salazar
dd384d5f95
Give size to the window of recorded chat.
2012-04-27 08:33:14 -07:00
Gustavo Salazar
1e14fb69b3
Update popcorn script.
...
Change message when playback is not possible.
2012-04-23 15:10:41 -07:00
Markos Calderon
c4d866419c
change date format in getRecordings for bigbluebutton 0.8
2012-03-26 13:47:35 -07:00
Fred Dixon
d2a8499719
Merge pull request #25 from gugat/issue1143
...
Convert timestamp to float so when dividing the result will contain
2012-02-27 10:44:25 -08:00
Gustavo Salazar
940f080d60
Create Matterhorn logs in their own directory.
2012-02-27 13:33:22 -05:00
Fred Dixon
24c1c69156
Added logic in build.xml to copy config.xml and join-mock.xml if not in the bigbluebutton-client source tree
2012-02-22 17:32:55 -05:00
Gustavo Salazar
6c85a36005
Convert timestamp to float so when dividing the result will contain
...
decimals
2012-02-17 13:02:52 -05:00
Markos Calderon
45aca72bc4
publish recording without slides
2012-01-30 09:39:03 -08:00
Markos Calderon
2f7a2afe9c
fix for video processing in long meetings
2012-01-26 10:30:57 -08:00
Richard Alam
ef85442a1b
- trim audio file when they overlap
2012-01-18 17:29:14 +00:00
Richard Alam
3659effee3
Fix http://code.google.com/p/bigbluebutton/issues/detail?id=982
...
- if the length from header info is zero (corrupted header http://comments.gmane.org/gmane.comp.audio.sox/2637 )
determine length from file size and then fix the file to have proper length in header info.
2012-01-16 21:03:04 +00:00
Markos Calderon
4a797ecdc1
Merge remote branch 'gugat/issue1106'
2012-01-06 09:17:06 -08:00
gugat
d685a5456a
Return silence with lenght of the recording when there is not audio file.
2012-01-06 11:35:02 -05:00
gugat
ea2c453807
Add info log messages from each method of generators
...
Add info log messages from publish script of slides. The log was empty before, was just created.
Add --check option to bbb-record. Taking same logic from bbb-conf and adding info about the failed task with each error.
2012-01-05 17:07:34 -05:00
Markos Calderon
77f664c6bd
checking dirs instead of done files
2011-12-07 13:18:21 -08:00
Markos Calderon
c95a8bc56a
adding a checking in rap-worker
2011-12-06 12:22:35 -08:00
Fred Dixon
ae73711cd8
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-11-30 17:08:40 -08:00
Fred Dixon
4ab6c9e63e
Removed the creation of index.html for slides (no longer needed for testing)
2011-11-30 17:08:29 -08:00
Markos Calderon
e5d511239a
fixed issue 1074
2011-11-22 16:04:08 -08:00
gugat
381e120c65
Use ffmpeg to concatenate videos. Mencoder command hangs with popen.
2011-11-21 09:03:41 -08:00
Fred Dixon
a3849c9a52
Removed old comments from rap-worker.rb
2011-11-20 11:16:11 -08:00
Richard Alam
62c3b220a1
change silence limit from 10 to 60 minutes as some people join the meeting very early
...
and thus prevents the recording from being processed.
2011-11-15 10:19:12 -05:00
Markos Calderon
7b511015e2
fix for jpg images in playback
2011-11-10 08:59:41 -08:00
Fred Dixon
22c90a9ed4
Removed hard-coded URL from playback of slides
2011-10-07 13:27:48 -07:00
Marco Calderon
d91607b1d8
changes to the length
2011-09-28 12:37:26 -05:00
Fred Dixon
ccc87f0831
Temporarily disabled messages 'Skipping ... ' from record and playback scripts as they generate large log files
2011-09-27 08:49:06 -07:00
Marco Calderon
261707478b
fixed recording time
2011-09-22 12:50:35 -05:00
gugat
46e6598cc3
Improve quality in images
2011-09-16 10:47:58 -07:00
gugat
175b7de6a1
ow message e when browser is IE
2011-09-12 13:29:23 -07:00
gugat
a1ce36485b
Set audio file according to browser
...
Copy wav file to publish repository
2011-09-12 12:55:12 -07:00
Fred Dixon
dc1819b8ca
Minor tweaks on the fotter for playback
2011-09-09 16:19:28 -07:00
Marco Calderon
2f3b0be692
fix bottom playback slide
2011-09-09 15:54:32 -05:00
Marco Calderon
423006d308
update to slides playback
2011-09-09 11:35:26 -05:00
Marco Calderon
903a503a2e
updates to the slides playback
2011-09-08 19:37:42 -05:00
Richard Alam
5cb7eb6d8a
- locate audio files in the process dir not in the original loc (/var/freeswitch/meetings) because
...
if the admin cleans up that dir, determining recording length from file will fail.
2011-09-08 15:43:39 +00:00
Richard Alam
162dd2226f
- remove duplicate audio events
2011-09-07 20:51:07 +00:00
gugat
5f075eb9d5
Set chat to go down
2011-09-05 21:43:58 -07:00
Fred Dixon
1d9d646e36
Testing bbb-record-core with the latest version of Ruby. SystemTimer is not needed in 1.9.2
2011-09-05 12:37:34 -07:00
Fred Dixon
bae17db7a6
Small edit to playback.html (removed 'chat' as it's english specific). Keep the playback clean as a basis for customization.
2011-09-04 05:23:52 -07:00
gugat
70c8c92915
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-09-02 17:05:58 -07:00
gugat
e5849908a8
Remove float property to fix audio bar in the right of slides when doing playback
...
Change comparison operator in timeline plugin
2011-09-02 17:03:13 -07:00
Richard Alam
bf54da8be4
- remove duplicate audio events
2011-09-02 20:12:34 +00:00
Richard Alam
b59fc8d3aa
- use start_record_timestamp, file, bridge to compare if 3 start events are eql?
2011-09-02 18:14:44 +00:00
Richard Alam
9921f9ef42
- make playback with chat work
2011-09-02 18:01:45 +00:00
Richard Alam
b95d3166ca
- don't process duplicate audio events
2011-09-02 15:20:36 +00:00
Richard Alam
49a97e463b
- update slides playback with chat
2011-09-02 13:44:35 +00:00
Fred Dixon
9efab14768
Fixed bug that prevented bbb-record from having bbb-record-core rebuilt a recording.
2011-08-31 14:45:38 -07:00
Richard Alam
0453a34767
- fix location of slides.xml
2011-08-31 19:54:32 +00:00
Richard Alam
b6bb24f00f
- change size of display div
2011-08-31 15:58:36 +00:00
Richard Alam
beb4bbff9c
- change css
...
- remove old slides playback js scripts
2011-08-31 14:09:59 +00:00
Richard Alam
ee3c6fbf53
- store copy of popcorn js files so playback still works even if there is no internet connection
2011-08-31 14:08:23 +00:00
Richard Alam
e9f4cc4ffb
- replace slides playback with popcorn
2011-08-31 14:00:20 +00:00
Fred Dixon
5a43aba27a
Ingest and processing slides.rb now logs to /var/log/bigbluebutton/slides.
2011-08-20 12:14:33 -07:00
Richard Alam
c660ab9651
- add more logging on padding issue
2011-08-18 11:01:24 -04:00
Richard Alam
9057cd79c1
-remove audio padding at the end of the recording
2011-08-18 10:46:03 -04:00
Marco Calderon
a32992946c
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-08-16 08:18:09 +00:00
Marco Calderon
28ad4f6ce8
Cleanup script
2011-08-16 08:17:21 +00:00
Richard Alam
f6d7540ff5
- add some doc on why we limit length of silence file
2011-08-15 17:28:53 -04:00
Richard Alam
1c92d22b0d
fix typo
2011-08-15 15:32:03 -04:00
Richard Alam
e59cb41e7f
- raise exception when length of audio is 0 and when the silence is grater than 10 minutes.
2011-08-15 15:27:25 -04:00
Marco Calderon
f052b776d7
a temp solution for show the recording name
2011-08-10 14:33:04 +00:00
Richard Alam
f72589d1b7
- rename matterhorn properties and add comments
2011-08-05 18:25:44 +00:00
gugat
915acb8169
Overwrite eql? in AudioRecordingEvent class
...
and use uniq! in the array start_events in the method
start_audio_recording_events
2011-07-29 02:02:43 -05:00
Richard Alam
76dab31f61
- don't raise an exception when executing external command and some text gets printed on stderr. Just log the error and move on.
2011-08-05 16:48:19 +00:00
gugat
0593ebdc14
Avoid squished deskshare video
2011-07-24 19:17:53 -05:00
gugat
d2d711704e
Fix bug while installing third party tools
2011-07-20 20:39:26 -05:00
gugat
59031812be
Add logger in rap-worker.rb
2011-07-20 20:13:22 -05:00
Marco Calderon
d32110d36c
api according to the latest spec
2011-06-30 02:33:12 +00:00
Richard Alam
3d3f6bbab1
- rename simple to slides
...
- merge guga's work to pre-load images when playing back recording
2011-07-21 11:58:22 -04:00
gugat
e7c78c3759
PreLoad Images in slides' playback
2011-07-20 18:19:17 -05:00
Richard Alam
c5f8aa9344
- rename simple playback to slides playback
2011-07-19 14:33:17 -04:00
Richard Alam
e97a57e813
- make imagemagick generate smaller PNG files....
2011-07-19 11:36:03 -04:00
gugat
e721dd19a1
Require open4 in recordandplayback.rb
...
Add open4 to Gemfile
2011-07-15 17:09:11 -05:00
gugat
c56facd64c
Change image presentations (gif, jpg) to png, so they will be played properly
2011-07-14 18:51:51 -05:00
gugat
89086ba54a
Merge branch 'refactor' of github.com:gugat/bigbluebutton into respaldo
2011-07-14 10:30:06 -05:00
gugat
1010dc4cbf
Add support for presentation images (jpg,png,gif) in simple processing
2011-07-14 09:49:26 -05:00
gugat
feeaf1bcb6
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo
2011-07-14 09:44:12 -05:00
gugat
21eed7e1d4
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo
2011-07-11 14:26:47 -05:00
Fred Dixon
76947a3cd6
use meetingID for index.html file for slides playback (this index.html file is for testing only and will soon disappear)
2011-07-10 11:33:22 -07:00
Fred Dixon
74dcf87466
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-07-10 08:38:19 -07:00
Fred Dixon
c431169bd7
Changed redis host for bigbluebutton.yml to 127.0.0.1
2011-07-10 08:38:12 -07:00
Richard Alam
8070f25bab
- change permission of file so that it is readable by nginx
2011-07-10 10:32:20 -04:00
gugat
12bdbf8475
Add logi to check redis port an host
2011-07-04 20:01:41 -05:00
gugat
428dbe84f2
Create script with logic we need to add for record and playback
...
Based in bbb-conf create functions to check errors in record and playback log files
2011-06-30 21:17:01 -05:00
gugat
b247c749a8
Add log info to BigBlueButton.execute : exitstatus, succeed? , exited?
...
Change IO.popen to BigBlueButton.execute in /core/scripts/rap-worker.rb (2)
2011-06-29 17:39:25 -05:00
gugat
1c45591583
Change BigBlueButton.execute to use Open4
2011-06-29 00:08:58 -05:00
gugat
b72e140be9
Execute mencoder command with BigBlueButton.execute in archive.rb
2011-06-28 19:35:45 +00:00
gugat
9526a5c713
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo
2011-06-28 15:34:21 +00:00
Richard Alam
41db771068
- change default matterhoen server
2011-06-26 11:17:47 -04:00
Richard Alam
7f4d38b5a6
- process metdata properly and simple playback
2011-06-26 10:56:03 -04:00
Richard Alam
15b29db03f
- add playback format into metadata.xml
...
- implement get recordings for a meeting id
2011-06-22 16:35:11 -04:00
Richard Alam
d044221d70
- start implementing get recording api
2011-06-22 15:53:27 -04:00
gugat
794d419631
Substitute IO.popen by BigBlueButton.execute in presentation.rb and video.rb
2011-05-25 07:06:36 +00:00
gugat
25bb768026
Return output in BigBlueButton.execute
...
Use BigBlueButton.execute in determine_length_of_audio_from_file in audio.rb
2011-05-25 03:50:05 +00:00
gugat
9038522311
Change BigBlueButton.execute to log error properly
2011-05-25 00:43:48 +00:00
Richard Alam
ef40a1cb28
- cleanup
...
- make the length of the blank video into a float instead of int. This way we hope to have
a blank video with 8.74sec long instead of 8sec long.
2011-06-15 12:20:10 -04:00
Richard Alam
181133ab9e
- add matterhorn-install script. There is still a problme of it not starting on my machine.
2011-06-13 17:34:57 -04:00
Richard Alam
12c5b34cea
- store start and stop webcam events by sending message from video app
...
instead of relying on status event
2011-06-13 14:32:07 -04:00
Richard Alam
1af29981fd
- move the rap core god conf into default god/conf
2011-06-08 21:14:52 -04:00
Richard Alam
dfb6283e59
- don't prompt adding host to known_host
2011-06-08 20:28:12 -04:00
Richard Alam
f14085a487
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-06-08 19:40:54 -04:00
Richard Alam
2541b89464
- remove publish/matterhorn.rb as we now run it as a separate process
2011-06-08 19:40:19 -04:00
Fred Dixon
b5cd824a29
Added lsb-section to record and playback god init.d script
2011-06-08 15:28:22 -07:00
Richard Alam
e67534997b
- move so that it gets built as part of bbb-record-core
2011-06-08 17:35:15 -04:00
Richard Alam
ef2eab978f
- upgrade version of felix to 3.2.2 from 3.2.0 as 3.2.0 is not available anymore form the download link
2011-06-08 14:01:07 -04:00
Richard Alam
961ab6f402
- add some info on how to use matterhorn dopbox ingest feature
2011-06-08 13:55:26 -04:00
Richard Alam
8eb9f0266e
- fix typo
2011-06-08 11:03:19 -04:00
Richard Alam
23c90f1af0
- put publishing to matterhorn on a different process since it needs to run as root
2011-06-08 10:57:52 -04:00
Richard Alam
f2c603c1a5
- create god scripts to manage record-and-processing script
2011-06-07 14:54:38 -04:00
Richard Alam
002460dc81
- change logic...it should publish recording when directory is NOT present
2011-06-06 16:59:55 -04:00
Richard Alam
350d71b53e
- setup logger properly
2011-06-06 16:09:53 -04:00
Richard Alam
a66daaad8a
- start automating publish part
2011-06-06 15:55:28 -04:00
Richard Alam
988da9b621
- fix typo and rename var
2011-06-06 15:26:46 -04:00
Richard Alam
f2b6b07112
- no need to "sudo -u tomcat6" as main script already runs as tomcat6
2011-06-06 14:58:16 -04:00
Richard Alam
9609de20a9
- run as tomcat6 user
2011-06-06 14:45:25 -04:00
Richard Alam
870acbf50e
- start automating archive, ingest, publish
2011-06-06 14:42:38 -04:00
Richard Alam
87a53dce50
- archive only new recordings
2011-06-06 13:38:16 -04:00
Richard Alam
d5eaaee2b7
- ffmpeg that comes with Ubuntu 10.04 segfaults when using padbottom/top/left/right
...
- need to upgrade to newest ffmpeg based on instructions in http://ubuntuforums.org/showpost.php?p=9868359&postcount=1289
2011-06-06 12:08:05 -04:00
Richard Alam
e940b17982
- process properly matterhorn metadata
2011-06-03 12:18:54 -04:00
Richard Alam
c8e7c185b0
- simple cleanup
2011-06-03 12:18:36 -04:00
Richard Alam
6b6b5bea1f
- look into recorded .done file to see if the meeting needs to be archived
2011-06-03 12:17:51 -04:00
Richard Alam
1bb6e20291
- renamed ingenst-and-processing script
...
- log when saving metadata
2011-06-03 11:15:24 -04:00
Richard Alam
92cc564d48
- change playback client url
2011-06-01 18:55:25 -04:00
Richard Alam
6d82190ba5
- paddings must be even
2011-06-01 18:27:27 -04:00
Richard Alam
d142763b58
- use pad_top/bottom/left/right options for ffmpeg that comes with Ubuntu 10.04
2011-06-01 18:16:50 -04:00
Fred Dixon
2ca6b2a541
support one slide presentation
2011-06-01 14:52:07 -07:00
Fred Dixon
2b8a054db8
Added simple.nginx to store in /etc/bigbluebutton/nginx to support multiple rewrite rules for nginx
2011-06-01 14:42:48 -07:00
Fred Dixon
05d33be6f1
Minor change to path for simple recordings
2011-06-01 14:00:21 -07:00
Richard Alam
282199e668
- publish simple recordings in /var/bigbluebutton/recordings/published/simple
2011-05-31 17:28:20 -04:00
Richard Alam
6208587706
- update SystemTimer to 1.2.3
2011-05-27 19:45:05 -04:00
Richard Alam
c7c69296f8
- scale webcams to fit 640x480 while maintaining aspect ratio
2011-05-26 09:56:59 -04:00
Richard Alam
6f314df412
- make the deskshare fit into 640x480 frame size while maintaining aspect ratio
2011-05-25 16:06:16 -04:00
Richard Alam
353b4e6868
- fix matching start and stop events
2011-05-25 13:20:03 -04:00
Richard Alam
26bf7f5344
- fix problem where event name isn't extracted from redis properly
2011-05-25 10:17:14 -04:00
Richard Alam
d5149a168c
have metadata as attribs instead of nodes
2011-05-24 18:29:16 -04:00
Richard Alam
0c128872ea
- extract metadata from events.xml and generate index.html in publish dir for simple playback
2011-05-24 18:16:54 -04:00
Richard Alam
c89cc5b777
- fix so that logs are written in /var/log/bigbluebutton/ using the ff convention
...
<playback-type>-process-<meeting-id>.log
2011-05-24 13:58:56 -04:00
Richard Alam
442e510953
- minor changes to make xml attrib names consistent
2011-05-24 13:27:32 -04:00
Richard Alam
52462ebdbf
- modify simple playback client
2011-05-24 13:07:08 -04:00
Richard Alam
758156e64f
- cleanup simple playback
2011-05-24 12:56:01 -04:00
Richard Alam
705f849a64
- make script dir part of core instead of separate bin dir for easier triggering of build/packaging of bbb-record-core package
2011-05-22 17:10:22 -04:00
Richard Alam
e25d803a5a
- cleanup
2011-05-22 16:42:28 -04:00
Richard Alam
aa1708c1c2
- change paths to locate bigbluebutton.yml and the core/lib directory
2011-05-22 16:41:44 -04:00
Richard Alam
a1c956ff0b
- accidentally renamed simple.rb to process.rb
2011-05-22 16:23:15 -04:00
Richard Alam
60a03364ee
move this around to separate simple, matterhorn, and core rec-and-playback for packaging
2011-05-22 16:21:29 -04:00
Richard Alam
6bca8db210
- rename rap to core record and playback
2011-05-22 16:02:46 -04:00
Richard Alam
5078dcdb93
- change playback-client-js to simple playback
2011-05-22 16:02:00 -04:00
Richard Alam
491e2af437
- cleanup and move webminer into labs
2011-05-22 15:59:33 -04:00
Richard Alam
78f71ccc45
- remove playback-web
2011-05-22 14:48:26 -04:00
Richard Alam
7fcbc49a2e
- cleanup
2011-05-22 14:39:36 -04:00
Richard Alam
01fb6a1c9b
- cleanup
2011-05-22 14:25:19 -04:00
Richard Alam
1b5e8c196e
- extract webcam and desktop sharing processing from spec into video.rb
2011-05-22 13:28:37 -04:00
Richard Alam
d1413a26e9
Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
2011-05-22 11:52:42 -04:00
Richard Alam
83cc233ac4
- rename master.rb to archive.rb
2011-05-22 11:52:17 -04:00
Richard Alam
98dd37199d
- refactor to easily test
2011-05-22 01:03:00 +00:00
Richard Alam
9d448738b2
- pad video properly when video is portrait or landscape...need to create tests for these
2011-05-21 20:13:33 +00:00
Richard Alam
3b9abd43bf
- scale deskshare videos to 640x480...need more work to handle different cases
2011-05-20 17:53:51 -04:00
Richard Alam
0f9c0f07c7
- process multiple deskshare files
2011-05-19 15:21:29 -04:00
Richard Alam
28c7c48833
- process multiple raw webcam files
2011-05-19 12:33:18 -04:00
Richard Alam
13c84f4c28
- change start and stop webcam event to new format
2011-05-19 11:10:28 -04:00
Richard Alam
87463698cb
- modify webcam sharing xml format
2011-05-17 17:23:14 -04:00
Richard Alam
52aee62366
- there seems to be a problem with using popen3 when the pdf conversion runs into a problem. IO.popen is more tolerant of errors.
2011-05-17 11:06:02 -04:00
Richard Alam
001fcb6feb
- an example recording with multiple raw webcam and deskshare files
2011-05-16 13:02:57 -04:00
Richard Alam
8335c4df52
- cleanup and start logging into /var/log/bigbluebutton
2011-05-16 11:22:11 -04:00
Richard Alam
7aa0cf4835
- write simple script to look for the recorded <meeting-id>.done file and archive->process->publish it
2011-05-13 17:45:59 -04:00
Richard Alam
e9f9079827
- add script to query matterhorn for status on ingest and processing
...
- add sample cron script to process matterhorn
2011-05-13 15:01:11 -04:00
Richard Alam
d31cb4d258
- publish smple playback
2011-05-13 13:36:53 -04:00
Richard Alam
92ab5e6ecf
- publish simple playback to a directory
2011-05-13 13:35:23 -04:00
Richard Alam
b60952917a
- change from popen to open3 for executing external commnds
2011-05-13 13:34:31 -04:00
Richard Alam
97ba7e3510
- remove some files we don't need
...
- break down properties file for bbb core and matterhorn
2011-05-12 11:58:48 -04:00
Richard Alam
83d681262a
- publish to matterhorn by scp'ing to matterhorn's inbox to trigger ingest and processing
2011-05-12 11:29:59 -04:00
Richard Alam
22204336b5
- process deskstop sharing (still assumes there is only one raw media)
2011-05-11 18:08:43 -04:00
Richard Alam
2fb51af979
- change "name" to "eventname" in events.xml
...
- processing for matterhonr now works (except it assumes there is only one raw media for webcam and deskshare)
2011-05-11 17:45:45 -04:00
Richard Alam
64c6579f2f
- can now run archiver script to archive raw recordings for events, audio, webcam, presentation, and deskhare
2011-05-11 13:52:39 -04:00
Richard Alam
62f40fcf1e
- complete recording with presentation, events, deskshare, audio, webcam
...
- will be used to write testcases
2011-05-11 13:48:23 -04:00
Richard Alam
f2f6e44f37
- process video by creating fillers and concating them
2011-05-11 10:13:52 -04:00
Richard Alam
5eb474be51
- write tests to process webcam video
2011-05-10 20:17:57 +00:00
Richard Alam
b2ba4dbd9f
- get start and stop events for deskshare and webcam
2011-05-10 18:28:46 +00:00
Richard Alam
d9a3ac986b
- add tests for presentation simple playback
2011-05-10 16:31:49 +00:00
Richard Alam
591dcc8919
- process presentation for simple playback
2011-05-09 18:50:54 -04:00
Richard Alam
1e1dd4918d
- put all archive steps in master.rb
...
- add rescue and log when archiving fails
2011-05-09 17:24:41 -04:00
Richard Alam
7cc30ca49b
- put audio processor under BigBlueButton module
2011-05-09 14:46:05 -04:00
Richard Alam
bd1b93df2b
- remane audio archiver file
2011-05-09 14:24:15 -04:00
Richard Alam
0d2fbaebbf
- separate each media into each own file and cleanup
2011-05-09 14:20:35 -04:00
Richard Alam
6337713fb8
- move things a bit and add Guga's Open3.popen3 method
2011-05-06 17:26:22 -04:00
Richard Alam
be757afc87
- add link to thin doc
2011-05-03 17:31:52 -04:00
Richard Alam
e0452bb372
- cleanup
2011-05-03 17:31:27 -04:00
Richard Alam
74b8d98fe6
- cleanup
2011-05-03 11:53:38 -04:00
Richard Alam
9863ecf45a
- cleanup unneeded dirs
2011-05-03 11:51:56 -04:00
Richard Alam
6dc0a0aa89
- move the matterhorn webapp
2011-05-03 11:50:05 -04:00
Richard Alam
5c1815504d
- cleanup
2011-05-03 10:33:40 -04:00
Marco Calderon
f72fed1566
added bundle.setup and metadata to sinatra app
2011-04-29 09:10:59 +00:00
Richard Alam
6dd49331dc
- script to concatenate deskshare
2011-04-29 16:50:24 -04:00
Richard Alam
948ade0773
Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
2011-04-29 12:36:37 -04:00
Marco Calderon
ffa2a48d21
fixing proxy pass for the matterhorn sinatra app
2011-04-28 23:20:23 +00:00
Marco Calderon
48029bf469
update thin instructions and layout
2011-04-28 20:28:33 +00:00
Gustavo Salazar
5eaee6af6c
Add Matterhorn1.1 installation steps
2011-04-27 00:51:24 +00:00
Richard Alam
c90e9ae19a
- add way to do logging
2011-04-26 16:38:10 -04:00
Richard Alam
d244105867
- create cucumber step to test video processing
2011-04-26 12:11:53 -04:00
Richard Alam
2b665ecb50
- add presentation processing
2011-04-26 12:04:52 -04:00
Richard Alam
58f51268a7
- process video and presentation
2011-04-25 17:04:10 -04:00
Richard Alam
02b5c9f773
- add logger
2011-04-25 15:29:33 -04:00
Richard Alam
dd66bd9d1a
Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
2011-04-25 14:10:00 -04:00
Richard Alam
4ed3cda5d8
- fix paths so we can run the script without failing on "require"
...
should run scripts in the script dir (i.e. script> ruby archive/master.rb)
2011-04-25 14:06:32 -04:00
Richard Alam
a30e0b0926
- add Process.wait so that external commands are processed sequentially
2011-04-24 22:12:50 +00:00
Richard Alam
8c99450dda
- process video recording for matterhorn
2011-04-24 21:44:19 +00:00
Marco Calderon
532314751f
Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
2011-03-27 22:16:29 +00:00
Richard Alam
63e69a9ef2
- setup record and playback scripts in a directory layout convention. This convention makes it easy to extend the
...
different steps it takes to process the recorded meeting through the different phases. Having a convention also
allows us to add more ways of creating different playback outputs in the future.
2011-04-20 14:34:15 -04:00
Richard Alam
9bb96f4131
- experiment with running scripts in a directory
2011-04-17 13:59:13 +00:00
Richard Alam
65d6e61890
- call the ruby scripts from bbb-web
2011-04-15 18:19:51 -04:00
Richard Alam
d1ac451fd3
- add process matterhorn recording script
2011-04-15 16:44:30 -04:00
Richard Alam
b9e6c42e5d
- add archiver script that reads properties from a yaml file
2011-04-15 15:34:28 -04:00
Richard Alam
76814ea561
- add trollop gem
2011-04-15 14:31:38 -04:00
Richard Alam
f84f682d9e
- add upload to matterhorn method
2011-04-15 13:38:28 -04:00
Richard Alam
3986864e49
- recording sample with webcam flv file that can be processed by ffmpeg
...
- need to upgrade to latest Red5 to make this work
2011-04-15 11:43:53 -04:00
Marco Calderon
7deb164175
adding nginx proxy pass to matterhorn app
2011-03-27 22:14:37 +00:00
Marco Calderon
0620e11a51
adding a couple of things for matterhorn
2011-03-27 09:42:59 +00:00
Richard Alam
c6dfd54717
- strip out the path of media from manifest.xml
2011-04-13 17:58:09 -04:00
Richard Alam
f605fe5e6a
- process matterhorn
2011-04-13 17:16:20 -04:00
Richard Alam
cc91fb41b1
- new resources for matterhorn recording
...
- problem with the webcam which chokes ffmpeg and cuts the resulting video file
2011-04-13 17:15:26 -04:00
Richard Alam
446a2d8216
- add ruby zip and curl/curb gems
2011-04-13 17:14:49 -04:00
Richard Alam
e40ec9840a
- add mime-types gem
2011-04-13 10:36:01 -04:00
Richard Alam
d7b6358933
Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
2011-04-13 02:31:31 +00:00
Richard Alam
0c164b90ff
- cleanup, formatting, and rearranging processing of matterhorn artifacts
2011-04-13 01:40:33 +00:00
Richard Alam
5a7a7f8792
- process matterhorn media
2011-04-13 00:59:52 +00:00
Marco Calderon
591add6966
using sinatra as middleware and added logger
2011-03-27 05:57:42 +00:00
Marco Calderon
1b183754ca
Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
2011-03-27 01:17:30 +00:00
Richard Alam
fd11cb249b
- process matterhorn recordings
2011-04-11 18:02:24 -04:00
Richard Alam
c1af26fa65
- change path so we can run script from command line
2011-04-11 17:07:49 -04:00
Richard Alam
3f47a84a17
- process audio recordings
2011-04-11 16:46:52 -04:00
Richard Alam
ca837285c1
- consolidate Audio and AudioEvents classes
2011-04-11 11:09:44 -04:00
Richard Alam
3d5c4e244d
- store audio events into xml
2011-04-10 17:51:58 +00:00
Richard Alam
9836b902a3
- fix rspec tests
2011-04-10 16:58:53 +00:00
Richard Alam
9a252b7cc0
- archive raw recordings
2011-04-10 16:48:49 +00:00
Richard Alam
bcb50bdf51
- cleanup
2011-04-10 15:06:33 +00:00
Richard Alam
d831369188
- generated sorted audio events
2011-04-08 21:12:56 +00:00
Richard Alam
1702710ce1
- generate audio paddng
2011-04-08 20:33:22 +00:00
Richard Alam
b27e36755c
- implement and add tests to handle unmatched audio events
2011-04-08 19:41:57 +00:00
Richard Alam
66767d6754
- rearrange test fixtures
2011-04-08 19:40:50 +00:00
Richard Alam
ab32a54d92
- add more event processing
2011-04-08 18:44:44 -04:00
Richard Alam
f4f41afc18
- change events to recording tag
2011-04-08 16:52:53 -04:00
Richard Alam
05f6e85c34
- get events from redis and store
2011-04-08 16:48:11 -04:00
Richard Alam
acc09414dd
- put Guga's script into version control
2011-04-08 16:33:58 -04:00
Richard Alam
d291745248
- start getting events from redis
2011-04-07 17:48:44 -04:00
Richard Alam
11f9844c35
Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
2011-04-06 13:57:18 -04:00
Richard Alam
e56b3185e4
- new fixtures for matterhorn recording
...
- write some cukes tests
2011-04-06 13:56:28 -04:00
Richard Alam
e534a3c56d
- cleanup and add tests
2011-04-05 17:30:03 -04:00
Richard Alam
d24cf648af
Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
2011-04-05 16:17:41 -04:00
Richard Alam
11123423b1
- add rspec tests to audio generator
2011-04-05 16:17:16 -04:00
Richard Alam
a81f4e4eaa
- parse audio length from sox stat result
2011-04-05 12:14:14 -04:00
Richard Alam
1b00d0a95f
- add streamio-ffmpeg gem
2011-04-05 12:13:44 -04:00
Richard Alam
1fad16f73c
- add scripts to create dublin-core.xml and manifest.xml
2011-04-05 10:34:44 -04:00
Richard Alam
2d81b95556
- process audio recording events
2011-04-04 18:03:53 -04:00
Richard Alam
5e99acd8d7
- use the passed in sampling rate to generate silence
2011-04-04 11:03:39 -04:00
Richard Alam
b01211d8f2
Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
...
Conflicts:
record-and-playback/rap/lib/recordandplayback/collectors/audio.rb
2011-04-04 09:12:08 -04:00
Richard Alam
c5526c1df3
- add video collector
2011-04-04 09:07:59 -04:00
Richard Alam
6237913c44
- match start and stop events
2011-04-04 01:28:29 +00:00
Richard Alam
b93e3d9892
- parse events.xml
2011-04-03 23:19:32 +00:00
Richard Alam
b15b209320
- convert some of the python scripts to ruby
2011-04-02 17:29:04 +00:00
Richard Alam
520040e890
- add collectors for presentation and deskshare...need to be DRYer
2011-04-02 14:16:13 +00:00
Richard Alam
1f0cf9d23e
- add video stream collector
2011-04-01 17:27:32 -04:00
Richard Alam
2ba47e1d17
- stub out file actions in audio collect rspec step
2011-04-01 14:01:41 -04:00
Richard Alam
a155a0c6c3
- modify rspec test
2011-03-31 16:13:27 -04:00
Richard Alam
8e7a1836cb
- rename archiver_audio.rb to audio_collector.rb
2011-03-31 10:30:01 -04:00
Richard Alam
03eb374938
- copy example resqueu app. We'll use this as the base where we can send record processing jobs.
2011-03-30 17:12:52 -04:00
Richard Alam
adf7ee56fa
- add resque gem
2011-03-30 15:45:30 -04:00
Richard Alam
e8f95d9436
- add some raw recordings we can use for unit testing
2011-03-30 14:34:42 -04:00
Marco Calderon
de0b9ed39f
Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
2011-03-28 02:36:47 +00:00
Marco Calderon
c29dc34e00
added redis support to matterhorn app
2011-03-28 02:35:24 +00:00
Marco Calderon
f30ab7d6b5
matterhorn sinatra app
2011-03-28 00:10:13 +00:00
Marco Calderon
39f10baf17
added bigbluebutton-ruby-api gem
2011-03-27 01:15:19 +00:00
Marco Calderon
58b0530f17
added ruby script for concat videos
2011-03-23 04:16:00 +00:00
Richard Alam
60d5362627
- add nokogiri gem
2011-02-28 16:25:01 -05:00
Richard Alam
c0462031ce
- add redis-rb client into Gemfile
2011-02-28 16:01:16 -05:00
Richard Alam
df77f0f8e8
- cleanup
2011-02-26 15:33:47 -05:00
Richard Alam
732edcee31
- testing out cucumber and rspec
2011-02-25 18:03:39 -05:00
Richard Alam
c1bbc382a6
- add title into index.html and pass in playback host
2011-02-16 17:50:01 -05:00
Richard Alam
5f535d386f
- make location of scripts configurable and playback url
2011-02-16 17:48:30 -05:00
Richard Alam
6b2eb72933
- add meeting title into event.xml. Later on we can add more metadata about the meeting (e.g. course, prof., etc.)
2011-02-16 17:47:10 -05:00
Richard Alam
7dbc32c9a6
- generate a higher quality png image
2011-02-16 17:46:30 -05:00
Richard Alam
f3bcc572fa
- fix so that it displays the last slide
2011-02-16 17:45:25 -05:00
Richard Alam
1e27b3e1fe
- generate index.html of recorded meetings
2011-02-14 14:23:56 -05:00
Richard Alam
53517feb90
- modify scripts to be called from bbb-web
2011-02-11 15:34:37 -05:00
Richard Alam
f2ed78bf70
- add more comments
2011-02-09 11:02:21 -05:00
Richard Alam
bb4265e2eb
- add pulish script which take a processed recording and move it to the recordings directory
2011-02-09 10:47:27 -05:00
Richard Alam
2ec0b64bbf
- a little bit of cleanup
2011-02-08 15:04:47 -05:00
Richard Alam
0a655b7cbc
- refactor audio processing scripts. Handle failures properly. Create xml info file for audio recordings.
2011-02-08 14:20:16 -05:00
Richard Alam
eb367392d4
- start handling failure conditions when processing audio
2011-02-07 17:37:53 -05:00
Richard Alam
b8a8722d03
- refactor script to make it understandable
2011-02-07 14:40:40 -05:00
Richard Alam
4e12c542ae
- wrap up other scripts with ingestandproc.py script
2011-02-04 16:18:04 -05:00
Richard Alam
b9c8f36f83
- scripts to process record and playback
2011-02-04 11:22:16 -05:00
Richard Alam
38af89450e
- changed to handle new event names
...
- modified so that it handles multiple presentations properly
2011-02-02 11:41:31 -05:00
Richard Alam
346a1fc47b
- can now create audio files automatically
...
- need to handle failure conditions
2011-02-01 12:30:19 -05:00
Richard Alam
76baeaf090
- remove audio files
...
- commit script to do ingest (not complete yet)
2011-01-31 16:57:10 -05:00
deniszgonjanin
7988931593
Deleted old Flash-based playback client
2011-01-25 02:57:00 +00:00
deniszgonjanin
aafb098700
Minor changes to the playback client to show the BBB logo at the start
2011-01-25 02:55:29 +00:00
deniszgonjanin
5f74073965
Playback for slides and audio, for xml events.
2011-01-20 08:22:46 +00:00
deniszgonjanin
bda1776772
Changes to the generateAudio script to generate .ogg files instead of .mp3
2011-01-19 06:13:35 +00:00
BigBlueButton
ebd60d8695
Script to generate PNGs from slides for record and playback
2011-01-19 05:12:38 +00:00
Richard Alam
0a36dc8f37
- upgrade bbb-commons to 0.8
2011-01-14 02:25:24 -05:00
Richard Alam
1115986cd3
- just formatting changes
2011-01-12 10:18:01 -05:00
@deniszgonjanin
1edb303d39
Created a script to automatically generate an audio file of the same length as the conference. Should be easily convertible to a script we can use to pad the beginning and end of audio files generated by asterisk/freeswitch.
2010-12-28 11:05:28 +00:00
Marco Calderon
346ae2db39
add xml stream to playback web
2010-11-19 08:15:29 +00:00
Marco Calderon
71630e8482
Demo page for playback web
2010-11-10 09:27:18 +00:00
Marco Calderon
e5021abe91
changes to playback client and web
2010-11-10 05:51:09 +00:00
Marco Calderon
d186288749
added record conference call to BBB API
2010-10-24 08:59:23 +00:00
Marco Calderon
4fed45a444
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
2010-10-14 17:03:04 +00:00
Marco Calderon
828d1766d6
Support for record directly in files
2010-10-04 23:23:26 +00:00
deniszgonjanin
efd378f403
Fix for a participant being able to join the voice conference multiple times
2010-09-28 05:21:45 +00:00
deniszgonjanin
89ec87d657
Fix for new chat UI flickering
2010-09-24 10:15:22 +00:00
deniszgonjanin
bdf857b56e
Chat History fix for 0.71
2010-09-24 09:12:35 +00:00
deniszgonjanin
d93ffd1f71
Playback client improvements
2010-09-17 03:59:04 +00:00
Marco Calderon
37ed5c5429
added participants module
2010-09-02 15:38:57 +00:00
Marco Calderon
6a15a2c4c8
changes to the playback-client
2010-09-02 13:29:46 +00:00
Marco Calderon
2f69b4e48b
javadoc recorder module - logs updated to java code, playback-web update and playback-client update
2010-08-16 17:41:05 +00:00
Marco Calderon
6c84e2c561
Changes: bbb-apps from groovy to java, add recording module and updated events-recorder and bbb-commons
2010-08-02 10:33:36 +00:00
Richard Alam
04eabdacbb
- rename package
2010-07-20 11:35:03 -04:00
Richard Alam
1bde953703
- setup dependencies
2010-07-20 11:31:57 -04:00
Richard Alam
2e2ba473fe
- ignore eclipse IDE files and dir
2010-07-20 11:28:32 -04:00
Richard Alam
6d007a64fd
- rename message-recorder to events-recorder
2010-07-19 13:04:39 -04:00
Richard Alam
736514e9b0
- renaming to playback-client
2010-07-19 12:17:46 -04:00
Richard Alam
a9679acbcf
- cleanup unused folder
2010-07-19 12:16:53 -04:00
Richard Alam
c1edb67290
- moved the record-and-playback folder from labs
2010-07-19 12:16:11 -04:00