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

cleaning up and reverting unnecessary config

Browse Source
This commit is contained in:
Anton Georgiev 2015-09-29 16:03:40 +00:00
parent 1d1c8a421b
commit 6b8626d40f
3 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
record-and-playback/core/lib/recordandplayback/generators/events.rb
View File

@ -291,19 +291,13 @@ module BigBlueButton
case event['eventname']
when 'DeskShareNotifyViewersRTMP'
isBroadcasting = event.at_xpath('broadcasting').text
BigBlueButton.logger.error("____isBroadcasting=#{isBroadcasting}\n") ##this is the boolean
if isBroadcasting == "true" #this is a start event
BigBlueButton.logger.info("\n^^^^START OF WEBRTC DESKSHARE")
BigBlueButton.logger.info("create_deskshare_edl::START OF WEBRTC DESKSHARE")
streamPath = event.at_xpath('streamPath').text
BigBlueButton.logger.info("\nstreamPath=#{streamPath}")
streamPathArray = streamPath.split('/')
BigBlueButton.logger.info("\nstreamPath=#{streamPath}")
meeting_id = streamPathArray[5]
BigBlueButton.logger.info("\n meeting_id=#{meeting_id}")
dsFilename = "#{archive_dir}/video-broadcast/#{meeting_id}.flv"
BigBlueButton.logger.info("\n dsFilename=#{dsFilename}")
deskshare_edl << {
:timestamp => timestamp,
@ -314,12 +308,14 @@ module BigBlueButton
}
}
elsif isBroadcasting == "false" #this is a stop event
BigBlueButton.logger.info("\n^^^^END OF WEBRTC DESKSHARE\n")
BigBlueButton.logger.info("create_deskshare_edl::END OF WEBRTC DESKSHARE")
# deskshare_edl << {
# :timestamp => 0,
# :areas => { :deskshare => [] }
# }
else #unhandled case
BigBlueButton.logger.error("ERROR 1245\n")
BigBlueButton.logger.error("create_deskshare_edl::ERROR 1245\n")=
end
end
end

18
record-and-playback/core/scripts/bigbluebutton.yml
View File

@ -9,15 +9,15 @@ redis_port: 6379
# # For PRODUCTION
# log_dir: /var/log/bigbluebutton
# recording_dir: /var/bigbluebutton/recording
# published_dir: /var/bigbluebutton/published
# playback_host: 10.0.3.203
log_dir: /var/log/bigbluebutton
recording_dir: /var/bigbluebutton/recording
published_dir: /var/bigbluebutton/published
playback_host: 10.0.3.203
# For DEVELOPMENT
# This allows us to run the scripts manually
scripts_dir: /home/ubuntu/dev/bigbluebutton/record-and-playback/core/scripts
log_dir: /home/ubuntu/temp/log
recording_dir: /home/ubuntu/temp/recording
published_dir: /home/ubuntu/temp/published
playback_host: 192.168.0.109
# scripts_dir: /home/ubuntu/dev/bigbluebutton/record-and-playback/core/scripts
# log_dir: /home/ubuntu/temp/log
# recording_dir: /home/ubuntu/temp/recording
# published_dir: /home/ubuntu/temp/published
# playback_host: 192.168.22.137

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

@ -602,43 +602,24 @@ def preprocessSlideEvents
end
def processWebRTCDeskshareEvents
BigBlueButton.logger.info("\n\n\n BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB")
BigBlueButton.logger.info("processWebRTCDeskshareEvents - WEBRTC DESKSHARE events processing")
new_webrtc_deskshare_events = []
# BigBlueButton.logger.info("stage1")
$webrtc_deskshare_events.each do |webrtc_deskshare_event|
# BigBlueButton.logger.info("stage2" + webrtc_deskshare_event)
new_ds_event = webrtc_deskshare_event.clone
BigBlueButton.logger.info("stage2.5" + new_ds_event)
# BigBlueButton.logger.info("stage2.6" + new_ds_event.inspect)
# BigBlueButton.logger.info("stage3:" + new_ds_event[:timestamp])
# BigBlueButton.logger.info("stage3.5:" + new_ds_event[:timestamp].to_f)
# BigBlueButton.logger.info("inspect of rec_events = " + $rec_events.inspect)
$rec_events.each do |rec_event|
# BigBlueButton.logger.info("stage2.7" + rec_event.inspect)
# BigBlueButton.logger.info("stage6:" + new_ds_event[:timestamp]+ "____" + rec_event[:start_timestamp].to_s)
new_ds_event_timestamp = Integer(new_ds_event[:timestamp])
BigBlueButton.logger.info("stage7!" + new_ds_event[:timestamp].to_s)
if new_ds_event_timestamp <= rec_event[:start_timestamp]
BigBlueButton.logger.info("stage8!")
new_ds_event_timestamp = rec_event[:start_timestamp]
if not new_webrtc_deskshare_events.empty? and new_webrtc_deskshare_events.last()[:timestamp] == rec_event[:start_timestamp]
BigBlueButton.logger.info("stage9!")
new_webrtc_deskshare_events.pop()
end
BigBlueButton.logger.info("stage10!")
new_webrtc_deskshare_events << new_ds_event
break
BigBlueButton.logger.info("stage11!")
elsif new_ds_event_timestamp > rec_event[:start_timestamp] and new_ds_event_timestamp <= rec_event[:stop_timestamp]
BigBlueButton.logger.info("stage12!")
new_webrtc_deskshare_events << new_ds_event
BigBlueButton.logger.info("stage13!")
end
end
end
BigBlueButton.logger.info("returning the following:" + new_webrtc_deskshare_events.inspect)
BigBlueButton.logger.info(" BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB \n\n")
return new_webrtc_deskshare_events
end