From a25a5710a13a05db404605cf1f3ccb7062945889 Mon Sep 17 00:00:00 2001 From: Gustavo Salazar Date: Tue, 7 Aug 2012 13:16:02 -0500 Subject: [PATCH 1/3] Change id of video recording. --- .../presentation/playback/presentation/css/bbb.playback.css | 2 +- .../presentation/playback/presentation/lib/writing.js | 2 +- .../presentation/playback/presentation/playback.html | 2 +- .../presentation/playback/presentation/playback.js | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/record-and-playback/presentation/playback/presentation/css/bbb.playback.css b/record-and-playback/presentation/playback/presentation/css/bbb.playback.css index 5b0919e9ad..0db16c3d83 100755 --- a/record-and-playback/presentation/playback/presentation/css/bbb.playback.css +++ b/record-and-playback/presentation/playback/presentation/css/bbb.playback.css @@ -59,7 +59,7 @@ br{ width: 100%; } -#videoRecording{ +#video{ width: 402px; } diff --git a/record-and-playback/presentation/playback/presentation/lib/writing.js b/record-and-playback/presentation/playback/presentation/lib/writing.js index 6184537c23..fb790b5a9a 100755 --- a/record-and-playback/presentation/playback/presentation/lib/writing.js +++ b/record-and-playback/presentation/playback/presentation/lib/writing.js @@ -194,7 +194,7 @@ function runPopcorn() { main_shapes_times[main_shapes_times.length] = times[times.length-1]; //put last value into this array always! } - var p = new Popcorn("#videoRecording"); + var p = new Popcorn("#video"); //update 60x / second the position of the next value. p.code({ start: 1, // start time diff --git a/record-and-playback/presentation/playback/presentation/playback.html b/record-and-playback/presentation/playback/presentation/playback.html index c40df4d7f4..af60a65fb1 100755 --- a/record-and-playback/presentation/playback/presentation/playback.html +++ b/record-and-playback/presentation/playback/presentation/playback.html @@ -34,7 +34,7 @@ with BigBlueButton; if not, see .
-
diff --git a/record-and-playback/presentation/playback/presentation/playback.js b/record-and-playback/presentation/playback/presentation/playback.js index 1c36b5e14f..c610689a75 100644 --- a/record-and-playback/presentation/playback/presentation/playback.js +++ b/record-and-playback/presentation/playback/presentation/playback.js @@ -1,5 +1,5 @@ goToSlide = function(time) { - var pop = Popcorn("#videoRecording"); + var pop = Popcorn("#video"); pop.currentTime(time); } @@ -57,7 +57,7 @@ setEventsOnThumbnail = function($thumb) { // Popcorn event to mark a thumbnail when its slide is being shown var timeIn = $thumb.attr("data-in"); var timeOut = $thumb.attr("data-out"); - var pop = Popcorn("#videoRecording"); + var pop = Popcorn("#video"); pop.code({ start: timeIn, end: timeOut, @@ -168,7 +168,7 @@ generateThumbnails = function() { document.addEventListener( "DOMContentLoaded", function() { var appName = navigator.appName; var appVersion = navigator.appVersion; - var video = document.getElementById("videoRecording"); + var video = document.getElementById("video"); if (appName == "Microsoft Internet Explorer") { if (navigator.userAgent.match("chromeframe")) { video.setAttribute('src', RECORDINGS + '/video/webcams.mp4'); From a85e8c144ed856ae2258f957a651a6b99dd70481 Mon Sep 17 00:00:00 2001 From: Gustavo Salazar Date: Tue, 7 Aug 2012 16:36:52 -0500 Subject: [PATCH 2/3] Use webm for webcam in playback. --- .../core/lib/recordandplayback/generators/video.rb | 4 ++-- .../presentation/playback/presentation/playback.js | 12 ++++++------ .../presentation/scripts/publish/presentation.rb | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/record-and-playback/core/lib/recordandplayback/generators/video.rb b/record-and-playback/core/lib/recordandplayback/generators/video.rb index d774696e16..75938cdfa2 100755 --- a/record-and-playback/core/lib/recordandplayback/generators/video.rb +++ b/record-and-playback/core/lib/recordandplayback/generators/video.rb @@ -572,8 +572,8 @@ module BigBlueButton BigBlueButton.concatenate_videos(webcams, concat_vid) end - # create mp4 video and mux audio - command = "ffmpeg -i #{target_dir}/audio.ogg -i #{concat_vid} -loglevel fatal -v -10 -vcodec libx264 -profile high -preset slow -b 1000k -threads 0 -map 1:0 -map 0:0 -ar 22050 #{target_dir}/webcams.mp4" + # create webm video and mux audio + command = "ffmpeg -i #{target_dir}/audio.ogg -i #{concat_vid} -loglevel fatal -v -10 -vcodec libvpx -profile high -preset slow -b 1000k -threads 0 -map 1:0 -map 0:0 -ar 22050 #{target_dir}/webcams.webm" BigBlueButton.execute(command) end diff --git a/record-and-playback/presentation/playback/presentation/playback.js b/record-and-playback/presentation/playback/presentation/playback.js index c610689a75..1e3f33adaf 100644 --- a/record-and-playback/presentation/playback/presentation/playback.js +++ b/record-and-playback/presentation/playback/presentation/playback.js @@ -171,8 +171,8 @@ document.addEventListener( "DOMContentLoaded", function() { var video = document.getElementById("video"); if (appName == "Microsoft Internet Explorer") { if (navigator.userAgent.match("chromeframe")) { - video.setAttribute('src', RECORDINGS + '/video/webcams.mp4'); - video.setAttribute('type','video/mp4'); + video.setAttribute('src', RECORDINGS + '/video/webcams.webm'); + video.setAttribute('type','video/webm'); } else { var message = "To support this playback please install 'Google Chrome Frame', or use other browser: Firefox, Safari, Chrome, Opera"; var line = document.createElement("p"); @@ -185,11 +185,11 @@ document.addEventListener( "DOMContentLoaded", function() { document.getElementById("chat").appendChild(link); } } else if (appVersion.match("Safari") != null && appVersion.match("Chrome") == null) { - video.setAttribute('src', RECORDINGS + '/video/webcams.mp4'); - video.setAttribute('type','video/mp4'); + video.setAttribute('src', RECORDINGS + '/video/webcams.webm'); + video.setAttribute('type','video/webm'); } else { - video.setAttribute('src', RECORDINGS + '/video/webcams.mp4'); - video.setAttribute('type','video/mp4'); + video.setAttribute('src', RECORDINGS + '/video/webcams.webm'); + video.setAttribute('type','video/webm'); } video.setAttribute('data-timeline-sources', SLIDES_XML); diff --git a/record-and-playback/presentation/scripts/publish/presentation.rb b/record-and-playback/presentation/scripts/publish/presentation.rb index 74cfbe0910..3841d813d1 100755 --- a/record-and-playback/presentation/scripts/publish/presentation.rb +++ b/record-and-playback/presentation/scripts/publish/presentation.rb @@ -581,9 +581,9 @@ if ($playback == "slides") BigBlueButton.logger.info("Making video dir") video_dir = "#{package_dir}/video" FileUtils.mkdir_p video_dir - BigBlueButton.logger.info("Made video dir - copying: #{$process_dir}/webcams.mp4 to -> #{video_dir}") - FileUtils.cp("#{$process_dir}/webcams.mp4", video_dir) - BigBlueButton.logger.info("Copied .mp4 file") + BigBlueButton.logger.info("Made video dir - copying: #{$process_dir}/webcams.webm to -> #{video_dir}") + FileUtils.cp("#{$process_dir}/webcams.webm", video_dir) + BigBlueButton.logger.info("Copied .webm file") BigBlueButton.logger.info("Copying files to package dir") FileUtils.cp_r("#{$process_dir}/presentation", package_dir) From c84d809ec4be53ebdb3fe927794a09cd196eeed1 Mon Sep 17 00:00:00 2001 From: Vikrant1 Date: Wed, 8 Aug 2012 22:56:10 +0200 Subject: [PATCH 3/3] Update labs/bbb-api-php/includes/bbb-api.php Fixed function getCreateMeetingUrl() so that the duration parameter is passed properly when creating meeting. Minor change was required to the file: Line 137 was changed to end with ";" instead of "." --- labs/bbb-api-php/includes/bbb-api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/labs/bbb-api-php/includes/bbb-api.php b/labs/bbb-api-php/includes/bbb-api.php index 2bc6322cef..a932c1fafe 100644 --- a/labs/bbb-api-php/includes/bbb-api.php +++ b/labs/bbb-api-php/includes/bbb-api.php @@ -134,7 +134,7 @@ class BigBlueButton { '&logoutURL='.urlencode($creationParams['logoutUrl']). '&maxParticipants='.urlencode($creationParams['maxParticipants']). '&record='.urlencode($creationParams['record']). - '&duration='.urlencode($creationParams['duration']). + '&duration='.urlencode($creationParams['duration']); //'&meta_category='.urlencode($creationParams['meta_category']); $welcomeMessage = $creationParams['welcomeMsg']; if(trim($welcomeMessage))