BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

Browse Source
This commit is contained in:
Richard Alam 2012-08-10 15:54:01 +00:00
commit eef20d38c1
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
labs/bbb-api-php/includes/bbb-api.php
View File

@ -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))

4
record-and-playback/core/lib/recordandplayback/generators/video.rb
View File

@ -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

2
record-and-playback/presentation/playback/presentation/css/bbb.playback.css
View File

@ -59,7 +59,7 @@ br{
width: 100%;
}
#videoRecording{
#video{
width: 402px;
}

2
record-and-playback/presentation/playback/presentation/lib/writing.js
View File

@ -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

2
record-and-playback/presentation/playback/presentation/playback.html
View File

@ -34,7 +34,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<div class="chatcontainer">
<div id="chat"></div>
<div id="videoRecordingWrapper">
<video id="videoRecording" controls>You must use an HTML5 capable browser to view this page.
<video id="video" controls>You must use an HTML5 capable browser to view this page.
This playback requires modern browser, please use FF, Safari, Chrome</video>
</div>
</div>

18
record-and-playback/presentation/playback/presentation/playback.js
View File

@ -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,11 +168,11 @@ 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');
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);

6
record-and-playback/presentation/scripts/publish/presentation.rb
View File

@ -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)