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

Merge pull request #176 from gugat/matterhorn-1-4

Browse Source 
support ingest for matterhorn 1.4
This commit is contained in:
Gustavo Salazar 2013-06-07 14:51:40 -07:00
commit 1fb76f425c
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
record-and-playback/core/lib/recordandplayback/generators/matterhorn_processor.rb
View File

@ -45,44 +45,45 @@ module BigBlueButton
result = xml.instruct! :xml, :version => "1.0"
timestamp = (Time::now).utc.strftime("%Y-%m-%dT%H:%M:%S")
xml.tag!("ns2:mediapackage", "duration" => duration.to_s.split(".")[0] + "000",
"start" => timestamp, "xmlns:ns2" => "http://mediapackage.opencastproject.org") {
xml.tag!("mediapackage", "duration" => duration.to_s.split(".")[0] + "000", "id" => meeting_id, "start" => timestamp ) {
xml.media{
if vpresenter
if vpresenter
xml.track("id" => "track-1", "type" => "presenter/source") {
xml.mimetype(MIME::Types.type_for(vpresenter.path).first.content_type)
xml.checksum(Digest::MD5.hexdigest(File.read(vpresenter.path)), "type" => "md5")
xml.url(vpresenter.path.sub(/.+\//, ""))
xml.size(vpresenter.size)
xml.tags
# Remove path and just have video.flv
xml.url(vpresenter.path.sub(/.+\//, ""))
xml.checksum(Digest::MD5.hexdigest(File.read(vpresenter.path)), "type" => "md5")
xml.duration(vpresenter.duration.round.to_s.split(".")[0] + "000")
xml.video("id" => "video1") {
xml.encoder("type" => vpresenter.video_codec)
xml.resolution(vpresenter.width.to_s + "x" + vpresenter.height.to_s)
xml.bitrate(vpresenter.bitrate.to_s + "000")
xml.framerate(vpresenter.frame_rate)
xml.resolution(vpresenter.width.to_s + "x" + vpresenter.height.to_s)
}
}
end
end
if vpresentation
if vpresentation
xml.track("id" => "track-2", "type" => "presentation/source") {
xml.mimetype(MIME::Types.type_for(vpresentation.path).first.content_type)
xml.checksum(Digest::MD5.hexdigest(File.read(vpresentation.path)),"type" => "md5")
xml.url(vpresentation.path.sub(/.+\//, ""))
xml.size(vpresentation.size)
xml.duration(vpresentation.duration.round.to_s.split(".")[0] + "000")
xml.tags
# Remove path and just have deskshare.flv
xml.url(vpresentation.path.sub(/.+\//, ""))
xml.checksum(Digest::MD5.hexdigest(File.read(vpresentation.path)),"type" => "md5")
xml.duration(vpresentation.duration.round.to_s.split(".")[0] + "000")
xml.video("id" => "video2") {
xml.encoder("type" => vpresentation.video_codec)
xml.resolution(vpresentation.width.to_s + "x" + vpresentation.height.to_s)
xml.bitrate(vpresentation.bitrate.to_s + "000")
xml.framerate(vpresentation.frame_rate)
xml.resolution(vpresentation.width.to_s + "x" + vpresentation.height.to_s)
}
}
end
end
}

2
record-and-playback/matterhorn/scripts/process/matterhorn.rb
View File

@ -64,7 +64,7 @@ if not FileTest.directory?(target_dir)
end
#Create xml files with metadata
BigBlueButton::MatterhornProcessor.create_manifest_xml("#{target_dir}/muxed-audio-webcam.flv", "#{target_dir}/deskshare.flv", "#{target_dir}/manifest.xml")
BigBlueButton::MatterhornProcessor.create_manifest_xml("#{target_dir}/muxed-audio-webcam.flv", "#{target_dir}/deskshare.flv", "#{target_dir}/manifest.xml", meeting_id)
metadata = BigBlueButton::Events.get_meeting_metadata("#{temp_dir}/#{meeting_id}/events.xml")