one-k-rmov 0.2.4 → 0.2.5

data/CHANGELOG

@@ -1,3 +1,11 @@
+0.2.5 (March 3, 2009)
+
+* adds pixel aspect ratio
+* adds encoded pixel dimensions
+* fixes issue with unsupported audio channel labels
+* adds return value for audio channels of :UnsupportedByRMov for unsupported values
+* adds :message for those unsupported cases
+
 0.2.4 (February 27, 2009)
 
 * changes symbols case to match QuickTime constants for channel descriptions (eg. :left becomes :Left)

data/Rakefile

@@ -1,11 +1,11 @@
 require 'rubygems'
 require 'rake'
 require 'echoe'
-
-Echoe.new('rmov', '0.2.4') do |p|
+ 
+Echoe.new('rmov', '0.2.5') do |p|
   p.summary        = "Ruby wrapper for the QuickTime C API."
   p.description    = "Ruby wrapper for the QuickTime C API.  Updates by 1K include exposing some movie properties such as codec and audio channel descriptions"
-  p.url            = "http://github.com/ryanb/rmov"
+  p.url            = "http://github.com/one-k/rmov"
   p.author         = 'Ryan Bates, with updates by 1K Studios, LLC'
   p.email          = "ryan (at) railscasts (dot) com"
   p.ignore_pattern = ["script/*", "tmp/*", "spec/output/*", "**/*.o", "**/*.bundle", "**/*.mov"]

data/ext/track.c

@@ -478,23 +478,27 @@ static char* track_str_for_AudioChannelLabel(label) {
     case kAudioChannelLabel_CenterSurroundDirect:
       trackStr = "CenterSurroundDirect";
       break;
-
-    default:
-      rb_raise(eQuickTime, "Not Implemented: AudioChannelLabel in track_get_audio_channel_map : %d", label);
-      break;
   }
   
   return trackStr;
 }
 
+/*
+  call-seq: track_get_audio_channel_map() -> array
+    
+    Returns an array n-channels in length
+    Array contains Hashes in the form: {:assignment => :description} where :description is a symbol representing an audio channel description.  eg. :Left, :Right, :Mono
+  
+*/
 static VALUE track_get_audio_channel_map(VALUE obj)
 {
   AudioChannelLayout *layout = track_get_audio_channel_layout(obj);
   if (layout == NULL) return Qnil;
   
   VALUE channels = Qnil;
-  UInt32 numChannels, x;
+  UInt32 numChannels, x, highLayoutTag;
   VALUE channel;
+  char message[256];
   AudioChannelLayoutTag layoutTag = layout->mChannelLayoutTag;
   
   if (layoutTag == kAudioChannelLayoutTag_UseChannelDescriptions) {
@@ -509,7 +513,16 @@ static VALUE track_get_audio_channel_map(VALUE obj)
     for (x=0; x < numChannels; x++) {
       desc = layout->mChannelDescriptions[x];
       trackStr = track_str_for_AudioChannelLabel(desc.mChannelLabel);
-      ADD_CHANNEL(channels, channel, trackStr);
+
+      if (trackStr != NULL) {
+        ADD_CHANNEL(channels, channel, trackStr);
+
+      } else {
+         // unsupported audio channel labels
+         ADD_CHANNEL(channels, channel, "UnsupportedByRMov");
+         sprintf(message, "ChannelLabel unsupported by rmov: %d", desc.mChannelLabel);
+         rb_hash_aset(channel, ID2SYM(rb_intern("message")), rb_str_new2(message));
+      }
     }
     
 
@@ -520,7 +533,12 @@ static VALUE track_get_audio_channel_map(VALUE obj)
     if (layoutTag == kAudioChannelLayoutTag_UseChannelBitmap) {
       // use the bitmap approach
       // not implemented
-      rb_raise(eQuickTime, "Not Implemented: kAudioChannelLayoutTag_UseChannelBitmap in track_get_audio_channel_map");
+      //rb_raise(eQuickTime, "Not Implemented: kAudioChannelLayoutTag_UseChannelBitmap in track_get_audio_channel_map");
+      for (x=0; x < numChannels; x++) {
+        ADD_CHANNEL(channels, channel, "UnsupportedByRMov");
+        rb_hash_aset(channel, ID2SYM(rb_intern("message")), rb_str_new2("UseChannelBitmap unsupported by rmov"));
+      }
+
 
 
     } else {
@@ -539,11 +557,17 @@ static VALUE track_get_audio_channel_map(VALUE obj)
         case kAudioChannelLayoutTag_MatrixStereo :
           ADD_CHANNEL(channels, channel, "LeftTotal");
           ADD_CHANNEL(channels, channel, "RightTotal");
-          
+          break;
 
         default:
-          // unsupported
-          rb_raise(eQuickTime, "Unsupported ChannelLayoutTag in track_get_audio_channel_map: %d", layoutTag);
+          // unsupported channels
+          highLayoutTag = (layoutTag & 0xff0000) >> 16;
+          sprintf(message, "layoutTag unsupported by rmov: (%dL << 16) | %d", highLayoutTag, numChannels);
+          for (x=0; x < numChannels; x++) {
+            ADD_CHANNEL(channels, channel, "UnsupportedByRMov");
+            rb_hash_aset(channel, ID2SYM(rb_intern("message")), rb_str_new2(message));
+          }
+          //rb_raise(eQuickTime, "Unsupported ChannelLayoutTag in track_get_audio_channel_map: %d", layoutTag);
           break;
       }
 
@@ -556,6 +580,64 @@ static VALUE track_get_audio_channel_map(VALUE obj)
   return channels;
 }
 
+/*
+  call-seq: track_encoded_pixel_dimensions() -> {:width => width, :height => height}
+
+  returns hash of dimensions {:width => width, :height => height} of the encoded pixel
+  dimensions
+*/
+static VALUE track_encoded_pixel_dimensions(VALUE obj)
+{
+  OSErr osErr = noErr;
+  ImageDescriptionHandle image_description = track_image_description(obj);
+  if (image_description == NULL) goto bail;
+  
+  SInt32 width, height;
+  osErr = ICMImageDescriptionGetProperty(image_description, kQTPropertyClass_ImageDescription, kICMImageDescriptionPropertyID_EncodedWidth, sizeof(width), &width, NULL);
+  if (osErr != noErr) goto bail;
+
+  osErr = ICMImageDescriptionGetProperty(image_description, kQTPropertyClass_ImageDescription, kICMImageDescriptionPropertyID_EncodedHeight, sizeof(height), &height, NULL);
+  if (osErr != noErr) goto bail;
+
+  VALUE size_hash = rb_hash_new();
+
+  rb_hash_aset(size_hash, ID2SYM(rb_intern("width")), INT2NUM(width));
+  rb_hash_aset(size_hash, ID2SYM(rb_intern("height")), INT2NUM(height));
+
+  DisposeHandle((Handle)image_description);
+  return size_hash;
+
+  bail:
+    DisposeHandle((Handle)image_description);
+    rb_raise(eQuickTime, "Error %d when getting track_encoded_pixel_dimensions", osErr);
+    return Qnil;
+}
+
+/*
+  call-seq: track_pixel_aspect_ratio() -> aspect_ratio array [1, 1]
+*/
+static VALUE track_pixel_aspect_ratio(VALUE obj)
+{
+  OSErr osErr = noErr;
+  ImageDescriptionHandle image_description = track_image_description(obj);
+  if (image_description == NULL) goto bail;
+  
+  PixelAspectRatioImageDescriptionExtension dimension;
+  osErr = ICMImageDescriptionGetProperty(image_description, kQTPropertyClass_ImageDescription, kICMImageDescriptionPropertyID_PixelAspectRatio, sizeof(dimension), &dimension, NULL);
+  if (osErr != noErr) goto bail;
+  
+//  printf("\naspect ratio: %d:%d\n", dimension.hSpacing, dimension.vSpacing);
+  VALUE aspect_ratio = rb_ary_new3(2, INT2NUM(dimension.hSpacing), INT2NUM(dimension.vSpacing));
+
+  DisposeHandle((Handle)image_description);
+  return aspect_ratio;
+
+  bail:
+    DisposeHandle((Handle)image_description);
+    rb_raise(eQuickTime, "Error %d when getting track_encoded_pixel_dimensions", osErr);
+    return Qnil;
+}
+
 void Init_quicktime_track()
 {
   VALUE mQuickTime;
@@ -571,9 +653,12 @@ void Init_quicktime_track()
   rb_define_method(cTrack, "codec", track_codec, 0);
   rb_define_method(cTrack, "width", track_width, 0);
   rb_define_method(cTrack, "height", track_height, 0);
+  rb_define_method(cTrack, "encoded_pixel_dimensions", track_encoded_pixel_dimensions, 0);
+  rb_define_method(cTrack, "pixel_aspect_ratio", track_pixel_aspect_ratio, 0);
+  
   rb_define_method(cTrack, "channel_count", track_get_audio_channel_count, 0);
   rb_define_method(cTrack, "channel_map", track_get_audio_channel_map, 0);
-  
+
   rb_define_method(cTrack, "id", track_id, 0);
   rb_define_method(cTrack, "delete", track_delete, 0);
   rb_define_method(cTrack, "enabled?", track_enabled, 0);

data/rmov.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rmov}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Bates, with updates by 1K Studios, LLC"]
-  s.date = %q{2009-03-01}
+  s.date = %q{2009-03-04}
   s.description = %q{Ruby wrapper for the QuickTime C API.  Updates by 1K include exposing some movie properties such as codec and audio channel descriptions}
   s.email = %q{ryan (at) railscasts (dot) com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["CHANGELOG", "ext/exporter.c", "ext/extconf.rb", "ext/movie.c", "ext/rmov_ext.c", "ext/rmov_ext.h", "ext/track.c", "lib/quicktime/exporter.rb", "lib/quicktime/movie.rb", "lib/quicktime/track.rb", "lib/rmov.rb", "LICENSE", "README.rdoc", "tasks/setup.rake", "tasks/spec.rake", "TODO"]
   s.files = ["CHANGELOG", "ext/exporter.c", "ext/extconf.rb", "ext/movie.c", "ext/rmov_ext.c", "ext/rmov_ext.h", "ext/track.c", "lib/quicktime/exporter.rb", "lib/quicktime/movie.rb", "lib/quicktime/track.rb", "lib/rmov.rb", "LICENSE", "Manifest", "Rakefile", "README.rdoc", "spec/fixtures/settings.st", "spec/quicktime/exporter_spec.rb", "spec/quicktime/movie_spec.rb", "spec/quicktime/track_spec.rb", "spec/quicktime/hd_track_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/setup.rake", "tasks/spec.rake", "TODO", "rmov.gemspec"]
   s.has_rdoc = true
-  s.homepage = %q{http://github.com/ryanb/rmov}
+  s.homepage = %q{http://github.com/one-k/rmov}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rmov", "--main", "README.rdoc"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{rmov}

data/spec/quicktime/hd_track_spec.rb

@@ -10,11 +10,15 @@ describe QuickTime::Track do
       before(:each) do
         @track = @movie.video_tracks.first
       end
-      
+
       it "should have a codec of Apple ProRes 422 (HQ)" do
         @track.codec.should == "Apple ProRes 422 (HQ)"
       end
-            
+
+      it "has video track aspect ratio of 1:1" do
+        @track.pixel_aspect_ratio.should == [1, 1]
+      end
+
     end
   
     describe "HD2.mov audio track" do 
@@ -49,37 +53,57 @@ describe QuickTime::Track do
 
   end  
 
-  describe "SD3v2.mov audio tracks" do
+  describe "SD3v2.mov" do
     before(:each) do
       @movie = QuickTime::Movie.open(File.dirname(__FILE__) + '/../fixtures/SD3v2.mov')
     end
     
-    it "has audio track 0 with left/right" do
-      track = @movie.audio_tracks[0]
-      track.channel_map.should_not == nil
-      track.channel_map[0][:assignment].should == :Left
-      track.channel_map[1][:assignment].should == :Right
-    end
+    describe "video track" do
+      before(:each) do
+        @track = @movie.video_tracks.first
+      end
 
-    it "has audio track 1 with left/right" do
-      track = @movie.audio_tracks[1]
-      track.channel_map.should_not == nil
-      track.channel_map[0][:assignment].should == :Left
-    end
+      it "has size of 720x480" do
+        @track.width.should == 720
+        @track.height.should == 480
+      end
     
-    it "has audio tracks with proper assignments" do
-      channel_maps = @movie.audio_tracks.collect {|tr| tr.channel_map}
-      channel_maps.should == [
-        [{:assignment => :Left}, {:assignment => :Right}],
-        [{:assignment => :Left}],
-        [{:assignment => :Right}],
-        [{:assignment => :Center}],
-        [{:assignment => :LFEScreen}],
-        [{:assignment => :LeftSurround}],
-        [{:assignment => :RightSurround}],
-        ]
+      it "has encoded pixel size of 720x480" do
+        @track.encoded_pixel_dimensions.should == {:width => 720, :height => 480}
+      end
+    
+      it "has aspect ratio of 1:0.84375" do
+        @track.pixel_aspect_ratio.should == [100000, 84375]
+      end
     end
 
+    describe "audio tracks" do
+      it "has audio track 0 with left/right" do
+        track = @movie.audio_tracks[0]
+        track.channel_map.should_not == nil
+        track.channel_map[0][:assignment].should == :Left
+        track.channel_map[1][:assignment].should == :Right
+      end
+
+      it "has audio track 1 with left/right" do
+        track = @movie.audio_tracks[1]
+        track.channel_map.should_not == nil
+        track.channel_map[0][:assignment].should == :Left
+      end
+    
+      it "has audio tracks with proper assignments" do
+        channel_maps = @movie.audio_tracks.collect {|tr| tr.channel_map}
+        channel_maps.should == [
+          [{:assignment => :Left}, {:assignment => :Right}],
+          [{:assignment => :Left}],
+          [{:assignment => :Right}],
+          [{:assignment => :Center}],
+          [{:assignment => :LFEScreen}],
+          [{:assignment => :LeftSurround}],
+          [{:assignment => :RightSurround}],
+          ]
+      end
+    end
   end
   
   
@@ -99,7 +123,39 @@ describe QuickTime::Track do
         [{:assignment => :Mono}],
         [{:assignment => :Mono}],
         ]
-    end 
+    end
+    
+    it "has video track aspect ratio of 1:1" do
+      track = @movie.video_tracks.first
+      track.pixel_aspect_ratio.should == [1, 1]
+    end
+  end
+
+
+  describe "SD2v2.mov audio tracks" do
+    before(:each) do
+      @movie = QuickTime::Movie.open(File.dirname(__FILE__) + '/../fixtures/SD2v2.mov')
+    end
+    
+    it "has video track aspect ratio of 100000:112500" do
+      track = @movie.video_tracks.first
+      track.pixel_aspect_ratio.should == [100000, 112500]
+    end
+
   end
 
+  describe "exampleUnsupportAudio.mov audio tracks" do
+    before(:each) do
+      @movie = QuickTime::Movie.open(File.dirname(__FILE__) + '/../fixtures/exampleUnsupportAudio.mov')
+    end
+    
+    it "has audio tracks with proper assignments" do
+      channel_maps = @movie.audio_tracks.collect {|tr| tr.channel_map}
+      channel_maps.should == [
+        [{:assignment => :UnsupportedByRMov, :message => "ChannelLabel unsupported by rmov: 65537"}]
+        ]
+    end
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: one-k-rmov
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Ryan Bates, with updates by 1K Studios, LLC
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-01 00:00:00 -08:00
+date: 2009-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -64,7 +64,7 @@ files:
 - TODO
 - rmov.gemspec
 has_rdoc: true
-homepage: http://github.com/ryanb/rmov
+homepage: http://github.com/one-k/rmov
 post_install_message: 
 rdoc_options: 
 - --line-numbers