coderrr-video-accel 0.0.3 → 0.0.4

data/lib/speed_stream.rb

@@ -18,8 +18,8 @@ class SpeedStream
     @output_file = output_file
     @write_mutex = Mutex.new
     @finished = []
-    @bytes_per_conn = 100_000
-    @concurrent_connections = 10
+    @bytes_per_conn = 200_000
+    @concurrent_connections = 15
     @cookies = {}
     @extra_file_length_headers = {'Range' => 'bytes=1-'}
   end
@@ -34,8 +34,8 @@ class SpeedStream
   
       begin
         ranges.each do |range|
-          pool.add_work(range) do |range|
-            download_range range
+          pool.add_work(range) do |drange|
+            download_range drange
           end
         end
       ensure
@@ -48,11 +48,18 @@ class SpeedStream
   private 
   
   def download_range(range)
-    file_offset = range.begin
-    
-    data = get_with_redirects(range)
-    write_file(file_offset, data)
-    
+    data = nil
+    Timeout.timeout(3*60) do
+      data = get_with_redirects(range)
+    end
+  rescue Timeout::Error
+    puts "Timed out, retrying"
+    retry
+  rescue Exception
+    puts $!, $@
+    retry
+  else
+    write_file(range.begin, data)
     process_progress(range)
   end
   
@@ -85,8 +92,8 @@ class SpeedStream
   end
   
   def write_file(pos, buf)
-    @bytes_written += buf.size
     @write_mutex.synchronize do
+      @bytes_written += buf.size
       file_handle.seek(pos, IO::SEEK_SET)
       file_handle.write buf
       file_handle.flush
@@ -100,6 +107,8 @@ class SpeedStream
         rs << (n*bytes_per_conn..(n+1)*bytes_per_conn)
       end
       rs[-1] = (rs[-1].begin..file_length)
+
+      puts file_length
       rs
     end
   end

data/lib/vdl.rb

@@ -46,10 +46,10 @@ stream.on_progress = lambda do |bytes, bps, percent|
   puts "downloading #{url} to #{file}..."
   puts "#{'%.2f'%bps} b/s   #{'%.2f%'%percent}"
 
-  if !started and bytes > 1_000_000
+  if !started and bytes > 200_000
     started = true
     system(%{#{terminal} "#{player} #{file}" &})
   end
 end
 
-stream.download!
+stream.download!

data/lib/video_player.rb

@@ -21,6 +21,9 @@ class VideoPlayer
     puts "process #{cmd}"
     case cmd
     when 'q' then exit!
+    when 'r'
+      @pid.kill!  if @pid
+      @pid = spawn(@last_spawn)
     when 'm'
       @pid.kill!  if @pid
       @pid = spawn("mplayer -msglevel all=0 #{MP_ARGS[@mplayer_arg]} #{@file}")
@@ -32,6 +35,7 @@ class VideoPlayer
   end
   
   def spawn(cmd)
+    @last_spawn = cmd
     pid = fork do
       exec(cmd)
     end

data/lib/youtube_speed_stream.rb

@@ -1,25 +1,48 @@
 require 'speed_stream'
 
 class YoutubeSpeedStream < SpeedStream
+  class YoutubeRange < Range
+    attr_accessor :file_offset
+    attr_writer :begin
+    alias_method :orig_begin, :begin
+    def begin
+      @begin or orig_begin
+    end
+  end
+
   def initialize(*a)
     super
-    @concurrent_connections = 20
+    @concurrent_connections = 4
     @extra_file_length_headers = {}
+    @chunk_beginnings = {}
   end
 
   private 
   
+  def ranges
+    @ranges ||= begin
+      len = 2*60 + 13
+      ranges = []
+      i = 0
+      (0..len).step(2) do |start|
+        ranges << YoutubeRange.new(start, i)
+        i += 1
+      end
+      ranges.first.file_offset = 0
+      ranges
+    end
+  end
+
   def get_with_redirects(range)
+    start = range.begin
+    index = range.end
     current_uri = uri
 
     loop do
       TCPSocket.open(current_uri.host, current_uri.port) do |s|
         uri_str = current_uri.request_uri
-        if uri_str.include? "&start="
-          uri_str.gsub(/&start=\d+/, "&start=#{range.begin}")
-        else
-          uri_str << "&start=#{range.begin}"
-        end
+        uri_str.sub!(/&begin=\d+|$/, "&begin=#{range.begin*1000}")
+
         s.write("GET #{uri_str} HTTP/1.1\r\nHost: #{current_uri.host}\r\nCookie: #{cookie_string}\r\n\r\n")
         
         s.while_reading(data = "") { break  if data =~ /\r?\n\r?\n/ }
@@ -32,14 +55,26 @@ class YoutubeSpeedStream < SpeedStream
         # strip off header and keep reading
         data.gsub!(/\A.+?\r?\n\r?\n/m,'')
         
-        while buf = (s.readpartial(16384) rescue nil)
+        while buf = (s.readpartial(1024) rescue nil)
           data << buf
-          break  if range.begin + data.size > range.end
+          if ! @chunk_beginnings[index] and data.size > 1024
+            @chunk_beginnings[index] = data[0, 1024]
+          end
+          break  if bgn = @chunk_beginnings[index+1] and end_index = data.index(bgn[327..-1])
         end
+        sleep 1  until range.file_offset
+
+        @bytes_per_conn ||= data.size
+        data = data[0...end_index]  if end_index
 
         # strip FLV headers on all parts except first
-        start = range.begin == 0 ? 0 : 13
-        return data[start, range.end - range.begin]
+        data = data[327..-1] || ''  unless index == 0
+
+        ranges[index+1].file_offset = range.file_offset + data.size  if ranges[index+1]
+
+        range.begin = range.file_offset
+
+        return data
       end
     end
   end

data/video-accel.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = "video-accel"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
   s.author = "coderrr"
   s.email = "coderrr.contact@gmail.com"
 #  s.homepage = "http://blogs.cocoondev.org/crafterm/"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: coderrr-video-accel
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - coderrr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-27 00:00:00 -07:00
+date: 2009-02-13 00:00:00 -08:00
 default_executable: 
 dependencies: []