Merge pull request #4444 from kepstin/bbb-20-rec-fixes

Correctly handle a recording start being the last event in a recording.
This commit is contained in:
Richard Alam 2017-10-02 14:17:08 -04:00 committed by GitHub
commit e066b7de3b

View File

@ -383,6 +383,7 @@ module BigBlueButton
# Find the last EDL event from before or at the recording start # Find the last EDL event from before or at the recording start
loop do loop do
break if input_i + 1 >= edl.length
break if edl[input_i+1][:timestamp] > start_stop_event[:start_timestamp] break if edl[input_i+1][:timestamp] > start_stop_event[:start_timestamp]
input_i += 1 input_i += 1
end end
@ -402,6 +403,7 @@ module BigBlueButton
# Add the intervening events up to the stop # Add the intervening events up to the stop
loop do loop do
input_i += 1 input_i += 1
break if input_i >= edl.length
break if edl[input_i][:timestamp] >= start_stop_event[:stop_timestamp] break if edl[input_i][:timestamp] >= start_stop_event[:stop_timestamp]
new_edl[output_i] = edl_entry_offset.call(edl[input_i], 0) new_edl[output_i] = edl_entry_offset.call(edl[input_i], 0)