sensible-cinema 0.25.0 → 0.25.1

data/TODO

@@ -26,12 +26,17 @@
 
 == yes do ordered in conjunction with the above probably ==
   release at some point...Oliver? facebook?
-  snapshots of snow white "normal", then deploy pics
+  snapshots of snow white "normal", then deploy the various pics
   lightning strike from various outlets...
   research VOB
     timesplits?
 
 == yes do, un-ordered currently, from the various future release options ==
+  todo.upconvert
+    except I'm really close [?] with netflix instant upconverter...hmm...
+  new open button "edit the one for current DVD"
+  the other button should open in the "editing" EDL dir.
+  overlapping mute failure when you hit the "watch edited realtime" should popup.
   split out the "dependency" code from main.
   try buy edit lists from all x,y,z [?] maybe ask for them for free first? ()
     http://www.familysafemovies.com
@@ -50,6 +55,7 @@
   make it load faster! this is cuh-razy! or splash screen! yes!
   netflix quality upconverter
     want a prototype mplayer upconverter...I guess... 
+  add back in scale for OS X, see if it's expensive or not...I'd guess not though...
   research XBMC
     @XBMC: your stuff is broken in at least these two ways (bug reports)
     also are they 30fps or not? and how do they handle timesplits?
@@ -68,6 +74,7 @@
     0.3 ... ? huh?
   fix released version to work in mac
   release capture filter, advertise it :)
+  report ffmpeg bug, mplayer various :P
   note "you want to optimize your reverse blitting first... :)"
     test speed of from DESKTOP versus HWND.
     can use hwnd.  Somehow automated.
@@ -81,6 +88,7 @@
   urug again?
     after works in mac. Why not?
   if 2 EDL's, still can choose a title track
+  advertise virtual audio
   auto-add largest title to the generator EDL
     complain if times looks wrong...on playback? sum time
   tighten old splits... [remove, really, I guess...sure while I only have few...and also add better instructions...]
@@ -89,6 +97,7 @@
   @instructions "this is great for comparing srt's, except...when it isn't, then you have to..."
   @instructions: full srt how-to document instead of tooltip [?] or combine the two! yes!
   volume_name => dvd_volume_name
+  C-based stuff cleanup loose ends
   why is the Sintel's EDL seemingly off?
     ascertain how accurate mplayer EDL is...I guess compared to...umm...something?
       fix discrepancy between EDL mplayer and ffmpeg...maybe a new button "accurate EDL playback"?
@@ -175,6 +184,8 @@
   investigate: can I use zoomplayer max?
 
 == DVD+-DVD-realtime backlog (totally unordered, some very low prio, basically all never do) ==
+  @ffdshow-tryouts: don't crash me!
+  conference it can "pick out songs" (like a music video? mp3's?)
   check with WME plugins, add instructions, then note in the README "support for x..."
   "1:07:5.718" , "1:07:10.447", "profanity", "ba.....", "Faraday that [ba.....] That ba He's gonna wish he never met us",
     should have dots uh guess...

data/VERSION

@@ -1 +1 @@
-0.25.0
+0.25.1

data/bin/sensible-cinema

@@ -321,7 +321,9 @@ module SensibleSwing
         if OS.mac?
           '' # avoid odd message try appending the scale filter <sigh> I don't *want* the scale filter with no upconversion gah.
         else
-          "pullup,softskip"
+          # until I find out if they were making me too slow on older comps'
+          # "pullup,softskip"
+          ''
         end
       end
     end

data/bin/sensible-cinema-cli

@@ -94,10 +94,10 @@ def go_sc(args)
       screen_tracker = ScreenTracker.new_from_yaml File.binread(player_description), overlay
       does_not_need_mouse_jerk = YAML.load_file(player_description)["does_not_need_mouse_movement"]
       unless does_not_need_mouse_jerk
-        p 'yes mouse jitter' if $VERBOSE or $DEBUG
+        p 'yes using mouse jitter' if $VERBOSE or $DEBUG
         Mouse.jitter_forever_in_own_thread # when this ends you know a snapshot was taken...
       else
-        p 'no mouse jitter' if $VERBOSE or $DEBUG
+        p 'not using mouse jitter' if $VERBOSE or $DEBUG
       end
       
       # exit early if we just wanted a screen dump...a little kludgey...
@@ -105,7 +105,7 @@ def go_sc(args)
         puts 'warning--only doing screen dump in t-minus 2s...'      
         sleep 2
         puts 'snap!'
-        screen_tracker.dump_bmp
+        screen_tracker.dump_bmps
         exit 1
       end
       screen_tracker.process_forever_in_thread
@@ -115,7 +115,7 @@ def go_sc(args)
     
     OCR.unserialize_cache_from_disk # do this every time so we don't delete it if they don't have one...
   
-    puts "Opening the curtains... (please play in your other player now)"
+    puts "Opening the curtains... (please play in your other video player now)"
     overlay.start_thread true
     key_input = KeyboardInput.new overlay
     key_input.start_thread # status thread

data/change_log_with_feature_list.txt

@@ -1,3 +1,10 @@
+== 0.25.1 ==
+
+Added ability to dynamically "find" which window contained the playing movie, and capture it, from desktop, 
+for upscaling or capturing.
+
+added ability to "minimize" and "unminimize" a movie player window in order to "simulate" blanking.
+
 == 0.25.0 ==
 
 Created my own directshow screen capture filter to go along with netflix instant upconvert, 

data/conclusions

@@ -0,0 +1,6 @@
+"commercial" players, like windows media player, will "seek" based on 30 fps, even if
+  the underlying is 29.97
+  however if you allow them to just continue playing, they use wall time, which is 29.97 fps
+  
+makemkv can give you streams that are up to like 2s out of whack with the DVD.  tsmuxer
+ seems to fix those though, if you unmux them.

data/lib/blanker.rb

@@ -47,11 +47,28 @@ else
       @fr.set_visible(false) # hide it to start
     end
     
-    @@use_mouse = true
+    @@use_mouse = false
+    @@use_foreground_window_minimize = true
+    if @@use_foreground_window_minimize
+      require 'win32/screenshot'
+      SW_MINIMIZE = 6
+    end
+    
+    def self.minimize_hwnd hwnd
+      Win32::Screenshot::BitmapMaker.show_window(hwnd, SW_MINIMIZE)
+    end
+    
+    def self.restore_hwnd hwnd
+      Win32::Screenshot::BitmapMaker.restore(hwnd)
+    end
 
     def self.blank_full_screen! seconds
+      
       if @@use_mouse
         Mouse.single_click_left_mouse_button
+      elsif @@use_foreground_window_minimize
+        @foreground_hwnd ||= Win32::Screenshot::BitmapMaker.foreground_window
+        minimize_hwnd @foreground_hwnd
       else
         # somewhat hacky work around for doze: http://www.experts-exchange.com/Programming/Languages/Java/Q_22977145.html
         @fr.setAlwaysOnTop(false) 
@@ -69,6 +86,8 @@ else
     def self.unblank_full_screen!
       if @@use_mouse
         Mouse.single_click_left_mouse_button
+      elsif @@use_foreground_window_minimize
+        restore_hwnd @foreground_hwnd
       else
         # just move it off screen...lodo
         @fr.set_location(-2100, -2100)

data/lib/mouse.rb

@@ -116,7 +116,7 @@ module Mouse
     VK_LBUTTON = 0x01 # mouse left button for GetAsyncKeyState
     
     def left_mouse_button_state
-      GetAsyncKeyState(VK_LBUTTON) # ignore a first call, which also tells us if it has changed at all since last call
+      GetAsyncKeyState(VK_LBUTTON) # ignore a first response, which also tells us if it has changed at all since last call
       if GetAsyncKeyState(VK_LBUTTON) == 0 # zero means up
         :up
       else

data/lib/mouse_draw.rb

@@ -0,0 +1,41 @@
+require 'mouse'
+
+
+class MouseDraw
+  
+  def self.go
+  
+  require 'java'
+
+  java_import 'javax.swing.JFrame'
+  java_import 'javax.swing.JButton'
+  java_import 'com.sun.awt.AWTUtilities'
+
+  f = JFrame.new
+  f.add JButton.new('capture window')
+  f.set_size(200,200)
+
+  AWTUtilities.set_window_opacity(f, 0.5)
+  
+  # wait till mouse goes down...
+  while(Mouse.left_mouse_button_state == :up)
+    sleep 0.05
+    print '.'
+  end
+  f.undecorated = true
+  f.default_close_operation = JFrame::EXIT_ON_CLOSE
+  f.always_on_top = true
+  f.visible = true
+  f.set_location(Mouse.get_mouse_location)
+  while(Mouse.left_mouse_button_state == :down)
+    # set_size
+  end
+  #f.close
+end
+  
+end
+
+
+if $0 == __FILE__
+  MouseDraw.go
+end

data/lib/muter.rb

@@ -53,38 +53,10 @@ module Muter
     keybd_event(VK_VOLUME_DOWN, 0, KEYEVENTF_KEYUP, nil)
   end
   
-  @@use_mouse = false # inventionzy
-  @@use_static_on_top = false # inventionzy
-  @@use_down_volume_button = true
-  
-  def start_playing_static
-    @player = PlayAudio.new(__DIR__ + '/static.wav')
-    @player.loop
-    p 'STARTED STATIC'
-  end
-  
-  def stop_playing_static
-    if @player
-      p 'STOPPED STATIC'
-      @player.stop
-      @player = nil
-    end
-  end
-  
-  @@use_down_volume_button_number = 3
-  
   def mute!
     #unmute! # just in case...somehow this was causing problems...windows 7 perhaps? VLC? 
-    # anyway we just use a toggle for now...dangerous but works hopefully
-    if @@use_mouse
-      Mouse.single_click_left_mouse_button
-    elsif @@use_static_on_top
-      start_playing_static
-    elsif @@use_down_volume_button
-      @@use_down_volume_button_number.times { hit_volume_down_key }
-    else
-      hit_mute_key
-    end
+    # anyway we just use a toggle for now...dangerous but works hopefully...
+    hit_mute_key
   end
 
   # LODO better for doze 7/xp

data/lib/screen_tracker.rb

@@ -19,10 +19,17 @@ require 'win32/screenshot'
 require 'sane'
 require 'yaml'
 require File.dirname(__FILE__)+ '/ocr'
+require 'ffi'
 
 class ScreenTracker
   
-  def self.new_from_yaml yaml, callback
+  extend FFI::Library
+  ffi_lib 'user32'
+  # second parameter, pointer, LPRECT is FFI::MemoryPointer.new(:long, 4)
+  # read it like rect.read_array_of_long(4)
+  attach_function :GetWindowRect, [:long, :pointer], :int # returns a BOOL
+  
+  def self.new_from_yaml yaml, callback # callback can be nil, is used for timestamp changed stuff
     settings = YAML.load yaml
     return new(settings["name"], settings["x"], settings["y"], settings["width"], 
         settings["height"], settings["use_class_name"], settings["digits"], callback)
@@ -32,13 +39,13 @@ class ScreenTracker
   
   # digits are like {:hours => [100,5], :minute_tens, :minute_ones, :second_tens, :second_ones}
   # digits share the height start point, have their own x and width...
-  def initialize name_or_regex,x,y,width,height,use_class_name=nil,digits=nil,callback=nil
+  def initialize name_or_regex, x, y, width, height, use_class_name=nil, digits=nil, callback=nil
     # cache to save us 0.00445136 per time LOL
     @name_or_regex = name_or_regex
     @use_class_name = use_class_name
-    get_hwnd
     pps 'height', height, 'width', width if $VERBOSE
     raise 'poor dimentia' if width <= 0 || height <= 0
+    get_hwnd_loop_forever
     max_x, max_y = Win32::Screenshot::Util.dimensions_for(@hwnd)
     if(x < 0 || y < 0)
       if x < 0
@@ -48,7 +55,6 @@ class ScreenTracker
         y = max_y + y
       end
     end
-    @height = height
     @x = x; @y = y; @x2 = x+width; @y2 = y+height; @callback = callback    
     @max_x = max_x
     raise "poor width or wrong window #{@x2} #{max_x} #{x}" if @x2 > max_x  || @x2 == x
@@ -65,7 +71,7 @@ class ScreenTracker
     pps 'using x',@x, 'from x', x, 'y', @y, 'from y', y,'x2',@x2,'y2',@y2,'digits', @digits.inspect if $VERBOSE
   end
   
-  def get_hwnd
+  def get_hwnd_loop_forever
     if @name_or_regex.to_s.downcase == 'desktop'
       # full screen option
       assert !@use_class_name # not an option
@@ -89,7 +95,7 @@ class ScreenTracker
       end
       puts 're-established contact with window'
     end
-
+    true
   end
   
   # gets the snapshot of "all the digits together"
@@ -104,7 +110,7 @@ class ScreenTracker
   end
 
   # writes out all screen tracking info to various files in the current pwd
-  def dump_bmp filename = 'dump.bmp'
+  def dump_bmps filename = 'dump.bmp'
     File.binwrite filename, get_bmp
     File.binwrite 'all.' + filename, get_full_bmp
     dump_digits(get_digits_as_bitmaps, 'dump_bmp') if @digits
@@ -144,10 +150,16 @@ class ScreenTracker
     out
   end
   
-  def get_relative_coords
+  def get_relative_coords_of_timestamp_window
     [@x,@y,@x2,@y2]
   end
   
+  def get_coords_of_window_on_display # yea
+    out = FFI::MemoryPointer.new(:long, 4)
+    ScreenTracker.GetWindowRect @hwnd, out
+    out.read_array_of_long(4)
+  end
+
   def identify_digit bitmap
     OCR.identify_digit(bitmap, @digits)
   end
@@ -184,7 +196,7 @@ class ScreenTracker
           @previously_displayed_warning = true
           time_since_last_screen_change = Time.now
           # also reget window hwnd, just in case that's the problem...(can be with VLC moving from title to title)
-          get_hwnd
+          get_hwnd_loop_forever
         end
       end
     }

data/lib/subtitle_profanity_finder.rb

@@ -116,6 +116,7 @@ module SubtitleProfanityFinder
       's'*2)) => ['a..', :full_word],
       arse + 'h' +
       'ole' => 'a..h...',
+      'dieu' => ['deity', :full_word], # TODO fails...
       arse + 'wipe' => 'a..w....',
       'jes' +
       'u' + 's' => 'j....',
@@ -129,7 +130,7 @@ module SubtitleProfanityFinder
     bad_profanities.merge! extra_profanity_hash # LODO make easier to use...
 
     semi_bad_profanities = {}
-    ['bloody', 'moron', 'idiot', 'butt', 'sex', 'genital', 'make love', 'suck', 
+    ['bloody', 'moron', 'idiot', 'sex', 'genital', 'make love', 'suck', 
       'making love', 'love mak', 
       'breast', 
       'piss'].each{|name|
@@ -137,6 +138,7 @@ module SubtitleProfanityFinder
       semi_bad_profanities[name] = name
     }
     semi_bad_profanities['crap'] = ['crap', :full_word]
+    semi_bad_profanities['crap'] = ['butt', :full_word]
 
     all_profanity_combinationss = [convert_to_regexps(bad_profanities), convert_to_regexps(semi_bad_profanities)]
     

data/spec/notes

@@ -1,8 +1,26 @@
-
 up next:
 
+== ==
+desktop filter:
+ 1024x1024:
+   15% one cpu used by the capture utility (0.013ms per capture)
+   good for now I guess (no transparency visible...)
+   12 fps <sigh>
+
 == upconvert netflix ==
 
+=== mplayer avisynth ===
+  http://www.youtube.com/watch?v=hkOnH36S_pY&feature=player_profilepage
+    mplayer's default upscaling seems to introduce wild dots..probably
+    I think MS's bundled "magnifier" does some internal smudging for me, otherwise it would look awful
+    mplayer at default seems to be doing weird things?
+    paint.net on the win32::screenshot capture seemed to match quite well what the screen had.
+    ffplay seems to show an exact verbatim copy...
+    actually mplayer seems to be a good exact duplicate...
+    
+=== other ===
+
+
 media player classic appears to have no cache.
 "uscreencapture settings" appears to be per app, so lost with a .grf file save [?]
   or maybe appear to be overridden...by WMC, mplayer10, not virtualdub, not ffmpeg, yes mplayer

data/spec/screen_tracker.spec.rb

@@ -83,7 +83,7 @@ describe ScreenTracker do
 
   it "should have different bmp if sizes different" do
     a = ScreenTracker.new("VLC",10,10,5,5)
-    assert a.get_relative_coords == [10,10,15,15]
+    assert a.get_relative_coords_of_timestamp_window == [10,10,15,15]
     b = ScreenTracker.new("VLC",10,10,50,50)
     assert a.get_bmp != b.get_bmp
   end
@@ -106,7 +106,7 @@ describe ScreenTracker do
     it "should assign right offsets" do
       a = ScreenTracker.new("VLC",-10,-10,5,5)
       a.get_bmp
-      x,y,x2,y2=a.get_relative_coords
+      x,y,x2,y2=a.get_relative_coords_of_timestamp_window
       hwnd = Win32::Screenshot::BitmapMaker.hwnd("VLC")
       max_x, max_y = Win32::Screenshot::Util.dimensions_for(hwnd)
       x.should == max_x-10
@@ -120,7 +120,7 @@ describe ScreenTracker do
       b = ScreenTracker.new("VLC",10,10,50,50)
       c = ScreenTracker.new("VLC",-99,-99,50,50)
       assert a.get_bmp == b.get_bmp
-      assert c.get_relative_coords != b.get_relative_coords
+      assert c.get_relative_coords_of_timestamp_window != b.get_relative_coords_of_timestamp_window
       cb = c.get_bmp
       bb = b.get_bmp
       c.get_bmp.length == b.get_bmp.length
@@ -160,7 +160,7 @@ describe ScreenTracker do
       - 7
     YAML
     a = ScreenTracker.new_from_yaml(yaml,nil)
-    a.get_relative_coords.should == [32,34,132,54]
+    a.get_relative_coords_of_timestamp_window.should == [32,34,132,54]
   end
 
   it "should be able to dump images it uses" do

data/todo.upconvert

@@ -1,6 +1,8 @@
+== dvd ==
+
 compare with powerdvd/ffdshow
 
-compare various computers/monitors...
+compare (DVD) various computers/monitors...
 
 experiment with 2x or not with various people...
   also should I change screen resolution down to 800x600 then double upconvert? better?
@@ -9,34 +11,43 @@ lanczos 10? is filter length 4 better? huh? what?
 
 hqdn3d settings?
 
-upconvert netflix instant yes!
-
 do I need double tapping? http://archive2.avsforum.com/avs-vb/showthread.php?s=&postid=4760581#post4760581
 
-my own Dshow input filter, which also has a "command line" way of configuring it, for ease of use.
-  could "just" use the push source + mplayer maybe [?]
-  would be nice to retrofit it with real "video capture source" to see if it works well with VLC or not...
-  assume it would similarly fail LOL.  I think what you need is either sleeps or...or...IAmPushSource I guess.
-  
-It probably needs to send out input "only if it's changed" I'm thinkin..." 
-
 === netflix/OS screen capture ===
 
-  update the OS README file
-    warn on aero (dual monitor?)
-    troubleshooting: tell them to use the BitTest, reverse should be at least 200 fps I guess...
   make it able to grab from a window, and work when dragged too...
   can I make it look awesome?
+  tell mplayer how to fix directx :)
+  
   ==== some day ====
-  more precise timing...why not?
-  can I live with aero wasn't bitblt getting like 800fps *with* aero?
-  threading
-  shearing
-  perfect looks LOL
-  make really low q stuff like youtube 360 look good
+    shearing
+    perfect looks of absolutely everything upconverted LOL
+    # TODO cut off all black edges too...why not, eh? mplayer has crop detect...
+    make really low q stuff like youtube less than even 360 look good
+    # TODO can align better youtube
+    better benchmarker (windows vs. desktop, just show reverse)
+
+== OS dshow screen tracker ==
+
+ It probably needs to send out input "only if it's changed" I'm thinkin..." for my purposes anyway...
+ VLC compatible'ify it..
+ can limit it to only 5 fps [?]
+  @ avisynth wiki: max fps
+  is ffplay on avisynth piece of crud compared to the other? vs. mplayer? why only like 10 fps? what the...
+ 
+ jruby "drag to select"
+
+ === some day ===
+    bounty multi-thread scaling, iff it seems helpful-er for quad core.
+    threading the input [?] (a bit complicated because of the "only if it's changed" mantra)
+    can I live with aero wasn't bitblt getting like 800fps *with* aero?
+    more efficient by skipping an extra copy (we're already pretty fast though...)
   
 == never ==
 
 add another sharpen filter?
 
 add a VLC version?
+
+
+prop: http://ubuntuforums.org/showthread.php?t=804537 didn't I have another list somewhere... ?

data/upconvert_netflix/latest2/go_no_upscaling.bat

@@ -0,0 +1 @@
+mplayer -nocache -vo direct3d   upconvert_from_screen_me2.avs

data/upconvert_netflix/latest2/go_upscaling.bat

@@ -0,0 +1,12 @@
+mplayer -nocache -geometry 70%x70% -sws 9 -ssf ls=25.0 -ssf cs=7.0 -vf hqdn3d=7:7:7:7,scale=1680:-10:0:0:3  upconvert_from_screen_me2.avs
+
+@rem  hqdn3d[=luma_spatial:chroma_spatial:luma_tmp:chroma_tmp]
+
+
+
+
+@rem 0:1:4:4 for DVD LOL
+@rem pp=hb:y/vb:y,
+
+
+@rem mplayer autoq=100 -nocache -geometry 50%x40% -sws 9 -ssf ls=75.0 -ssf cs=7.0 -vf nr=1000,scale=1680:-10:0:0:4  upconvert_from_screen_me2.avs

data/upconvert_netflix/latest2/setup_capture_coords.rb

@@ -0,0 +1,27 @@
+require 'rubygems'
+gem 'ffi'
+require 'ffi'
+begin
+  require 'sane'
+rescue LoadError
+  require 'rubygems'
+  require 'sane' # LODO
+end
+require_relative '../../lib/screen_tracker.rb'
+require_relative './setup_directshow_filter_params'
+
+player_description = "..\\..\\zamples\\players\\youtube\\normal_in_youtube.com.chrome.txt" # right path...
+screen_tracker = ScreenTracker.new_from_yaml File.binread(player_description), nil
+p screen_tracker.get_hwnd_loop_forever
+p screen_tracker.get_coords_of_window_on_display
+x,y,x2,y2 = screen_tracker.get_coords_of_window_on_display
+
+# numbers are all right, except, for youtube "within a user window", when the y2 is too high, and includes the red at the bottom 
+y2 -= 50
+setter = SetupDirectshowFilterParams.new
+setter.set_single_setting 'height', y2 - y
+setter.set_single_setting 'width', x2 - x
+setter.set_single_setting 'start_x', x
+setter.set_single_setting 'start_y', y
+p 'set it to', x, y, x2, y2, 'width', x2-x, 'height', y2-y
+screen_tracker.dump_bmps

data/upconvert_netflix/latest2/setup_directshow_filter_params.rb

@@ -0,0 +1,29 @@
+# taken from https://github.com/rdp/open-source-directshow-screen-capture-filter/tree/master/configuration_setup_utility
+
+class SetupDirectshowFilterParams
+  
+  Settings = ['height', 'width', 'start_x', 'start_y']
+ 
+  def initialize
+    require 'win32/registry'
+    @screen_reg = Win32::Registry::HKEY_CURRENT_USER.create "Software\\os_screen_capture" # LODO .keys fails?
+  end
+  
+  def set_single_setting name, value
+    raise unless Settings.include?(name)
+    raise unless value.is_a? Fixnum
+#    raise value.to_s if value < 0
+    @screen_reg.write(name, Win32::Registry::REG_DWORD, value.to_i)
+  end
+  
+  # can be nil if not set...
+  def read_single_setting name
+    @screen_reg[name]
+  end
+  
+  def teardown
+    @screen_reg.close
+    @screen_reg = nil
+  end
+  
+end

data/upconvert_netflix/latest2/upconvert_from_screen_me2.avs

@@ -0,0 +1,19 @@
+# from http://avisynth.org/mediawiki/Enhancing_dvd_videos
+
+Video = DirectShowSource("push2.GRF", fps=35, audio=False, framecount=1000000) # fps appears to be a "max" fps
+Return Video
+
+# 
+# these are the size of your monitor that the output is displayed on.  Unless it lags too much, then try experimenting with smaller values
+# Video = ConvertToYUY2 (Video) 
+# screen_width = 1024 # CHANGE THIS TODO propagate it...
+# screen_height = 768 # CHANGE THIS
+# 
+# # note that you can get even better looking images by say, upscaling to 2x your current screen resolution, by uncommenting the following two lines
+# screen_width = screen_width*2
+# screen_height = screen_height*2
+# 
+# Video = Lanczos4Resize (Video, screen_width, screen_height) # said to be a good upsampler...hmm...
+# 
+# Video = Sharpen (Video, 0.78) # Helps sharpen smoothness enlarging does. 0.78 = (1.25*(1024/720))-1
+# Return Video

data/zamples/edit_decision_lists/dvds/bambi.txt

@@ -1,13 +1,10 @@
 # comments can go after a # on any line, for example this one.
 
 "mutes" => [
-  # example line, uncomment the leading "#" to make it active
-  # "0:00:01.0", "0:00:02.0", "profanity", "da..", 
+  # it's clean!
 ],
 
 "blank_outs" => [
-  # example line, uncomment the leading "#" to make it active
-  # "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
 ],
 
 "name" => "Bambi",

data/zamples/edit_decision_lists/dvds/edls_being_edited/test_delete_list_for_experimenting_with.txt

@@ -3,8 +3,8 @@
 ],
 
 "blank_outs" => [
-  "00:02:00.0" , "00:02:10", "blanked out demo section",
+  "00:02:00.0" , "00:02:10", "blank out demo",
 ],
 
-"name" => "test delete list",
+"name" => "test delete list for demos/inventionzy",
 

data/zamples/edit_decision_lists/dvds/{edls_being_edited/flight_of_the_navigator.txt → flight_of_the_navigator.txt}

@@ -31,4 +31,4 @@
 "dvd_title_track" => "1",
 # "not edited out stuff" => "some violence",
 # "closing thoughts" => "still...",
-"mplayer_dvd_splits" => [], 
+"mplayer_dvd_splits" => [], 

data/zamples/edit_decision_lists/dvds/if_a_man_answers.txt

@@ -0,0 +1,43 @@
+# comments can go after a # on any line, for example this one.
+"name" => "if a man answers",
+
+"mutes" => [
+
+"00:15:02.167", "00:15:04.692", "profanity", "deity", "mon [deity]",
+# got weird overlapping subtitles in this one...
+#"0:35:54.318" , "0:35:59.515", "profanity", "goodness", "Maman thank [goodness] for you",
+#"0:35:57.588" , "0:35:59.613", "profanity", "goodness", "Thank [goodness] for love",
+"0:35:54.318" , "0:35:59.615", "profanity", "goodness", "Maman thank [goodness] for you",
+"1:35:39.834" , "1:35:43.326", "profanity", "he..", "A little [he..] to make those two devils feel at home",
+
+# put back this once blank outs are more precise
+# "0:03:17.630" , "0:03:23.500", "profanity", "sex", "In the beglnnlng Father consldered Me Tarzan you Jane an adequate [sex] educatlon",
+"0:05:50.249" , "0:05:54.743", "profanity", "make love", "And maman says that the only thing a man would rather do than [make love] is talk about himself",
+"0:08:01.714" , "0:08:05.707", "profanity", "make love", "Chuckles So they won't [make love] to me all the time",
+"0:24:46.017" , "0:24:50.579", "profanity", "sex", "Imagine our daughter alone with that seedy poverty stricken [sex] maniac",
+"0:39:27.465" , "0:39:29.933", "profanity", "sex", "and keep an eye on daddy with all those [sex]y models",
+"0:43:15.960" , "0:43:19.293", "profanity", "sex", "and keep an eye on daddy wlth all those [sex]y models",
+"0:46:22.980" , "0:46:27.440", "profanity", "sex", "He just pooh poohed me but I know when one of my own [sex] has known love",
+"0:25:05", "0:25:10", "sex", "mention nude",
+"0:25:18", "0:25:21", "sex", "mention nude",
+ 
+],
+
+"blank_outs" => [
+ # 1:46 2:00
+ # 2:25 2:50
+ # 3:06 3:43
+ # 4:45 5:05
+ "1:46", "5:05", "scantily clad pictures, could be split up more precisely", # TODO
+ "20:58", "21:20", "lingerie putting on",
+ "22:35", "22:43", "lingerie pics",
+],
+
+"volume_name" => "IF_A_MAN_ANSWERS",
+"disk_unique_id" => "270df07b|62294c73",
+"dvd_title_track" => "1",
+"dvd_title_track_length" => "6104.2", # sum length, on the DVD, use the show DVD info button to retrieve it.
+"opensubtitles_number" => "238037",
+# "not edited out stuff" => "some violence left in...",
+"closing thoughts" => "a fun flick. this EDL needs to be double checked a bit still",
+"mplayer_dvd_splits" => [],

metadata

@@ -2,7 +2,7 @@
 name: sensible-cinema
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.25.0
+  version: 0.25.1
 platform: ruby
 authors: 
   - Roger Pack
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 -06:00
+date: 2011-08-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -222,6 +222,7 @@ files:
   - bin/sensible-cinema-cli
   - business_ideas.txt
   - change_log_with_feature_list.txt
+  - conclusions
   - developer_how_to_contribute_to_the_project.txt
   - documentation/DOCUMENTATION_README.TXT
   - documentation/how_to_create_your_own_delete_lists.txt
@@ -255,6 +256,7 @@ files:
   - lib/media_info_parser.rb
   - lib/mencoder_wrapper.rb
   - lib/mouse.rb
+  - lib/mouse_draw.rb
   - lib/mouse_forever.rb
   - lib/mplayer_edl.rb
   - lib/muter.rb
@@ -313,17 +315,22 @@ files:
   - todo.subtitle
   - todo.upconvert
   - upconvert.bat
-  - upconvert_netflix/HOW_TO_USE.txt
-  - upconvert_netflix/latest_now_possibly_oudated/push2.GRF
-  - upconvert_netflix/latest_now_possibly_oudated/upconvert_from_screen_me2.avs
-  - upconvert_netflix/position_window.png
-  - upconvert_netflix/push_source_desktop.GRF
-  - upconvert_netflix/upconvert_from_screen.avs
-  - upconvert_netflix/upconvert_from_screen_me.avs
-  - upconvert_netflix/upconvert_from_screen_me2.avs
-  - upconvert_netflix/upconvert_from_screen_me_push_source.avs
-  - upconvert_netflix/uscreen.GRF
-  - upconvert_netflix/uscreen_me.GRF
+  - upconvert_netflix/latest2/go_no_upscaling.bat
+  - upconvert_netflix/latest2/go_upscaling.bat
+  - upconvert_netflix/latest2/push2.GRF
+  - upconvert_netflix/latest2/setup_capture_coords.rb
+  - upconvert_netflix/latest2/setup_directshow_filter_params.rb
+  - upconvert_netflix/latest2/upconvert_from_screen_me2.avs
+  - upconvert_netflix/old/latest_now_possibly_oudated/push2.GRF
+  - upconvert_netflix/old/latest_now_possibly_oudated/upconvert_from_screen_me2.avs
+  - upconvert_netflix/old/position_window.png
+  - upconvert_netflix/old/push_source_desktop.GRF
+  - upconvert_netflix/old/upconvert_from_screen.avs
+  - upconvert_netflix/old/upconvert_from_screen_me.avs
+  - upconvert_netflix/old/upconvert_from_screen_me2.avs
+  - upconvert_netflix/old/upconvert_from_screen_me_push_source.avs
+  - upconvert_netflix/old/uscreen.GRF
+  - upconvert_netflix/old/uscreen_me.GRF
   - vendor/jruby-complete-1.6.2.jar
   - vendor/mac_dvdid/bin/dvdid
   - vendor/mac_dvdid/include/dvdid/dvdid.h
@@ -348,13 +355,13 @@ files:
   - zamples/edit_decision_lists/dvds/cool runnings.txt
   - zamples/edit_decision_lists/dvds/edls_being_edited/court_jester.txt
   - zamples/edit_decision_lists/dvds/edls_being_edited/edl_for_unit_tests.txt
-  - zamples/edit_decision_lists/dvds/edls_being_edited/flight_of_the_navigator.txt
-  - zamples/edit_decision_lists/dvds/edls_being_edited/other_side_of_heaven.txt
   - zamples/edit_decision_lists/dvds/edls_being_edited/test_delete_list_for_experimenting_with.txt
+  - zamples/edit_decision_lists/dvds/flight_of_the_navigator.txt
   - zamples/edit_decision_lists/dvds/happiest baby on the block.txt
   - zamples/edit_decision_lists/dvds/harry_potter_3_prisoner_of_azkaban.txt
   - zamples/edit_decision_lists/dvds/hitchhiker's_guide_to_the_galaxy.txt
   - zamples/edit_decision_lists/dvds/how_to_train_your_dragon.txt
+  - zamples/edit_decision_lists/dvds/if_a_man_answers.txt
   - zamples/edit_decision_lists/dvds/iq.txt
   - zamples/edit_decision_lists/dvds/kung_fu_panda_1.txt
   - zamples/edit_decision_lists/dvds/legend_of_the_guardians_the_owls_of_gahoole.txt

data/upconvert_netflix/HOW_TO_USE.txt

@@ -1,37 +0,0 @@
-To use this (upscaling from your own computer):
-
-Steps:
-
-download/install uscreencapture: http://www.umediaserver.net/umediaserver/download.html
-
-download+install "windows sdk" http://msdn.microsoft.com/en-us/windows/bb980924 (rather big one here :) )
-
-download virtualdub: http://www.virtualdub.org/download.html
-
-Now start your "subject" to upconvert (ex: hulu, or netflix instant).  
-You can pause it if desired.  Don't fullscreen it.
-You'll want to leave it on its smallest "window" possible, that still has the most detail.
-So basically don't let your "subject" player do any stretching, you want to leave all of that for 
-this program to do.
-
-Next you'll need dual monitor, ex: laptop screen plus the VGA out on the laptop.
-Position your "subject" movie so that it is flush in the top right of either monitor.
-See the file "position_window.png" for an demo. Installing NiftyWindows then 
-"right mouse button+drag" can help you reposition it just right.
-
-Now in virtualdub, open the file upconvert_from_screen.avs.
-
-Click the "play" bottom left button.
-See if it is capturing the right monitor, how much of the video it is capturing, if any.
-
-Now search for the program "graphedt.exe", for me, this was in C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin
-
-Run it.  Use it to open the file uscreen.GRF
-Right click on the box "uscreencapture"
-Adjust the various properties so that it captures the video region you desire, by editing values, click "Apply",
-then clicking the "save" icon within graphedit.  Then reopen the file within virtualdub to test your new settings.
-Note the x and y values you use.
-
-Now edit the text upconvert_from_screen.avs and fill in appropriate values.
-
-Now run it in virtualdub again, move virtualdub to your output display, enjoy watching it.

data/zamples/edit_decision_lists/dvds/edls_being_edited/other_side_of_heaven.txt

@@ -1,19 +0,0 @@
-# comments can go after a # on any line, for example this one.
-"name" => "The other side of heaven",
-
-"mutes" => [
-  # an example line, uncomment the leading "#" to make it active
-  # "0:00:01.0", "0:00:02.0", "profanity", "da..", 
-],
-
-"blank_outs" => [
-  # an example line, uncomment the leading "#" to make it active
-  # "00:03:00.0" , "00:04:00.0", "violence", "of some sort",
-],
-
-"volume_name" => "OTHER_SIDE_OF_HEAVEN",
-"disk_unique_id" => "9338ab59|48d01042",
-"dvd_title_track" => "1", # most DVD's use title 1. Not all do, though.  If sensible-cinema plays anything except the main title (for example, it plays a trailer), when you use it, see http://goo.gl/QHLIF to set this right.
-# "not edited out stuff" => "some violence",
-# "closing thoughts" => "still...",
-# "mplayer_dvd_splits" => ["59:59", "1:04:59"], # in mplayer, the DVD timestamp "resets" to zero for some reason, see http://goo.gl/yMfqX to set this value right. Note that [] is valid, if there are no resets.