Minor fixups from testing

This commit is contained in:
Calvin Walton 2018-04-27 15:25:36 -04:00
parent 21bd4b2673
commit eb04276897
5 changed files with 28 additions and 4 deletions

View File

@ -18,7 +18,7 @@
<div id="main-area">
<div id="video-area">
<video id="video" class="video-js vjs-fill vjs-default-skin vjs-big-play-centered" controls>
<% screenshare_props[:formats].each_with_index do |format, i| %>
<% screenshare_props['formats'].each_with_index do |format, i| %>
<source src="screenshare-<%= i %>.<%= format[:extension] %>" type="<%= CGI.escapeHTML(format[:mimetype]) %>">
<% end %>
<% captions.each do |caption| %>

View File

@ -24,6 +24,7 @@ require File.expand_path('../../../lib/recordandplayback/edl', __FILE__)
require 'trollop'
require 'yaml'
require 'nokogiri'
require 'erb'
opts = Trollop::options do
opt :meeting_id, "Meeting id to process", :type => String
@ -142,7 +143,7 @@ screenshare_props['formats'].each_with_index do |format, i|
if File.exist?(filename)
logger.warn " Skipping encode ... File already exists"
else
filename = BigBlueButton::EDL.encode(audio, video, format, "#{process_dir}/screenshare-#{i}", screenshare_props['audio_offset'])
filename = BigBlueButton::EDL.encode(audio, video, format, "#{process_dir}/screenshare-#{i}", 0)
end
end
@ -174,7 +175,7 @@ metadata_xml = Nokogiri::XML::Builder.new do |xml|
xml.end_time(start_real_time + final_timestamp - initial_timestamp)
xml.playback {
xml.format('screenshare')
xml.link("#{props['playback_protocol']}://#{props['playback_host']}/screenshare/#{meeting_id}/")
xml.link("#{props['playback_protocol']}://#{props['playback_host']}/recording/screenshare/#{meeting_id}/")
xml.duration(duration)
}
xml.meta {

View File

@ -68,7 +68,7 @@ logger.info "Copying files to publish directory"
FileUtils.cp("#{process_dir}/index.html", "#{publish_dir}/index.html")
# Copy over generated video files
screenshare_props[:formats].each_with_index do |format, i|
screenshare_props['formats'].each_with_index do |format, i|
FileUtils.cp("#{process_dir}/screenshare-#{i}.#{format[:extension]}",
"#{publish_dir}/screenshare-#{i}.#{format[:extension]}")
end

View File

@ -0,0 +1,22 @@
#
# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
#
# Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
#
# This program is free software; you can redistribute it and/or modify it under the
# terms of the GNU Lesser General Public License as published by the Free Software
# Foundation; either version 3.0 of the License, or (at your option) any later
# version.
#
# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License along
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
#
location /recording/screenshare {
alias /var/bigbluebutton/published/screenshare;
index index.html index.htm;
}

View File

@ -21,6 +21,7 @@ formats:
:extension: webm
:parameters:
# Multi-pass encoding, high quality
# VP9 encoder settings based on https://developers.google.com/media/vp9/settings/vod/
- [ '-pass', '1',
# Video
'-c:v', 'libvpx-vp9',