sensible-cinema 0.19.2 → 0.19.3

data/README

@@ -158,23 +158,25 @@ http://blog.josephhall.com/2008/09/command-line-dvd-authoring-part-1.html
 == Troubleshooting ==
 
 Note that you'll need java previously installed for this to work.  You probably already do though.
-If you run into a snag, try cleaning your DVD. Baking soda toothpaste might help.
-If it still errs, report it to the authors, along with a screen snapshot and steps of
+If you run into a snag, it might have failed in "grabbing" the DVD, and only got part of it.
+Try cleaning your DVD and starting over (delete all files, start again). 
+Baking soda toothpaste might help with cleaning it.
+If it still errs, report it, along with a screen snapshot and steps of
 how to reproduce the problem, preferably.  See feedback section.
 
-If it says "audio problem try pcm" then you can add
-"audio_codec" => "lavc"
-to your EDL and try again.
-
 It can fail also because a deletion is past end of DVD, or 
 Also note that if your DVD has scratches that cause it to skip, the time signatures will be off after that point, 
 so clean your discs and try again!
 
+Also make sure you aren't out of disk space.
+
 Also you could try a different computer (desktop computers' DVD drives seem to work better at times than laptops')
 
-Too slow? One big speedup would be getting a faster hard drive (like an SSD).  A second might be to get a faster DVD drive.
-  I'm not certain but I don't believe that a faster cpu (or even dual core, etc.), will currently help much, 
+Too slow? One big speedup would be getting a faster hard drive (SSD perhaps, though
+  sensible cinema mostly reads large files, so a speedy spinning disk might help, too).  A second might be to get a faster DVD drive.
+  I'm not certain but I don't believe that a faster cpu (or even dual core, etc.), will help much, 
   though it might like 3% or something.
+  Also ping me if you think it's too slow and I'll see what I can do.
 
 == Feedback ==
 

data/Rakefile

@@ -116,6 +116,8 @@ desc 'j -S rake bundle_dependencies create_distro_dir ... (releases with clean c
 task 'full_release' => [:bundle_dependencies, :create_distro_dir, :build] do # :release sigh
   gems = Dir['pkg/*.gem']
   gems[0..-2].each{|f| File.delete f} # kill old versions...
-  system("#{Gem.ruby} -S gem push #{gems[-1]}") 
+  system("#{Gem.ruby} -S gem push #{gems[-1]}")
+  FileUtils.rm_rf 'pkg'
   puts "don't forget to blog about it...and upload .zip of it..."
+  system("git push origin master")
 end

data/TODO

@@ -2,23 +2,29 @@
   
 == up next release ==
 
-  edit lists actually *work*:
-    cool runnings
-    temple
-    cars
-    HP
-      
+  edit lists actually *working*:
+    cool runnings at home
+    temple at home
+    cars bring home :)
+
 == slightly lower than that, somewhat ordered ==
 
+  broken button
+  edl is broken on HP at 2 hours, "from the dvd straight"
+  mplayer edl if it's all blank outs works right then?
+  fix edl_parser spec
+  detect disks have changed, re-query.
+  cleaner error on locked file :)
   linearize edl's
     don't use them linear, just linearize
       not this release
-  compare computer DVD timings with physical player's timings...
-    if same, add imdb todo's up here
-  mpeg is lossy (at least my current one pass conversion still is...)
+  play a bigger noise when totally done...(dvd flick'ish...)
+  mpeg is lossy (at least my current one pass conversion still is...) AND SO SLOW FOR EDITING and smplayer can't play it right unedited
     frame accurate splitter
-  check the DVD burning experience too...
-    could check if DVD Flick handles *oversize* files well, for information sake 
+  can I use ffmpeg to re-sync audio, and be able to re-play the edited copy, and thus avoid the small but extra harddup overhead (basically "just avoid")?
+    I can live with "watching while grabbing" being lack luster...or maybe I can grab it with acodec copy (typically), then reencode it somehow later into something that is friendlier to computer players...or is it encoders?
+      appears the only messed up audio one is smplayer...and probably mplayer with DVD's [?]
+  button start EDL playback here [?]
   partner for filters (Jon, Karlie if interested...give beta)
     lotsa filters somehow
       my dvd's (loose timestamps...)
@@ -27,25 +33,29 @@
   beta release/rinse and repeat with various ppl (once it's releasable...)
   a real'ish-er website
     link to ML
-    add button "upload/mail/submit" to ML [?]
-  play a bigger noise when totally done...(dvd flick'ish...)
+  compare computer DVD timings with physical player's timings...
+    if same, add imdb todo's up here
   propaganda-ize
     advertise in christian places
     blogs that have ever mentioned clearplay :P
     free google adwords (?)
     advertise urug, ruby flow :)
   add they 'play from unedited from grab till it hits the first bad spot', if useful [?]
-  fix edl_parser spec
+  md5 and verify the fulli version... [?]
+    only useful once I get the frame accurate stuff done, and any audio tweakage, etc.
   
-== DVD backlog (unordered, some very low prio, basically never do) ==
+== DVD backlog (unordered, some very low prio, basically all never do) ==
 
+  can I combine commands onto one command line for a quicker anything?
+  can I get the original audio tracks back?
+  show them how to use smplayer with subtitles
+  can overlay with an image
   can you forceidx on the original copy and have mplayer replay EDL in realtime accurately or not, with audio?
     if not somehow, wait till video falls through, then see if I can...do something here with audio...yipers..
     sound accurate?
       back to audio copy? huh?
   calculating disk's unique id... -> gui somewhere
   @dvd flick: auto-detect the aspect ratio, if possible (?)
-  detect disks have changed, re-query.
   ffmpeg handle 3F2R audio [sigh] [cars, should work with temple at lavc, too, bob dvd's are dual, I think...hmm...]
   "preview edited in a wholly blank section that includes an audio section should fail"
   an 'always skip mutes' option for paranoia.

data/VERSION

@@ -1 +1 @@
-0.19.2
+0.19.3

data/bin/sensible-cinema

@@ -78,7 +78,7 @@ module SensibleSwing
     # make them choose which system call to use explicitly
     undef system
     def initialize
-      super "Sensible-Cinema"
+      super "Sensible-Cinema (gpl)"
       if !(Storage['main_license_accepted'] == VERSION)
         show_blocking_license_accept_dialog 'Sensible Cinema', 'gplv3', 'http://www.gnu.org/licenses/gpl.html'
         show_blocking_license_accept_dialog 'Sensible Cinema', 'LICENSE.TXT file', File.expand_path(File.dirname(__FILE__) + "/../LICENSE.TXT"), 'LICENSE.TXT file', 'I acknowledge that I have read the LICENSE.TXT file.'
@@ -105,13 +105,13 @@ module SensibleSwing
         do_copy_dvd_to_hard_drive false
       }
       
-      @mplayer_edl = new_jbutton( "Watch DVD on computer edited realtime", false )
+      @mplayer_edl = new_jbutton( "Watch DVD on computer edited realtime", true ) # TODO enable once it works with HP
       @mplayer_edl.on_clicked {
         drive, dvd_volume_name, md5sum, edl_path, descriptors = choose_dvd_and_edl_for_it
         descriptors = EdlParser.parse_file edl_path
         temp_dir = Dir.tmpdir
         temp_file = temp_dir + '/mplayer.temp.edl'
-        edl_contents = MplayerEdl.convert_to_edl descriptors, 1.75 # add a sec to mutes to accomodate for mplayer's oddness...
+        edl_contents = MplayerEdl.convert_to_edl descriptors, 5.75 # add a sec to mutes to accomodate for mplayer's oddness...
         File.write(temp_file, edl_contents)
         title_track = get_title_track(descriptors)
         # oh the insanity of the console UI...LODO more user friendly player
@@ -193,6 +193,11 @@ EOL
         This is used to identify a disk to match it to its EDL, later.", "\"disk_unique_id\" => \"#{md5}\",")
       }
       
+      @upload = new_jbutton( "Upload/e-mail suggestion/Submit anything").on_clicked {
+        system_non_blocking("start mailto:sensible-cinema@googlegroups.com")
+        system_non_blocking("start http://groups.google.com/group/sensible-cinema")
+      }
+      
       @progress_bar = JProgressBar.new(0, 100)
       @progress_bar.set_bounds(44,@starting_button_y,@button_width,23)
       @progress_bar.visible = false
@@ -361,7 +366,7 @@ EOL
             descriptors = parse_edl edit_list_path
           rescue SyntaxError => e
             puts e
-            show_blocking_message_dialog("your file has an error: \n" + edit_list_path + "\n " + e)
+            show_blocking_message_dialog("your file has an error--please fix then hit ok: \n" + edit_list_path + "\n " + e)
           end
       end
       @_choose_dvd_and_edl_for_it[-1] = descriptors
@@ -494,7 +499,7 @@ EOL
           show_blocking_message_dialog "Done--you may now watch file #{saved_to} in SMPlayer or VLC player"
         end
       else
-        show_blocking_message_dialog("Failed--please examine screen output and report back!\nAlso consult the troubleshooting section of the README file.", "Failed", JOptionPane::ERROR_MESSAGE)
+        show_blocking_message_dialog("Failed--please examine console output and report back!\nAlso consult the troubleshooting section of the README file.", "Failed", JOptionPane::ERROR_MESSAGE)
       end
     end
 

data/how_to_create.txt

@@ -15,35 +15,26 @@ insert DVD, click "create new" button
 click "open ripped version of DVD unedited", right click, create new file, name it something.txt, right click, "open", and then select it.
 
 it will rip that fella to the hard drive (for the save to filename, use the default).  
-It will take quite awhile, but will get everything set up for quick editing after that.
+It will take quite awhile, but will get everything set up for quick editing after that point.
 
 In the meantime, make your file look like this:
 
 https://github.com/rdp/sensible-cinema/blob/master/zamples/edit_decision_lists/example_edit_decision_list.txt
 
-After it finishes ripping it, it will start you watching it in mplayer, which should give you a reasonable view of good timestamps.
+After it finishes ripping it, it will start you watching it in mplayer, from which you can "derive" the parts you wish to delete.
 
-Add timestamps to your file as necessary, then (exit smplayer and) click "Preview edited section of current DVD" (use the default filename always),
-give it a range "around" the edit you just added, then it will give you an .avi file with just that segment.
-Watch it (in VLC or smplayer), and see if your edit worked.  If it didn't, edit it, hit "re-run most recent preview"
-If it did, then click "Open ripped version of DVD" again, and continue playing from where you were before.
-
-When you're done finally, then click "Create edited copy of DVD on your hard drive".
-It will re-rip and do it all (will take forever), but will give you your final product.
-Alternatively, you could get a final product by clicking "Preview edited section of current DVD" and putting in a start timestamp of
-00:00 and an end timestamp of 9999 or what not.  Same deal, but will take you less time.
+Add timestamps to your file as necessary, then (exit smplayer and) click "Preview edited section of current DVD" (use the default filename),
+give it a range "around" the edit you just added, then it will preview that segment.  If it didn't work, edit the file,
+close smplayer, and hit "re-run most recent preview"
 
 Also after you're done, you can delete any left over files that are still there.
 
-Also after you're done, you can submit it back to the project by emailing me with an attachment: rogerdpack@gmail.com
+Also after you're done, you can submit it back to the project by submitting it, see end of README.
 
-Also if you want sensible-cinema to be able to auto-choose your EDL, then include its unique id (click the "Get a disk's unique id" button).
-
+A few pointers:
  I typically like to make two delete lists per DVD.  One that takes out swearing, sex, and gruesome violence, and another
    "more paranoid" version that takes out basically anything that could be offensive to anybody :) ("dang", "fetch", "too tense" of scenes...)
-  
-A few pointers:
  You can just watch the DVD (using any DVD player), and get timestamps that way, before starting this.
- A good one is "smplayer" (the [ and ] keys control playback speed)
- You can watch the DVD using VLC Player, which has a "fast forward" button, just recognize that VLC's timestamps are slightly off,
-  so they'll only be approximate, but it might still help.
+ A good one is "smplayer" (the [ and ] keys control playback speed), and you can turn on subtitles to find profanity.
+ You can watch the DVD using VLC Player, which has a "fast forward" button, just recognize that VLC's timestamps are always slightly off,
+  so they'll only be approximate, but it might be close.

data/lib/frame_accurate.rb

@@ -0,0 +1,3 @@
+class FrameAccurate
+  
+end

data/lib/mencoder_wrapper.rb

@@ -28,11 +28,9 @@ class MencoderWrapper
       if File.exist?(@big_temp) && File.exist?(@big_temp + '.done')
         out = '@rem '
       end
-      # video_opts = "-ovc lavc -lavcopts keyint=1" # seems reasonable quality somehow...
-      # equivalent of ffmpeg's -target ntsc-dvd...I think...except that aspect thing terrifies me...
-      audio_codec = these_settings['audio_codec'] || 'lavc' # not copy...sniff...
+      audio_codec = these_settings['audio_codec'] || 'lavc' # not copy...sniff...or you can't hear cars...
       video_opts = "-ovc lavc -lavcopts vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=1:vstrict=0:acodec=ac3:abitrate=192:autoaspect -ofps 30000/1001"
-      out + "call mencoder dvdnav://#{@dvd_title_track} -of mpeg -mpegopts format=dvd:tsaf -alang en -nocache -sid 1000 -oac #{audio_codec} #{video_opts} -o #{@big_temp} -dvd-device #{this_drive} && echo got_file > #{@big_temp}.done\n"
+      out + "call mencoder dvdnav://#{@dvd_title_track} -of mpeg -mpegopts format=dvd:tsaf -alang en -nocache -sid 1000 -oac #{audio_codec} #{video_opts} -o #{@big_temp} -dvd-device #{this_drive} && echo got_file > #{@big_temp}.done\n"# -vf harddup
     end
     
     def calculate_final_filename to_here_final_file

data/sensible-cinema.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.19.2"
+  s.version = "0.19.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
-  s.date = %q{2010-12-21}
+  s.date = %q{2010-12-22}
   s.email = %q{rogerdpack@gmail.com}
   s.executables = ["sensible-cinema", "sensible-cinema-cli"]
   s.extensions = ["ext/mkrf_conf.rb"]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "lib/edl_parser.rb",
     "lib/fake_blanker.rb",
     "lib/file_chooser.rb",
+    "lib/frame_accurate.rb",
     "lib/keyboard_input.rb",
     "lib/mencoder_wrapper.rb",
     "lib/mouse.rb",
@@ -62,6 +63,7 @@ Gem::Specification.new do |s|
     "spec/convert_image.rb",
     "spec/drive_info.spec.rb",
     "spec/edl_parser.spec.rb",
+    "spec/frame_accurate.spec.rb",
     "spec/go_line.bat",
     "spec/images/black.bmp",
     "spec/images/colon.bmp",
@@ -115,6 +117,7 @@ Gem::Specification.new do |s|
     "spec/mouse.spec.rb",
     "spec/mplayer_edl.spec.rb",
     "spec/muter.spec.rb",
+    "spec/notes",
     "spec/ocr.spec.rb",
     "spec/overlayer.spec.rb",
     "spec/screen_tracker.spec.rb",
@@ -165,6 +168,7 @@ Gem::Specification.new do |s|
     "spec/convert_image.rb",
     "spec/drive_info.spec.rb",
     "spec/edl_parser.spec.rb",
+    "spec/frame_accurate.spec.rb",
     "spec/keyboard_input.spec.rb",
     "spec/mencoder_wrapper.spec.rb",
     "spec/mouse.spec.rb",

data/spec/frame_accurate.spec.rb

@@ -0,0 +1,71 @@
+=begin
+Copyright 2010, Roger Pack 
+This file is part of Sensible Cinema.
+
+    Sensible Cinema is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Sensible Cinema is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Sensible Cinema.  If not, see <http://www.gnu.org/licenses/>.
+=end
+require File.dirname(__FILE__) + "/common"
+
+require_relative '../lib/frame_accurate'
+describe FrameAccurate do
+
+String = <<EOL
+
+[PACKET]
+codec_type=video
+stream_index=0
+pts=N/A
+pts_time=N/A
+dts=132
+dts_time=4.404404
+duration=1
+duration_time=0.033367
+size=29030.000000
+pos=4164842
+flags=K
+[/PACKET]
+[PACKET]
+codec_type=audio
+stream_index=1
+pts=105984
+pts_time=4.416000
+dts=105984
+dts_time=4.416000
+duration=768
+duration_time=0.032000
+size=768.000000
+pos=4193880
+flags=K
+[/PACKET]
+[PACKET]
+codec_type=video
+stream_index=0
+pts=N/A
+pts_time=N/A
+dts=133
+dts_time=4.437771
+duration=1
+duration_time=0.033367
+size=28965.000000
+pos=4194656
+flags=_
+[/PACKET]
+
+EOL
+
+  it "should parse strings" do
+    FrameAccurate.parse(String).should == [[4.404404, true], [4.437771, false]]
+  end
+
+end

data/spec/mencoder_wrapper.spec.rb

@@ -19,6 +19,10 @@ require File.dirname(__FILE__) + "/common"
 require_relative '../lib/mencoder_wrapper'
 require_relative '../lib/edl_parser'
 
+#  require 'digest/md5'
+# hasher = Digest::MD5.new
+# size = 1024*1024
+# p Digest::MD5.file('HP_AND_THE_CHAMBER_OF_SECRETS_edited_version.fulli_unedited.tmp.mpg')
 # mpeg fulli_unedited one pass doesn't look "awful"
 # mp4 fulli_unedited default looks way granular
 # so could either attempt to re-encode at high cpu, possibly still lossy

data/spec/notes

@@ -0,0 +1,35 @@
+The kicker is that if I want to watch the "unedited all" option in mplayer (which I do for the "quick start" mode), then it needs to be as is...
+
+audio_codec = these_settings['audio_codec'] || 'lavc' # not copy...sniff...or you can't hear cars...as ffmpeg loses it on transfer [?] at least the intermediates you *cannot* hear.
+
+HP with edl (only) seriously fails at the 2 hour mark, even with 5 seconds added, or seems to, at least.
+
+windows media player is able to playback the "fulli" that mplayer gets out of sync on (lavc audio), at least with cars.
+
+mplayer dvd://23 -dvd-device e:\ -edl C:\Users\packrd\AppData\Local\Temp\mplayer.temp.edl
+  seems to play with audio in sync always, with cars (now with potter...)
+
+what if you grab with "full" audio...does it make its way back out to the DVD? what does dvd flick do audio wise?
+
+without harddup smplayer got audio video out of sync playing DVD, as well as playing ripped files, however
+  when you wrote those to DVD, they seemed to get back in sync. ffmpeg, perhaps, is/was fixing them?
+
+fulli with lavc audio and video: mplayer cannot play it back right, but if it's re-encoded with mencoder first [? or is it ffmpeg?], mplayer
+seems to play it fine then. Thin ice here...
+
+if I pull from dvd with -acodec lavc (basically downgrade to stereo), then ffmpeg can extract to avi with sound.
+  otherwise (cars only), it lacks sound *only on computer players*
+
+Note that mencoder cannot have an endpos on a dvd. Weird.
+
+Note that dvdflick "appears" to encode correctly even if the size is too big, as in it just encodes it "lossy-y"
+  The encoding actually appears to be fairly high quality, that dvd flick does, video wise, at least.
+
+ffmpeg -i bigg.mpg -acodec copy -vcodec copy bigg.reindexffmpeg.mpg
+
+resulted in a sound with no audio
+
+I got bigg trying to combine (mencoder ?) two large files.
+
+I think bigg has honestly messed up audio, no reindexing seems to help it, at all.
+

data/spec/sensible_cinema_gui.spec.rb

@@ -83,7 +83,7 @@ module SensibleSwing
       end
     end
 
-    it "should modify path to have mencder available, and ffmpeg, and download them on the fly" do
+    it "should modify path to have mencoder available" do
       ENV['PATH'].should include("mencoder")
     end
     
@@ -233,9 +233,10 @@ module SensibleSwing
     
     it "if the .done file does not exist, it should call smplayer ja" do
       @subject.stub!(:sleep) {} # speed this test up...
-      @subject.instance_variable_get(:@watch_unedited).simulate_click.join
+      click_button(:@watch_unedited).join
       @subject.after_success_once.should == nil
-      @command.should_not == nil
+      @command.should =~ /smplayer.*fulli/
+      @system_blocking_command.should_not == nil
     end
     
     it "should create a new file for ya" do

data/zamples/edit_decision_lists/dvds/Harry Potter 2.txt

@@ -3,16 +3,14 @@
   "00:09:44", "00:09:46", "darn",
    "00:12:28", "00:12:29", "good L..",
    "01:20:59", "01:21:00", "h..",
-   "01:21:24", "01:21:25",  "h..",
-   "02:00:30", "02:00:31",  "h..",
+   "01:21:16", "01:21:17.5",  "he..",
+   "02:01:10.5", "02:01:12",  "h..",
 ],
 
+"blank_outs" => [
+   "01:21:08", "01:21:09",  "profanity", "he..", # too easy to lip read :)
+],
 
 "disk_unique_id" => "9a56136cdd5bc321ebff064cd59b8322",
-"title" => "HP_AND_THE_CHAMBER_OF_SECRETS",
-
-#9:44 "darn"
-
-#12:28 "good L.."
-#1:21:24  (he. .  2x)
-#2:00:30  (he..)
+"title" => "Harry Potter 2 Chamber of secrets",
+"grabbed_md5" => "2f0395de5eaf0c64eae859e17ba270fd"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 19
-    - 2
-  version: 0.19.2
+    - 3
+  version: 0.19.3
 platform: ruby
 authors: 
   - Roger Pack
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -07:00
+date: 2010-12-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -180,6 +180,7 @@ files:
   - lib/edl_parser.rb
   - lib/fake_blanker.rb
   - lib/file_chooser.rb
+  - lib/frame_accurate.rb
   - lib/keyboard_input.rb
   - lib/mencoder_wrapper.rb
   - lib/mouse.rb
@@ -200,6 +201,7 @@ files:
   - spec/convert_image.rb
   - spec/drive_info.spec.rb
   - spec/edl_parser.spec.rb
+  - spec/frame_accurate.spec.rb
   - spec/go_line.bat
   - spec/images/black.bmp
   - spec/images/colon.bmp
@@ -253,6 +255,7 @@ files:
   - spec/mouse.spec.rb
   - spec/mplayer_edl.spec.rb
   - spec/muter.spec.rb
+  - spec/notes
   - spec/ocr.spec.rb
   - spec/overlayer.spec.rb
   - spec/screen_tracker.spec.rb
@@ -328,6 +331,7 @@ test_files:
   - spec/convert_image.rb
   - spec/drive_info.spec.rb
   - spec/edl_parser.spec.rb
+  - spec/frame_accurate.spec.rb
   - spec/keyboard_input.spec.rb
   - spec/mencoder_wrapper.spec.rb
   - spec/mouse.spec.rb