sensible-cinema 0.24.9 → 0.25.0

data/Rakefile

@@ -157,10 +157,15 @@ task 'gem_release' do
   FileUtils.rm_rf 'pkg'
 end
 
-task 'update wbo' do
+def on_wbo command
+  sys "ssh rdp@ilab1.cs.byu.edu \"ssh wilkboar@rogerdpack.t28.net '#{command}' \""
   
 end
 
+task 'update wbo' do
+  on_wbo 'cd ~/sensible-cinema/source && git pull'
+end
+
 desc ' (releases with clean cache dir, which we need now)'
 task 'full_release' => [:clear_and_copy_vendor_cache, :rebundle_copy_in_dependencies, :create_distro_dir] do # this is :release
   p 'remember to run all the specs first!'
@@ -169,6 +174,7 @@ task 'full_release' => [:clear_and_copy_vendor_cache, :rebundle_copy_in_dependen
   Rake::Task["gem_release"].execute
   Rake::Task["zip"].execute
   Rake::Task["deploy"].execute
+  Rake::Task["update wbo"].execute
   system(c = "cp -r ../cache.bak/* vendor/cache")
   system("rm -rf ../cache.bak")
 end

data/TODO

@@ -1,4 +1,4 @@
-== roadmap [for just tasks, see below though] ==
+== roadmap [for just tasks, see below though] == 
 
   release: cheap/mediumcheap inventionzy
   release: C EDL
@@ -22,6 +22,7 @@
    can handle multiple dvdid's et al
    VLC "insert foreign missing scene" supah easy demo
    overlay section with image (mplayer?)
+  add some "fake" "now pg" "now pg-12" "violence for age y" +- with edits at all even.
 
 == yes do ordered in conjunction with the above probably ==
   release at some point...Oliver? facebook?
@@ -48,6 +49,7 @@
     movie mask wayback machine
   make it load faster! this is cuh-razy! or splash screen! yes!
   netflix quality upconverter
+    want a prototype mplayer upconverter...I guess... 
   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?
@@ -61,15 +63,18 @@
     report XBMC bugs, too.
   all unit tests
   subs: if at beginning of a sub, add extra offset...hmm...why not?
-  say something if the EDL is "blank" :)
+  say something if the EDL is actually "blank" :)
   figure out if an offset of '1s' should also be accomodated for...
     0.3 ... ? huh?
   fix released version to work in mac
+  release capture filter, advertise it :)
+  note "you want to optimize your reverse blitting first... :)"
+    test speed of from DESKTOP versus HWND.
+    can use hwnd.  Somehow automated.
   "--developer" mode
     export JSON command line, note it in the docu, show it in --developer mode, no new bat file for developer mode
   new button "auto-test" a subtitles file for timing :)
   new upconv button: auto-take some snapshots (just to straight mjpeg or jpeg or the what not)
-  auto-update website on release.
   publish a ripped raw big bunny
     update development howto
   @jruby scan court jester is *so* slow...what the...[mac at least...]

data/VERSION

@@ -1 +1 @@
-0.24.9
+0.25.0

data/bin/sensible-cinema

@@ -41,8 +41,10 @@ class String
     downcase
   end
 end
+
 require_relative '../lib/swing_helpers'
 
+# attempt to load on demand...i.e. faster...
 for kls in [:MencoderWrapper, :EdlParser, :MplayerEdl, :PlayAudio, :SubtitleProfanityFinder, :ConvertThirtyFps, :RubyClip, :DriveInfo]
   autoload kls, "./lib/#{kls.to_s.snake_case}"
 end
@@ -198,7 +200,6 @@ module SensibleSwing
     UpConvertKeyExtra = 'upconvert_setting_extra'
     UpConvertEnglish = 'upconvert_english_name'
 
-
     def add_setup_upconvert_buttons
       @none = new_jbutton("reset upconvert options to default (none)")
       @none.tool_tip = "Having no upconvert options is reasonably good, might use directx for scaling, nice for slow cpu's"
@@ -218,7 +219,7 @@ module SensibleSwing
       high_compression = new_jbutton("Change upconvert options for playing back highly compressed video") {
         # -autoq 6 -vf pp [?]
         LocalStorage[UpConvertEnglish] = "high compressed"
-        LocalStorage[UpConvertKey] = "hqdn3d=0:1:4:4,pp=hb:y/vb:y,scale=SCREEN_X:-10:0:0:3" # ordering?
+        LocalStorage[UpConvertKey] = "hqdn3d=0:1:4:4,pp=hb:y/vb:y,scale=SCREEN_X:-10:0:0:3" # pp should be after hqdn3d I think... and hqdn3d should be before scale...
         LocalStorage[UpConvertKeyExtra] = "-sws 9 -ssf ls=75.0 -ssf cs=25.0"
         display_current_upconvert_setting
         # -Processing method: mplayer with accurate deblocking ???
@@ -947,8 +948,8 @@ module SensibleSwing
       puts 'Please confirm license agreement in open window.'
       # cancel button stays the same...
       
-      message ||= "Sensible Cinema requires a separately installed program (#{program}).  You can install this program
-        separately to the vendor/cache directory, or Sensible Cinema can download it for you.
+      message ||= "Sensible Cinema requires a separately installed program (#{program}), not yet installed.
+        You can install this program manually to the vendor/cache subdirectory, or Sensible Cinema can download it for you.
         By clicking accept, below, you are confirming that you have read and agree to be bound by the
         terms of its license (the #{license_name}), located at #{license_url_should_also_be_embedded_by_you_in_message}.  
         Click 'View License' to view it.  If you do not agree to these terms, click 'Cancel'.  You also agree that this is a 
@@ -1009,10 +1010,10 @@ module SensibleSwing
       end
     end
     
-    def check_for_exe windows_loc, unix_name
+    def check_for_exe windows_full_loc, unix_name
       # in windows, that exe *at that location* must exist...
       if OS.windows?
-        File.exist?(windows_loc)
+        File.exist?(windows_full_loc)
       else
         require 'lib/check_installed_mac.rb'
         if !CheckInstalledMac.check_for_installed(unix_name)
@@ -1027,15 +1028,15 @@ module SensibleSwing
       if we_are_in_create_mode        
         if !check_for_exe('vendor/cache/mencoder/mencoder.exe', 'mencoder')
           require_blocking_license_accept_dialog 'mplayer', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: mplayer with mencoder."
-          download_zip_file_and_extract "Mplayer/mencoder (6MB)", "http://downloads.sourceforge.net/project/mplayer-win32/MPlayer%20and%20MEncoder/revision%2033574/MPlayer-rtm-svn-33574.7z", "mencoder"
+          download_zip_file_and_extract "Mplayer/mencoder (6MB)", "http://sourceforge.net/projects/mplayer-win32/files/MPlayer%20and%20MEncoder/revision%2033883/MPlayer-rtm-svn-33883.7z", "mencoder"
         end
       end
 
-      # runtime dependencies, at least today...
+      # runtime dependencies, at least as of today...
       ffmpeg_exe_loc = File.expand_path('vendor/cache/ffmpeg/ffmpeg.exe')
       if !check_for_exe(ffmpeg_exe_loc, 'ffmpeg')
         require_blocking_license_accept_dialog 'ffmpeg', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: ffmpeg."
-        download_zip_file_and_extract "ffmpeg (5MB)", "http://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-git-1929807-win32-shared.7z", "ffmpeg"
+        download_zip_file_and_extract "ffmpeg (5MB)", "http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-git-335bbe4-win32-static.7z", "ffmpeg"
       end
       if OS.mac?
         check_for_exe("mplayer", "mplayer") # mencoder and mplayer are separate for mac... [this checks for mac's mplayerx, too]
@@ -1044,10 +1045,10 @@ module SensibleSwing
         if(path.length == 0)
           # this one has its own installer...
           show_blocking_message_dialog("It appears that you need to install a pre-requisite dependency: MPlayer for Windows (MPUI).
-          Click ok to be directed to its download website, where you can download and install it (recommend: MPUI Full-complete), 
-          then restart sensible cinema.  NB that it takes awhile to install MPUI.  Sorry about that.", 
+          Click ok to be directed to its download website, where you can download and install it (recommend: MPUI....Full-Package.exe), 
+          then restart sensible cinema.  NB that it takes awhile to install.  Sorry about that.", 
           "Lacking dependency", JOptionPane::ERROR_MESSAGE)
-          open_url_to_view_it_non_blocking "http://code.google.com/p/mulder/downloads/detail?name=MPUI.2011-06-09.Full-Package.exe"
+          open_url_to_view_it_non_blocking "http://code.google.com/p/mulder/downloads/list?can=2&q=MPlayer&sort=-uploaded&colspec=Filename%20Summary%20Type%20Uploaded%20Size%20DownloadCount"
           System.exit 0
         end
       end
@@ -1055,8 +1056,7 @@ module SensibleSwing
     
     def open_url_to_view_it_non_blocking url
       if OS.windows?
-        system_non_blocking(c = "start #{url.gsub('&', '^&')}") # LODO would launchy help/work here with the full url?
-        p c
+        system_non_blocking("start #{url.gsub('&', '^&')}") # LODO would launchy help/work here with the full url?
       else
         system_non_blocking "#{OS.open_file_command} \"#{url}\"" # LODO test
       end

data/change_log_with_feature_list.txt

@@ -1,3 +1,14 @@
+== 0.25.0 ==
+
+Created my own directshow screen capture filter to go along with netflix instant upconvert, 
+easier configurable, controllable at all LOL.
+https://rdp:githubrox@github.com/rdp/open-source-directshow-screen-capture-filter.git
+Version bumped some dependencies.
+I can adjust programmatically where the window is "grabbed" from, and also already have
+code in the base to find the correct hwnd, so could theoretically look up its coords and thus
+automatically it adjust to find the right window in (hulu, netflix instant, etc), since
+I already have programmed players for the same.
+
 == 0.24.9 ==
 
 Fix so that mplayer can display subtitles again in advanced mode.  Hopefully only in advanced mode :)

data/spec/notes

@@ -9,6 +9,73 @@ media player classic appears to have no cache.
   works for a demo, long term probably will need my own filter :)
     though for now I could just tell them "ok download graphedit too LOL, run this in virtualdub, position your window up there"
 
+virtualdub seems to get way behind...maybe it doesn't have the "framedrop" options that mplayer does?
+"desktop source" does seem to work well mplayer, though perhaps still a bit jerky...
+do I need to add a sleep in there? 
+  http://www.eggheadcafe.com/microsoft/Win32-DirectX-Video/31543477/csourcestream-fillbuffer--settime.aspx seems to imply that I should...I think.
+What matters is the delta from when the graph started running. http://msdn.microsoft.com/en-us/library/dd377506(v=vs.85).aspx
+
+maybe VLC is just a lot more stingey...hmm...it's because it's the only fella I have actually trying to mix and match audio+video
+
+
+I think I need to set mine to basically sleep until "almost it's time to do this" type of thing...maybe?
+
+It only seems to make sense to me to go "only as fast as x fps" otherwise...you'll be giving them bogus data!  I cannot
+imagine that you can depend on the renderer to "backlog" you to exactly as many fps as you need.
+However, this doesn't explain VLC accepting these in such an awful way LOL.
+Also, maybe implementing IAMLiveSource would help even VLC...maybe...?
+
+It hates my filter! The only one it loves is that other one... <sigh>. Hacky work around it is then...
+
+
+53 fps with "straight" mplayer go_raw
+36.7 at upscale 1280 (1024?) (warmup?)
+31.7 at upscale 1680
+15.0'ish at upscale 3360
+1280 27 fps
+
+*maybe* hulu needs higher hqdn3d
+
+ringing not caused by -ssf ls=75.0 -ssf cs=7.0, yes ringing with filter length 1
+ no ringing if you double the screen res :) LOL
+
+basically 100% cpu at 2x screen res fps or what not...kind of 100%...kind of not...
+  13.3 fps 2048
+  
+1280 16 fps
+
+hqdn3d,scale,hqdn3d = weird streaking stars!
+
+-sws 2 2500 16 fps
+  has striations :(
+  
+-sws 2 2500 hqdn3d after: 6fps, before: 22 fps
+
+-sws 9 hqdn3d,2500 16.5 fps
+  teeny striations
+  
+-sws 9 1024 24.6 fps
+  not many striations...
+  teeny but visible.
+  1280 25 fps
+    not many striations...yet visible indeed...
+  seem to be better at 1024 than 1280...
+  
+flash can be made faster? http://forum.xda-developers.com/archive/index.php/t-1164908.html
+
+it chooses 32 bits every time, even if I'm in 16-bit mode LODO
+
+=== blttest ===
+  one monitor: 160'ish fps capturing at 1680x1050 (no memcpy though!)
+    same with aero on or off
+    
+  dual monitor: 640x480 800fps (no aero) 750fps with aero.
+    however with mplayer it was like 14fps with aero, 53 without, and 55 with single monitor (?)
+    TODO can I get that 800fps somehow? or can I live without it?
+
+  350 fps aero dual monitor work desktop
+  383/700 at times fps non-aero same [?] [just disabling aero auto-made my thing faster LOL]
+
 == phreaky mplayer dvdnav ==
 
 Tangled seemed to "not play without VLC help" at work, but not at home mac where it failed.
@@ -256,6 +323,7 @@ http://www.kdenlive.org/forum/xml-format-and-edls kdenlive supports EDL, apparen
   I could either go with avisynth + MPC (I think)
 
 === upconverting to the huge monitor===
+
  with the black laptop:
    "normal" dvdnav seemed to work all right, slightly jerky at times.
   I think that upconverting to the little monitor used more cpu.
@@ -284,8 +352,6 @@ http://www.kdenlive.org/forum/xml-format-and-edls kdenlive supports EDL, apparen
   
   TODO try various DVD's with 1680 versus 3360...are they all supah clear?
   
-  
-  
  roary, mac:
    1280: fine
    1500: toast speed-wise
@@ -294,6 +360,7 @@ http://www.kdenlive.org/forum/xml-format-and-edls kdenlive supports EDL, apparen
 === various options ===
 
   an avisynth upconvert howto: http://avisynth.org/mediawiki/Enhancing_dvd_videos
+  http://web.archiveorange.com/archive/v/JbcLEih3ZwhZlMuTkxzR says "if you're upscaling [to grow the image] then do denoise before scale"
 
  -vo gl fails on a mac [huh?]
 

data/todo.upconvert

@@ -14,7 +14,27 @@ 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?
+  ==== 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
+  
 == never ==
 
 add another sharpen filter?

data/upconvert_netflix/latest_now_possibly_oudated/upconvert_from_screen_me2.avs

@@ -0,0 +1,18 @@
+# from http://avisynth.org/mediawiki/Enhancing_dvd_videos
+
+Video = DirectShowSource("push2.GRF", fps=160, audio=False, framecount=1000000) # fps appears to be a "max" fps [?] does it drop otherwise? 60 -> 55...
+Return Video
+# Video = ConvertToYUY2 (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
+# 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/upconvert_netflix/upconvert_from_screen_me.avs

@@ -0,0 +1,21 @@
+# from http://avisynth.org/mediawiki/Enhancing_dvd_videos
+
+Video = DirectShowSource("uscreen_me.GRF", fps=24, audio=False, framecount=1000000)
+Video = ConvertToYUY2 (Video)
+
+# get these from examining the window size or through trial and error.
+subject_x = 880
+subject_y = 440
+
+# these are the size of your monitor that the output is displayed on.
+screen_width = 1680
+screen_height = 1050
+
+# note that you can get even better looking images by say, upscaling to 2x your screen resolution
+# 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/upconvert_netflix/upconvert_from_screen_me2.avs

@@ -0,0 +1,3 @@
+# from http://avisynth.org/mediawiki/Enhancing_dvd_videos
+
+DirectShowSource("uscreen_me2.GRF", fps=30, audio=False, framecount=1000000)

data/upconvert_netflix/upconvert_from_screen_me_push_source.avs

@@ -0,0 +1,3 @@
+# from http://avisynth.org/mediawiki/Enhancing_dvd_videos
+
+DirectShowSource("push_source_desktop.GRF", fps=5, audio=False, framecount=1000000)

metadata

@@ -2,7 +2,7 @@
 name: sensible-cinema
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.24.9
+  version: 0.25.0
 platform: ruby
 authors: 
   - Roger Pack
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 -06:00
+date: 2011-08-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -314,8 +314,16 @@ files:
   - 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
   - vendor/jruby-complete-1.6.2.jar
   - vendor/mac_dvdid/bin/dvdid
   - vendor/mac_dvdid/include/dvdid/dvdid.h