sensible-cinema 0.26.0 → 0.26.1

data/lib/gui/sensible-cinema-side-by-side.rb

@@ -0,0 +1,27 @@
+
+module SensibleSwing
+  
+  class MainWindow < JFrame
+
+    SideBySide = 'side_by_side' # 'xbmc' or 'smplayer'
+    
+    def select_new_sxs_style
+      answer = show_select_buttons_prompt 'Select EDL file style creation for this program', :yes => 'Smplayer style', :no => 'XBMC style'
+      if answer == :yes
+        LocalStorage[SideBySide] = 'smplayer'
+      elsif answer == :no
+        LocalStorage[SideBySide] = 'xbmc'
+      else
+        show_blocking_message_dialog 'please choose one--smplayer if you don\'t know'
+        select_new_sxs_style
+      end
+        
+    end
+
+#      new_jbutton("Select side by side EDL file style (smplayer vs. XBMC)") do
+#        select_new_sxs_style # TODO
+#      end
+
+
+  end
+end

data/lib/gui/sensible-cinema-upconvert.rb

@@ -0,0 +1,254 @@
+
+module SensibleSwing
+  
+  class MainWindow
+   
+    def add_play_upconvert_buttons
+    
+      @watch_file_upconvert = new_jbutton( "Watch a movie file upconverted (unedited)") do
+        popup = warn_if_no_upconvert_options_currently_selected
+        filename_mpg = new_existing_file_selector_and_select_file( "pick movie file (like moviename.mpg)")
+        thread = play_mplayer_edl_non_blocking [filename_mpg, nil]
+        when_thread_done(thread) { popup.dispose }
+      end
+      @watch_file_upconvert.tool_tip= "This plays back a movie file, like moviefile.mpg, or moviename.vob using your current upconverter settings.\nTo playback a file edited upconverted, set upconvert options here first, then run them using sensible cinema main--it will automatically use your new upconverting options.\n" # LODO
+      
+      @watch_dvd_upconvert = new_jbutton( "Watch a DVD upconverted (unedited)") do
+        popup = warn_if_no_upconvert_options_currently_selected
+        thread = play_dvd_smplayer_unedited false, false, false
+        when_thread_done(thread) { popup.dispose }
+      end
+      @watch_dvd_upconvert.tool_tip = "Plays back the currently inserted DVD, using your current upconverter settings.\nIf it fails (dies immediately, blank screen, etc.), try setting upconvert options to a smaller screen resolution multiple.\nOr try playing the DVD with VLC first, then it might work.\nTo playback a DVD edited upconverted, set upconvert options here first, then run them using sensible cinema main--it will automatically use your new upconverting options."
+      
+      add_text_line ''
+      @upconv_line = add_text_line ''
+      change_upconvert_line_to_current
+      
+      add_change_upconvert_options_button
+      if !upconvert_set_to_anything?
+        show_blocking_message_dialog 'please configure your upconvert settings first'
+        @show_upconvert_options.simulate_click # make them choose one
+      end
+      add_text_line ''
+      
+    end
+    
+    def upconvert_set_to_anything?
+      LocalStorage[UpConvertEnglish].present?
+    end
+    
+    LocalStorage.set_default('screen_multiples', 2.0)
+
+    def add_change_upconvert_options_button
+      @show_upconvert_options = new_jbutton("Change/Test Playback Upconversion Quality Options") do
+        upconvert_window = new_child_window
+        upconvert_window.add_change_upconvert_buttons
+      end
+      @show_upconvert_options.tool_tip= "Allows you to set your upconvert options.\nUpconverting attempts to playback your movie with higher quality on high resolution monitors."
+    end
+    
+    
+    def warn_if_no_upconvert_options_currently_selected
+      if !upconvert_set_to_anything?
+        show_non_blocking_message_dialog "Warning: upconvert options have not been set yet--set upconvert options first, if desired."
+      else
+        JFrame.new # something it can call dispose on :P
+      end
+    end
+    
+    def change_upconvert_line_to_current
+      current = get_current_upconvert_as_phrase
+      if @upconv_line
+        @upconv_line.set_text current
+      end
+      if @parent && @parent.upconv_line
+        @parent.upconv_line.set_text current
+      end # LODO I think the child also wants a status line..
+    end
+    
+    UpConvertKey = 'upconvert_setting'
+    UpConvertKeyExtra = 'upconvert_setting_extra'
+    UpConvertEnglish = 'upconvert_english_name'
+    ScreenMultipleFactor = 'screen_multiples'
+
+    def add_change_upconvert_buttons
+      raise 'should have already been set for us' unless LocalStorage[ScreenMultipleFactor]
+      @medium_dvd = new_jbutton("Set upconvert options to DVD-style video") {
+        luma_spatial = 0
+        chroma_spatial = 1
+        luma_tmp = 4
+        chroma_tmp = 4
+        LocalStorage[UpConvertKey] = "hqdn3d=%s:%s:%s:%s,scale=SCREEN_X:-10:0:0:2" % [luma_spatial, chroma_spatial, luma_tmp, chroma_tmp]
+        # hqdn3d[=luma_spatial:chroma_spatial:luma_tmp:chroma_tmp]
+        LocalStorage[UpConvertKeyExtra] = "-sws 9 -ssf ls=75.0 -ssf cs=7.0"
+        LocalStorage[UpConvertEnglish] = "DVD"
+        display_current_upconvert_setting_and_close_window
+      }
+      high_compression = new_jbutton("Set upconvert options to high compressed video file playback") {
+        # -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" # 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_and_close_window
+        # -Processing method: mplayer with accurate deblocking ???
+      }
+      new_jbutton("Set upconvert options to experimental style playback") {
+        LocalStorage[UpConvertKey] = "scale" # hqdn3d=7:7:5,scale=SCREEN_X:-10:0:0:10"
+        LocalStorage[UpConvertKeyExtra] = "-sws 9 -ssf ls=100.0 -ssf cs=75.0"
+        LocalStorage[UpConvertEnglish] = "experimental"
+        display_current_upconvert_setting_and_close_window
+      }
+      
+      # TODO tooltip from docu here +- this into tooltip
+      # TODO "click here" link for more docu [?]
+      add_text_line "Multiple factor screen widths"
+      add_text_line "   (higher is better, but uses more cpu, 2x is good for high-end)." 
+      add_text_line "   If mplayer just dies or displays only a black or white screen then lower this setting."
+      slider = JSlider.new
+      slider.setBorder(BorderFactory.createTitledBorder("Screen resolution multiple"));
+  
+      # I want tick for 1x, 1.5x, 2x, 2.5x, 3x
+      # so let's do marker values of 10 -> 30, since it requires integers...
+      
+      labelTable = java.util.Hashtable.new
+      i = java.lang.Integer
+      l = JLabel
+      
+      # allow for 0.75 too, if you have a large monitor, slower cpu...
+      local_minimum = (720.0/get_current_max_width_resolution)*100 # allows 1024 to use upscaling to 860, but we warn when they do this
+      label_minimum = nil
+      (0..300).step(25) do |n|
+        if n > local_minimum
+          label_minimum ||= n
+          if (n % 100 == 0)
+            labelTable.put(i.new(n), l.new("#{n/100}x")) # 1x
+          elsif n == label_minimum # just for the bottom label, rest too chatty
+            labelTable.put(i.new(n), l.new("#{n/100.0}x")) # 1.5x
+          end
+        end
+      end
+      slider.setLabelTable( labelTable )
+  
+      slider.maximum=300
+      slider.minimum=label_minimum
+      slider.setMajorTickSpacing(100) 
+      slider.setMinorTickSpacing(25) 
+      slider.setPaintTicks(true)
+      slider.setPaintLabels(true)    
+      slider.snap_to_ticks=true
+      
+      slider.set_value LocalStorage[ScreenMultipleFactor] * 100
+      
+      slider.add_change_listener { |event|
+        if !slider.value_is_adjusting
+          # they released their hold on it...
+          old_value = LocalStorage[ScreenMultipleFactor]
+          new_value = slider.value/100.0
+          LocalStorage[ScreenMultipleFactor] = new_value
+          if new_value != old_value
+            if slider.value == label_minimum
+              show_blocking_message_dialog "Setting it too low like that might make it not do much upconverting (DVD's, are 720px, you're setting it to upconvert to #{new_value * get_current_max_width_resolution})"
+            end
+            display_current_upconvert_setting_and_close_window
+          end
+        end
+      }
+      slider.set_bounds(44, @starting_button_y, @button_width, 66)
+      2.times {increment_button_location}
+      @panel.add(slider)
+      
+      increment_button_location
+      
+      @none = new_jbutton("Reset upconvert options to none (no upconversion)")
+      @none.tool_tip = "Having no upconvert options is reasonably good, might use directx for scaling, nice for slow cpu's"
+      @none.on_clicked {
+        LocalStorage[UpConvertKey] = nil
+        LocalStorage[UpConvertKeyExtra] = nil
+        LocalStorage[UpConvertEnglish] = nil
+        display_current_upconvert_setting_and_close_window
+      }
+      
+      @generate_images = new_jbutton("Test current configuration by writing some images from playing a video file") do
+        popup = warn_if_no_upconvert_options_currently_selected
+        filename_mpg = new_existing_file_selector_and_select_file( "pick movie file (like moviename.mpg)")
+        
+        output_dir = get_same_drive_friendly_clean_temp_dir 'temp_upscaled_video_out'
+        output_command = '-ss 2:44 -frames 300 -vo png:outdir="' + File.strip_drive_windows(output_dir) + '"'
+        output_command += " -noframedrop" # don't want them to skip frames on cpu's without enough power to keep up
+        thread = play_mplayer_edl_non_blocking [filename_mpg, nil], [output_command], true
+        when_thread_done(thread) { popup.dispose; show_in_explorer(output_dir) }
+      end
+      @generate_images.tool_tip = "This creates a folder with images upconverted from some DVD or file, so you can tweak settings and compare." # TODO more tooltips
+
+      @generate_screen_cast = new_jbutton("Test current configuration by watching video file and recording screen") do
+        popup = warn_if_no_upconvert_options_currently_selected
+        filename_mpg = new_existing_file_selector_and_select_file( "pick movie file (like moviename.mpg)")
+        output_dir = get_same_drive_friendly_clean_temp_dir 'temp_screencast_dir'
+        thread1 = play_mplayer_edl_non_blocking [filename_mpg, nil], [" -ss 2:44 -endpos 11"]
+        # screen capture for 10s
+        fps_to_grab = 5
+        thread2 = Thread.new {  c = %!ffmpeg -f dshow -i video="screen-capture-recorder" -r #{fps_to_grab} -vframes #{fps_to_grab*10} -y #{File.strip_drive_windows(output_dir)}/%d.png!; system_blocking c }
+        thread2.join
+        show_blocking_message_dialog "ffmpeg done, close mplayer now!"
+        thread1.join
+        popup.dispose # just in case :P
+        show_in_explorer(output_dir)
+      end
+
+
+    end
+    
+    def get_same_drive_friendly_clean_temp_dir suffix
+        output_dir = Dir.tmpdir
+        if File.get_root_dir(output_dir) != File.get_root_dir(Dir.pwd) # you are hosed!
+          output_dir = File.get_root_dir(Dir.pwd) # we'll raise if it's not writable...
+        end
+        output_dir = output_dir + '/' + suffix
+        FileUtils.rm_rf output_dir
+        Dir.mkdir output_dir
+        output_dir
+    end
+    
+    def display_current_upconvert_setting_and_close_window
+      change_upconvert_line_to_current
+      show_blocking_message_dialog get_current_upconvert_as_phrase
+      self.dispose
+    end
+    
+    def get_current_upconvert_as_phrase
+      settings = LocalStorage[UpConvertEnglish]
+      out = "Upconvert options are now #{  settings ? "set to #{settings} style" : "NOT SET"}"
+      if settings
+        multiple = LocalStorage[ScreenMultipleFactor]
+        out += " (screen multiplier #{get_current_max_width_resolution}*#{multiple} = #{(multiple * get_current_max_width_resolution).to_i}px)."
+      end
+      out
+    end
+    
+    def get_current_max_width_resolution
+      # choose width of widest monitor (why would they display it on the other, right?)
+      java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment.getScreenDevices.map{|gd| gd.display_mode.width}.max.to_i
+    end
+    
+    def get_upconvert_vf_settings
+      template = LocalStorage[UpConvertKey]
+      if template
+        screen_multiple = LocalStorage[ScreenMultipleFactor]
+        upc = template.gsub('SCREEN_X', (get_current_max_width_resolution*screen_multiple).to_i.to_s) # has to be an integer...
+        upc = 'pullup,softskip,' + upc
+        p 'using upconvert settings: ' + upc
+        upc
+      else
+        p 'not using any specific upconversion-ing'
+        # pullup, softskip -- might slow things down too much for slow cpus
+      end
+    end
+
+    def get_upconvert_secondary_settings
+      LocalStorage[UpConvertKeyExtra]
+    end
+
+ 
+  end
+end
+    

data/lib/screen_tracker.rb

@@ -197,6 +197,7 @@ class ScreenTracker
             @previously_displayed_warning = true
             # also reget window hwnd, just in case that's the problem...(can be with VLC moving from title to title)
             get_hwnd_loop_forever
+            # LODO loop through all available player descriptions to find the right one, or a changed different new one, et al
           end
           time_since_last_screen_change = Time.now
         end

data/spec/edl_parser.spec.rb

@@ -42,6 +42,12 @@ describe EdlParser do
    E.parse_string(string, nil).should == expected
   end
   
+  it "should disallow full digits" do
+    proc {E.parse_string(%!"mutes" => ["1234", "1235", "profanity", "yo"]!, nil) }.should raise_exception SyntaxError    
+    proc {E.parse_string(%!"mutes" => ["0.0", "1.1", "profanity", "yo"]!, nil) }.should_not raise_exception    
+    proc {E.parse_string(%!"mutes" => ["0.0", "1.1", "profanity", "yo", "1234", "1235", "bad entry"]!, nil) }.should raise_exception SyntaxError    
+  end
+  
   it "should extract digits well" do
     out = ["00:00:01.1", "00:00:01"]
     EdlParser.extract_entry!(out).should == ["00:00:01.1", "00:00:01"]

data/spec/notes

@@ -1,12 +1,74 @@
 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>
+== netflix instant vs srt ==
 
+00:02:34,427 --> 00:02:36,361
+l'm sor
+
+init seemed 2:33 or end of 2:32
+
+1.2s off init?
+
+sire, seemed right on
+
+
+
+01:00:13,950 --> 01:00:17,716
+General lroh, l'm glad you could
+accept my
+
+seemed end of 12
+
+this one (netflix instant) seemed to match up really well with the subtitles just about 1.5s "late" the whole time...
+
+== compare upscaling settings ==
+
+regular pullup not very good :P
+just with hqdn3d, same low res, seemed not very good
+I seem to slightly prefer DVD to directx upscaling (at least).  More detail.
+  more hair detail, wood has more detail
+    
+with qt viewer:
+
+  with 0001:
+    1x and 2x seem same
+      like identical
+  with 26
+    seem identical
+  99: 
+    2x seems to barely pull out more detail out of the metal...interesting...
+    
+with mplayer to view the jpg (direct3d)
+  01:
+    wow looks igualzinho weird
+  26: 
+    igualzinho
+  99:
+    igualzinho (too dark to tell...kind of weird there) -- ffmpeg bug?
+    
+  more hair, -ss 2:44 -frames 300
+    I guess the same way, -> jpg, compare the jpgs in quicktime
+      then tweak it be able to screen scrape it to compare [?]
+  
+    2x takes *way* way longer...
+    
+    00:
+      if there's a difference, I can't easily see it in picture viewer
+    75:
+      1x has better "lines" than raw
+      1x igual 2x (picture viewer)
+    150:
+      1x looks like normal LOL
+      1x igual 2x hair
+    225:
+      1x looks better than normal (fruit)
+      2x igual 1x
+    299:
+      raw looks BETTER wood-wise hmm...
+      
+    really need a better way to record maybe?
+    make mplayer go really slow, and have ffmpeg record it from screen [?] -> jpg and hopefully it will catch everything...
+      
 == upconvert netflix ==
 
 === mplayer avisynth ===
@@ -16,7 +78,7 @@ desktop filter:
     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...
+    actually mplayer seems to be a good exact duplicate...maybe resizing hurt it though?
     
 === other ===
 
@@ -377,6 +439,14 @@ http://www.kdenlive.org/forum/xml-format-and-edls kdenlive supports EDL, apparen
 
 === various options ===
 
+ avisynth Defaults: HQDN3D(ls=4.0, cs=3.0, lt=6.0, ct=4.5) 
+ mplayer
+   hqdn3d[=luma_spatial:chroma_spatial:luma_tmp:chroma_tmp]
+   mplayer defaults were: hqdn3d=4:3:6 hqdn3d[=luma:chroma:time]
+
+
+   -vf hqdn3d=2:1:2 ("conservative" from http://www.mplayerhq.hu/DOCS/HTML/en/menc-feat-dvd-mpeg4.html)
+
   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"
 
@@ -396,7 +466,7 @@ http://www.kdenlive.org/forum/xml-format-and-edls kdenlive supports EDL, apparen
       3x resolution [!]
       "Luma Sharpen to 1.00-1.50 and Chroma Sharpen to 0.00. Enable Accurate Rounding."
          I don't know if accurate rounding is possible with mplayer+lanczos tho...
-      dn3dhq put Chroma to 1.00, Time to 4.00 and Luma to 0.00.
+      hqdn3d put Chroma to 1.00, Time to 4.00 and Luma to 0.00.
         hqdn3d[=luma_spatial:chroma_spatial:luma_tmp:chroma_tmp] how?
       deinterlacing [I don't think this matters, really I don't]
     xvid:
@@ -1357,7 +1427,7 @@ are all windows GUI wrapper players internally inconsistent, except maybe VLC wh
   VLC reading dvdoutmplayer.mpg, handbrake m4v:
       1:00:00 accurate wa[a]s lost
 
-=== All DVD playing below this ===
+=== All DVD players' comparison below this ===
 
   Mac's DVD Player total:
     1:53:04 (almost 5 I think) [barely shows 5 at the beginning]
@@ -1453,11 +1523,14 @@ VLC
  30: something about nineveh makes you feel sad [I dont' really ] want to talk about it [?]
  45: fire 3, I'm coming traveling buddy [flash back to them] (in wmp this is at 44:27) 
 
-smplayer, mplayer 30369
+smplayer, mplayer r30369
  15: wash your hands [before] you eat
  30: a man that .. can count on to deliver his message yes [well]
  45: big smile from after duck
 
+mplayer
+ 45: middle of squeak of duck
+
 hulu
  15: wash your hands [before] you eat
  30: a man that .. can count on to deliver his message yes [well]
@@ -1480,26 +1553,44 @@ wmp windows 7: [wmp feels slightly unstable timing-wise]
   
 LODO jonah blu ray timings
 
-netflix jonah
+netflix instant jonah
 
  15: be a friend say your prayers, heavens knows a heart that cares, taht is why I've come to share a mes[sage] from the Lord (at times it's [mes]sage, once it was [from])
-     chrome at work: a[]message, a messa[ge] from the Lord, message [] from the Lord, [share] a message from the Lord, a message[] from the Lord
-     IE at work: [fr]om the Lord, a [mes]sage from the Lord, [fr]om the Lord.
+     chrome at work: 
+        a[]message, 
+        a messa[ge] from the Lord
+        message [] from the Lord
+        [share] a message from the Lord
+        a message[] from the Lord
+        me[ss]age from the Lord [HD]
+     IE at work: 
+       [fr]om the Lord
+        a [mes]sage from the Lord
+        [fr]om the Lord.
+        me[ss]age from the Lord [HD]
+        
+ conclusion: browser doesn't matter, at lesat for HD streams, at work
+        
  30: like two humps on a camel, you always sway the same way, humor runs in my family, my uncle was a [big] star
-     IE at work:  humor runs very deep in my family[] my uncle was, my uncle was[] a big star, my [uncle] was a big star
+     IE at work: humor runs very deep in my family[] my uncle was, my uncle was[] a big star, my [uncle] was a big star
 
  45: (LIKE 12 seconds after the big grin) (big smile, next scene) blue fades in [oooh]
      IE at work: 2 seconds after blue light fades in * 3
      chrome: 1.5 seconds as blue light fades in
+     it's like 10 seconds in...
+     same with mac
+     conclusion: netflix doesn't care about mac versus pc timing-wise
+
+ conclusion: netflix varies pretty widely from instance to instance of playing back (same computer, same movie, same browser).
 
-forever strong (chrome work netflix):
+forever strong (chrome work netflix instant):
 
  15: I'm sorry, are you in the home add me now ... []almost, almost(two spaces)[], almost(one space)[]
  30: (ambulance...) let's go guys keep it tight (3 secs or so), same at 57-58, tight right on 58
  45: we stand on this field ready for battle []*2
  1:30 where I was 40 years ago...[don't] spend another, don't [spend] another minute being angry
 
-saints and soldiers (chrome work netflix):
+saints and soldiers (chrome work netflix instant):
 
  15: is the squarest guy I know...[he's] from some little backwards,  [] he's from some little
  30: flirting with the girl at my dad's store...[] what's her name*2