sensible-cinema 0.25.4 → 0.26.0

data/VERSION

@@ -1 +1 @@
-0.25.4
+0.26.0

data/bin/sensible-cinema

@@ -79,7 +79,7 @@ else
 end
 
 import 'javax.swing.ImageIcon'
-require_relative 'sensible-cinema-dependencies'
+require_relative '../lib/sensible-cinema-dependencies'
 
 module SensibleSwing
   VERSION = File.read(File.dirname(__FILE__) + "/../VERSION").strip
@@ -329,7 +329,7 @@ module SensibleSwing
       out = "Upconvert options currently #{  settings ? "are set to #{settings} style" : "are NOT SET"}"
       if settings
         multiple = LocalStorage[ScreenMultipleFactor]
-       out += " (screen multiplier #{multiple} = #{(multiple * get_current_max_width_resolution).to_i}px)."
+       out += " (screen multiplier #{get_current_max_width_resolution}*#{multiple} = #{(multiple * get_current_max_width_resolution).to_i}px)."
       end
       out
     end
@@ -621,11 +621,8 @@ module SensibleSwing
       if just_create_dot_edl_file_instead_of_play
         descriptors = EdlParser.parse_file edl_filename
         # LODO these timings...DRY up...plus is XBMC the same? what about on a slower computer?
-        # NB these are just for the SxS EDL!
+        # NB these are just for the Side by side EDL's!
         
-      #add_secs_end = 0
-      #add_secs_beginning = 0.5 # LODO are these accurate for file based, as well? slow cpu versus fast?
-
         edl_contents = MplayerEdl.convert_to_edl descriptors, add_secs_end = MplayerEndBuffer, MplayerBeginingBuffer, splits = []
         output_file = filename_mpg.gsub(/\.[^\.]+$/, '') + '.edl' # sanitize...
         File.write(output_file, edl_contents)

data/bin/sensible-cinema-cli

@@ -85,20 +85,12 @@ def go_sc(args)
     auto_found = AutoWindowFinder.search_for_single_url_match
     if auto_found
       p 'auto-discovered open window for player x EDL, using it ' + auto_found
-      settings = EdlParser.parse_file auto_found
-      if settings["from_url"]
-         require 'tempfile'
-         to = Tempfile.new 'abc'
-         require_relative 'sensible-cinema-dependencies'
-         SensibleSwing::MainWindow.download(settings["from_url"], to.path)
-         edit_decision_list = to.path
-      else
-        edit_decision_list = auto_found
-      end
+      edit_decision_list = auto_found
     else
       puts 'Select Edit Decision List to use'
       edit_decision_list = FileChooser.choose_file("     SELECT EDIT DECISION LIST", __DIR__  + "/../zamples/edit_decision_lists")
     end
+    settings = EdlParser.parse_file auto_found
     
     if !edit_decision_list	
       puts "error: have to specify a scene descriptions file\n    or specify \"test\" on the command line if you just want to snapshot your player"

data/change_log_with_feature_list.txt

@@ -1,4 +1,34 @@
-== 025.5==
+== 0.26.0 ==
+
+It can now parse out (screen scraping), at runtime, EDL information from a user editable online 3rd party wiki 
+(imdb parent guide), including property timestamp conversions and making it easy to read, etc., and doing all the various
+sections to an appropriate category.
+So it binds the DVD's unique ID with its imdb database.
+
+Note that Sensible Cinema can convert timestamps back and forth, using the command line,
+to convert its own EDL's into a format that is copy and pastable into a wiki page on IMDB. (30 to 29.97 fps)
+
+Note also that it could just as easily parse from a wiki, parse out timestamps, including +- descriptions,
+and save that away to be distributable by the program at compile time, as well.
+
+Note also that it is basically almost a "universal" player at this point, because it has been made to work
+with demos of already several various online/local program playing video players.  
+Including software blu-ray players etc.
+
+Note that it already demo'ed being able to have "user customizable" volume level for muted sections 
+(i.e. not mute it all the way, if desired)
+
+Note also that it can be used by hooking to a projector or from computer -> tv so we have this unofficially
+in the living room or across several devices or the like.
+
+Note that the various video screenshots recorded imply that one would be able to 
+readily stream sensible cinema via screenshot capture to any device ready to receive it.
+See also coupling it with [1] and [2].
+
+[1] https://github.com/rdp/virtual-audio-capture-grabber-device
+[2] https://github.com/rdp/screen-capture-recorder-program
+
+== 0.25.5==
 
 Cleaned up upconverting options to hopefully cause less confusion. Until somebody complains otherwise.
 

data/lib/convert_thirty_fps.rb

@@ -1,12 +1,20 @@
 module ConvertThirtyFps
+  
   def self.from_thirty seconds_float
-    twentyNinePointNineSeven = 30000/1001.0
+    twentyNinePointNineSeven = 30000/1001.0 # 29.97
     seconds_float * 30/twentyNinePointNineSeven
   end
+  
+  def self.from_twenty_nine_nine_seven seconds_float
+    twentyNinePointNineSeven = 30000/1001.0
+    seconds_float * twentyNinePointNineSeven/30
+  end
+  
 end
 
 if $0 == __FILE__
-  p 'syntax: second to convert from 30 to 29.97'
+  p 'syntax: second to convert '
   seconds = eval(ARGV[0] || "1000").to_f
-  p 'converted value is', ConvertThirtyFps.from_thirty(seconds) # should get bigger...
+  p 'converted value from 30 to 29.97 is', ConvertThirtyFps.from_thirty(seconds) # should be bigger...
+  p 'converted value from 29.97 to 30 is', ConvertThirtyFps.from_twenty_nine_nine_seven(seconds)
 end

data/lib/edl_parser.rb

@@ -25,17 +25,75 @@ class EdlParser
   end
 
   # returns {"mutes" => [["00:00", "00:00", string1, string2, ...], ...], "blank_outs" -> [...], "url" => ...}  
-  def self.parse_file filename
+  def self.parse_file filename, expand = true
     output = parse_string File.read(filename), filename, []
     if relative = output["take_from_relative_file"]
       new_filename = File.dirname(filename) + '/' + relative
       new_input = parse_file new_filename
       output.merge! new_input
     end
+    require_relative 'sensible-cinema-dependencies'
+    
+    if expand
+    
+      if output["from_url"] # replacement
+        downloaded = SensibleSwing::MainWindow.download_to_string(output["from_url"])
+        output = parse_string downloaded # full replacement
+      end
+      
+      if imdb_id = output["imdb_id"]
+        require_relative 'convert_thirty_fps'
+        url = "http://www.imdb.com/title/#{imdb_id}/parentalguide"
+        all = SensibleSwing::MainWindow.download_to_string(url)
+        
+        header, violence_word, violence_section, profanity_word, profanity_section, alcohol_word, alcohol_section, frightening_word, frightening_section = 
+        sections = all.split(/<span>(Violence|Profanity|Alcohol|Frightening)/)
+        header = sections.shift
+        all ={}
+        while(!sections.empty?) # my klugey to_hash method
+          word_type = sections.shift
+          settings = sections.shift
+          assert word_type.in? ['Violence', 'Profanity', 'Alcohol', 'Frightening']
+          all[word_type] = settings
+        end
+        # blank_outs or mutes for each...
+        # TODO make -> optional
+        split_into_timestamps = /([\d:]+(?:\.\d+|))\W*-&gt;\W*([\d:]+(?:\.\d+|))([^\d\n]+)/
+        for type, settings in all
+          settings.scan(split_into_timestamps) do |begin_ts, end_ts, description|
+            puts "parsing from wiki imdb  entry violence: #{begin_ts} #{end_ts} #{description} #{type}"
+            start_seconds = translate_string_to_seconds begin_ts
+            end_seconds = translate_string_to_seconds end_ts
+            # convert from 30 to 29.97 fps ... we presume ...
+            start_seconds = ConvertThirtyFps.from_twenty_nine_nine_seven start_seconds
+            start_seconds = ("%.02f" % start_seconds).to_f # round
+            start_seconds = translate_time_to_human_readable start_seconds, true
+            end_seconds = ConvertThirtyFps.from_twenty_nine_nine_seven end_seconds
+            end_seconds = ("%.02f" % end_seconds).to_f # round
+            end_seconds = translate_time_to_human_readable end_seconds, true
+            p end_seconds
+            if type == 'Profanity'
+              output['mutes'] << [start_seconds, end_seconds]
+            else
+              output['blank_outs'] << [start_seconds, end_seconds]
+            end
+          end
+        end
+        
+      end
+    end
+    
     output
   end
   
   private
+
+  def self.download full_url, to_here
+    require 'open-uri'
+    writeOut = open(to_here, "wb")
+    writeOut.write(open(full_url).read)
+    writeOut.close
+  end
   
   # better eye-ball these before letting people run them, eh? TODO
   # but I couldn't think of any other way to parse the files tho
@@ -132,6 +190,7 @@ class EdlParser
   
   public 
   
+  # called later, from external
   # divides up mutes and blanks so that they don't overlap, preferring blanks over mutes
   # returns it like [[start,end,type], [s,e,t]...] type like either :blank and :mute
   # [[70.0, 73.0, :blank], [378.0, 379.1, :mute]]
@@ -172,6 +231,7 @@ class EdlParser
     combined.compact
   end
   
+  # its reverse: translate_time_to_human_readable
   def self.translate_string_to_seconds s
     # might actually already be a float, or int, depending on the yaml
     # int for 8 => 9 and also for 1:09 => 1:10
@@ -196,6 +256,7 @@ class EdlParser
     total
   end
   
+  # its reverse: translate_string_to_seconds
   def self.translate_time_to_human_readable seconds, force_hour_stamp = false
     # 3600 => "1:00:00"
     out = ''

data/{bin → lib}/sensible-cinema-dependencies.rb

@@ -1,5 +1,7 @@
 require 'java'
 
+require 'sane'
+
 module SensibleSwing
   
   class MainWindow < javax.swing.JFrame
@@ -11,5 +13,15 @@ module SensibleSwing
       writeOut.write(open(full_url).read)
       writeOut.close
     end
+    
+    def self.download_to_string full_url
+       require 'tempfile'
+       to = Tempfile.new 'abc'
+       download(full_url, to.path)
+       out = File.binread(to.path)
+       to.delete
+       out
+    end
+    
   end
 end

data/spec/edl_parser.spec.rb

@@ -185,14 +185,16 @@ describe EdlParser do
     english(3660 + 0.1).should == "1:01:00.100"
   end
   
-  it "should auto-select a EDL if it matches a DVD's title" do
+  it "should auto-select a (nested) EDL if it matches a DVD's id" do
+    FileUtils.mkdir_p 'files/edls/a/b/c'
+    File.write('files/edls/a/b/c/yo.txt', %!"disk_unique_id" => "deadbeef|8b27d001"!)
     EdlParser.single_edit_list_matches_dvd("deadbeef|8b27d001").should_not be nil
   end
   
   it "should not auto-select if you pass it nil" do
+    File.write('files/edls/yo', %!"disk_unique_id" => "deadbeef|8b27d001"!)
     EdlParser.single_edit_list_matches_dvd(nil).should be nil
   end
-  
 
   EdlParser::EDL_DIR.gsub!(/^.*$/, 'files/edls')
 
@@ -228,6 +230,18 @@ describe EdlParser do
        FileUtils.rm_rf 'files/edls/a.txt'
        FileUtils.rm_rf 'files/edls/b.txt'
      end
-   end
+   end
+  
+    before do
+      FileUtils.mkdir_p 'files/edls'
+    end
+    after do
+      FileUtils.rm_rf 'files/edls'
+    end
+
+   it "should download from imdb if specified and merge" do
+     File.binwrite('files/edls/a.txt', %!"imdb_id" => "tt1727587"!)
+     EdlParser.parse_file('files/edls/a.txt').should == {"blank_outs" => [["0:00:56", "0:00:57"], ["0:01:05", "0:01:14.500"]], "mutes" => [], "imdb_id" => "tt1727587"}
+   end
   
 end

data/todo.inventionzy.txt

@@ -1,34 +1,39 @@
   === patentzy yes actually do vaguely ordered ===
-    blu-ray OCR
-      more blu-ray stuff: can ID them, can playback (through...mkv? VLC? powerdvd OCr/scripted?)
-      some blu-ray player descriptor somehow
-    can move the mouse 10 pixels down at the beginning, in order to...put it in the right place.
-
-	EDL can say "this exact text was at this exact time" to allow for matching with other videos of same content that may have slightly different timestamps/speeds/start time etc.
-	allow for extra start time offset for videos, if netflix instant has any
-    can "suck in" a large list of EDL's from imdb at build time, and/or from a wiki (github wiki in this case), and a "resync" button?
-    can handle multiple dvdid's et al (same EDL) (mostly do already though)
-    can overlay over online films too
-    it can pull in a DVD based just on the dvd-id "query id, not local? go get it from online"
+      blu-ray OCR
+        more blu-ray stuff: can ID them, can playback (through...mkv? VLC? powerdvd OCr/scripted?)
+        some blu-ray player descriptor somehow
+      accomodate splits vs. blanks and work
+      
+    post a demo of it playing back blu-ray edited local computer, +- projector, +- playon (?)
+    could add dragging since we already control the mouse up and down, and movements etc., for example to skip forward etc.
+    a little robot demo thingy that can "click" your remote (or hardware) to fast forward through certain scenes, et al
+	  EDL can say "this exact text was at this exact time" to allow for matching with other videos of same content that may have slightly different timestamps/speeds/start time etc.
+      with several, or start one, end one, etc.
+	    allow for extra start time offset for videos, if netflix instant has any
+    a way to integrate with cable TV, ex: "this show we know started at 1:01, and its offsets should be this after that point"
+    a video of "recording to broadcast it" (or save it one by one)
+    can "suck in" a large list of EDL's from imdb at build time, 
+      and/or a "resync" button, to re-download just the list of updated EDL's/IMDB wiki settings [?]
+    can handle multiple dvdid's et al (same EDL) (mostly done already)
+    it can pull in a DVD based just on the dvd-id "query id, not local? go get it from online to see if the list has been updated since"
     control VLC RC to overlay a logo dynamically
     can control volume *and* play other audio
+    can permanently black out certain coords to keep things prettier...et al
+    remove black when they really move the mouse?
     can add to to supplement EDL + EDL timestamps
-    can pick specific profanities to avoid
+    can pick specific profanities to avoid (I think I demo'ed this already actually)
     it can scan "playing" instant streaming titles, and/or OCR or take the audio and look for words, to check for profanity.
-      it can examine "output volume level" to auto-detects violence.
+      it can examine "output volume level" to auto-detect violence scenes.
       similarly for "questionable" content
-    manual select which to include into an EDL
-    use multiple filters/complex mapping graphs to overlay just the correct frameage: http://ffmpeg.org/libavfilter.html
-    user preference "how many down clicks on volume for profanity"? 
+      it can detect from subtitles (and/or OCR, same thing), questionable content, or violence, based on words used
+    use multiple filters/complex mapping graphs to overlay just the exactly correct overlay: http://ffmpeg.org/libavfilter.html
+    user preference "how many down clicks on volume for profanity" (already possible)
     make it so it can suck in from "another wiki" the DL's, at package time, somehow (just one)
       or even just suck in any web file, for starters
     space -> advance from pause until next edit item?
     amazon player descriptor, just in case ;P
     can jerk mouse only every so often (cheap would be to just arbitrarily have it from x to y, demo that)
-    can scan several player descriptors to "pick the right one" (kind of already showed this one)
-    edited streamer screencast demo (the rumor guy demo, like zediva)
-    incorporate the EDL translator from the BYU-I fella
-    post a demo of it playing back blu-ray edited local computer, +- projector, +- playon (?)
+    can scan several player descriptors to "pick the right one" (kind of already showed/did this one)
     post some playon.tv demo screencast...this should prove all shouldn't it [?]
     can "control mouse" to drag it to change location (ex: "move down 10 pixels at beginning of movie" LOL)
     beep at them/warn when not tracking [?]
@@ -40,17 +45,17 @@
     don't mute, just almost mute LOL or almost mute and static-ify
       or combine the two
     can suck it in "in realtime" from online, and parse it +- from a user editable wiki
-    a UI to select categories, works
-    edited blu ray movie playback screencast, as that's apparently not in the patent...
+    a UI to select categories, save as preference, apply it each time at DVD selection time
     don't use timecodes, use "% of the movie" and "total length" perhaps?
-    look at their patents for other ideas? [+- nissim patents?]
-    just pause it, tell them how far to fast forward at that point :P [somewhat already done]
+    look at patents for other ideas? [+- nissim patents?]
+    just pause it, tell them how far to fast forward at that point :P [somewhat already done/showed actually, thanks to mplayer]
     
-    have the user forced to tell me what each digit is, themselves :P
+    have the user forced to tell me what each digit is, themselves, at runtime, for OCR :P
     the online edl stuff itself (its todo list)
     javascript API
-      phase 2: I can accomodate for pauses, too.
-      phase 3: I can re-train based on events of stoppage
+      phase 1: done
+      phase 2: I can accomodate for pausing, too.
+      phase 3: I can re-train based on events of stoppage (buffering et al)
       phase 4: I can constantly poll and react appropriately to current timestamp
     post video demo of it streaming to a console device
     maybe could just "play from x to y" [no exclude info?] instead of "here are the bad parts"
@@ -58,3 +63,4 @@
       stage two: chrome plugin for the same, auto-detect, auto-user, auto-download, auto-watch edited :)
     can insert deleted scenes et al [even external scenes :P] (already showed it somewhat)
     many others were already completed and done from this list and removed
+    there are some more ideas in the TODO file itself, and/or on the blog sites where I have posted other ideas too

data/todo.upconvert

@@ -31,6 +31,9 @@ do I need double tapping? http://archive2.avsforum.com/avs-vb/showthread.php?s=&
   
 == never ==
 
+test out xvda too...Radeon 4000 for example :P
+  I guess ffmpeg already supports it...
+
 add another sharpen filter?
 
 create a VLC version?

data/www/content_editor.html

@@ -0,0 +1,91 @@
+<head>
+
+<script src="http://code.jquery.com/jquery-1.4.2.min.js"  type="text/javascript"></script> 
+
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-4531218-5']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
+
+</head>
+
+<body>
+<html>
+<div style="float:right; margin-right: 50px; margin-left: 20px;">
+<img src="source/vendor/profs.png" width=150 />
+
+<h1>Sensible Cinema</h1></div>
+<pre>
+Welcome to the (work in progress) home page of Sensible Cinema, the free video scene skipper/muter.
+Sensible Cinema allows you watch edited movies by applying edit lists (EDL's) 
+(i.e. "mute out" or "cut out" questionable scenes) to DVD's or movie files.
+
+A description and history/background of sensible-cinema can be found <a href="https://github.com/rdp/sensible-cinema/blob/master/README">here</a>.  
+Don't forget to come back to this page to download it, though (from the "Download" section).
+
+<h2 style="margin: 0px;">Download</h2>
+To download, please check the checkbox if you agree to the terms of the 
+license agreement (<a href="http://www.gnu.org/licenses/gpl.html">gplv3</a>) and wish to download and use sensible cinema.  
+
+<input type="checkbox" class="trigger" onClick="$('#comments').toggle(); $('#comments2').toggle();"/>  I have read and agree to the license terms and conditions.
+
+<div id="comments" style="display:none;  border-style:dotted; border-width:1px; border-color: #aaaaaa; padding: 5px;"> 
+  Please download the latest version of sensible cinema from <a href="https://sourceforge.net/projects/sensible-cinema/files/">sourceforge</a>.
+</div>
+After download, unzip it.  For windows users, that's like: 
+   Reveal the file in explorer -> right click on the file -> Extract all -> Extract.  
+Now open the newly created sensible-cinema-x.x.x folder, and run the file "run sensible cinema.bat"
+You will be initially prompted to accept the license agreement(s) and also install a few 
+(non included, separate ownership/distribution) dependencies.
+Now insert a DVD you own, and restart sensible cinema to see available options.
+Note that you want to download from sourceforge not from github.com (github is just the raw source).
+There is more usage documentation within the "sensible-cinema/documentation" folder.
+
+<h3>Mac user prerequisites</h3>Mac users will need to install some programs first.
+
+If you plan on watching any movies in "realtime" then you'll need to download <a href="http://mplayerx.org/#Download">mplayerx</a>.
+
+If you plan on doing any auto-video editing/saving then you'll need to install <a href="http://www.macports.org/">macports</a>.  
+Install macports, then afterward open the "terminal" Application and execute the following command:
+$ sudo port install mencoder ffmpeg gocr
+After this finishes (it will take awhile) you'll be ready to run Sensible Cinema.
+Note that by installing these, you're accepting their respective licenses/distributions.
+
+<h3>Upconverting/upscaling DVD/video player</h3>Sensible Cinema comes with its own upscaling/upconverting software DVD/movie file player. See it and the various other things that sensible cinema does <a href="..">here</a>.
+
+<h3>Available edited movie lists</h3>You can see the (small) current list of DVD edit lists (EDL's) thus far available <a href="https://github.com/rdp/sensible-cinema/tree/master/zamples/edit_decision_lists/dvds">here</a> (all of them created previously by volunteers like you).  
+If yours is already there, then you might be good to go.  Just use it.
+
+If yours isn't there, then we'd ask you to help us by creating and submitting your own EDL (delete/cut list) for your DVD that doesn't have one yet, 
+see the <a href="https://github.com/rdp/sensible-cinema/blob/master/documentation">how to create</a> file for instructions on creating a new delete list. <!-- this is actually a short line -->
+Then run the file "advanced-edit or create sensible cinema delete list files.bat" to create and edit your new delete list.  Sensible Cinema has a few things to help you there.
+Don't forget to upload your new file back to us when you're done, so others can benefit from your work (see "contact", below).
+
+That link is the full list--your help is wanted/needed to help it grow!
+
+<h2 style="margin: 0px;">Other Resources/Contact/Support</h2>
+Let me know via the <a href="http://groups.google.com/group/sensible-cinema?pli=1">google group</a> or email rogerdpack@gmail.com if you have feedback or have any other ideas/suggestions.
+<h3>Source code</h3>Source code is all available <a href="http://github.com/rdp/sensible-cinema">here</a>.  Notes for potential source code developers are <a href="https://github.com/rdp/sensible-cinema/blob/master/developer_how_to_contribute_to_the_project.txt">here</a>.  
+For (techy or non-techy) contributions, see the contact info in the README file, or write to the google group, above.
+
+You can see the <a href="source/change_log_with_feature_list.txt">change log with feature list</a>.
+
+You can get a list of DVD ISO's (creative commons licensed) <a href="releases/dvd_isos">here</a>, if you want to try them out for experimenting/development/research etc.
+
+Please click the license agreement checkbox at the top to see a list of some old releases (newer ones are found on sourceforge exclusively, old ones here).
+<div id="comments2" style="display:none;">You can find an old list of older releases, as well as the MS based C <a href="releases/c_player">DVD player</a> listed <a href="releases">in the archives</a>.
+
+</div>
+</pre>
+</html>
+</body>
+