one-k-rmov 0.2.0 → 0.2.2

data/CHANGELOG

@@ -1,7 +1,12 @@
 
+0.2.1 (February 26, 2009)
+
 * adding more property information from movie and track, such as codec information
 
-1K Studios Forked Version
+* adds audio channel information
+
+0.2.0 1K Studios Forked Version
+    purpose is to expose more reporting about movie, track information reporting
 
 0.1.4 (October 3rd, 2008)
 

data/Rakefile

@@ -2,11 +2,11 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('rmov', '0.2.0') do |p|
+Echoe.new('rmov', '0.2.2') do |p|
   p.summary        = "Ruby wrapper for the QuickTime C API."
-  p.description    = "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.author         = 'Ryan Bates'
+  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"]
   p.extensions     = ["ext/extconf.rb"]

data/ext/track.c

@@ -69,6 +69,15 @@ static VALUE track_frame_count(VALUE obj)
   return INT2NUM(GetMediaSampleCount(TRACK_MEDIA(obj)));
 }
 
+/*  helper function, returns media type of the track
+*/
+static OSType track_get_media_type(VALUE obj)
+{
+  OSType media_type;
+  GetMediaHandlerDescription(TRACK_MEDIA(obj), &media_type, 0, 0);  
+  return media_type;
+}
+
 /*
   call-seq: media_type() -> media_type_sym
   
@@ -76,9 +85,8 @@ static VALUE track_frame_count(VALUE obj)
 */
 static VALUE track_media_type(VALUE obj)
 {
-  OSType media_type;
+  OSType media_type = track_get_media_type(obj);
   
-  GetMediaHandlerDescription(TRACK_MEDIA(obj), &media_type, 0, 0);
   if (media_type == SoundMediaType) {
     return ID2SYM(rb_intern("audio"));
   } else if (media_type == VideoMediaType) {
@@ -95,13 +103,10 @@ static VALUE track_media_type(VALUE obj)
 */
 static ImageDescriptionHandle track_image_description(VALUE obj)
 {
-	Media track_media = TRACK_MEDIA(obj);
-  OSType media_type;
-  OSErr osErr = noErr;
+  OSErr osErr;
 
 	/* restrict reporting to video track */
-  GetMediaHandlerDescription(track_media, &media_type, 0, 0);
-  if (media_type != VideoMediaType)
+  if (track_get_media_type(obj) != VideoMediaType)
     return NULL;
   
 	SampleDescriptionHandle sample_description = NULL;
@@ -111,7 +116,7 @@ static ImageDescriptionHandle track_image_description(VALUE obj)
     return NULL;
   }
 
-	GetMediaSampleDescription(track_media, 1, sample_description);
+	GetMediaSampleDescription(TRACK_MEDIA(obj), 1, sample_description);
 	osErr = GetMoviesError();
   if (osErr != noErr) {
     rb_raise(eQuickTime, "Movie Error %d when determining image description", osErr);
@@ -263,39 +268,6 @@ static VALUE track_set_volume(VALUE obj, VALUE volume_obj)
   return Qnil;
 }
 
-
-/*  returns the AudioStreamBasicDescription for the track.
-    If it's not an audio track, return NULL
-*/
-static SoundDescriptionHandle track_audio_description(VALUE obj)
-{
-	Media track_media = TRACK_MEDIA(obj);
-  OSType media_type;
-  OSErr osErr = noErr;
-
-	/* restrict reporting to audio track */
-  GetMediaHandlerDescription(track_media, &media_type, 0, 0);
-  if (media_type != SoundMediaType)
-    return NULL;
-  
-	SoundDescriptionHandle sample_description = NULL;
-  sample_description = (SoundDescriptionHandle)NewHandle(sizeof(SampleDescription));
-  if (LMGetMemErr() != noErr) {
-    rb_raise(eQuickTime, "Memory Error %d when determining audio description", LMGetMemErr());
-    return NULL;
-  }
-
-	GetMediaSampleDescription(track_media, 1, (SampleDescriptionHandle)sample_description);
-	osErr = GetMoviesError();
-  if (osErr != noErr) {
-    rb_raise(eQuickTime, "GetMediaSampleDescription Error %d when determining audio description", osErr);
-    DisposeHandle((Handle)sample_description);
-    return NULL;
-  }
-
-  return sample_description;
-}
-
 /*
   call-seq: offset() -> seconds
   
@@ -359,6 +331,171 @@ static VALUE track_new_text_media(VALUE obj)
   return obj;
 }
 
+/*  helper function to return the channel layouts
+    returns layout == NULL if there is a problem
+*/
+static AudioChannelLayout* track_get_audio_channel_layout(VALUE obj)
+{
+	/* restrict reporting to audio track */
+  if (track_get_media_type(obj) != SoundMediaType) return NULL;
+
+  UInt32 size = 0;
+  OSErr osErr;
+  AudioChannelLayout* layout = NULL;
+
+  osErr = QTGetTrackPropertyInfo(TRACK(obj), kQTPropertyClass_Audio, kQTAudioPropertyID_ChannelLayout, NULL, &size, NULL);
+  if (osErr != noErr || size <= 0) goto bail;
+
+  layout = (AudioChannelLayout*)calloc(1, size);
+  if (layout == NULL) {
+    osErr = memFullErr;
+    goto bail;
+  }
+  
+  osErr = QTGetTrackProperty(TRACK(obj), kQTPropertyClass_Audio, kQTAudioPropertyID_ChannelLayout, size, layout, NULL);
+  if (osErr != noErr) goto bail;
+  
+  return layout;
+
+  /* clean up in the event of an error*/
+  bail:
+    rb_raise(eQuickTime, "Error %d when getting audio channel layout", osErr);
+    free(layout);
+    return NULL;
+}
+
+/*
+  call-seq: track_get_audio_channel_count() -> number_of_channels  
+*/
+static VALUE track_get_audio_channel_count(VALUE obj)
+{
+  AudioChannelLayout *layout = track_get_audio_channel_layout(obj);
+  if (layout == NULL) return Qnil;
+
+  UInt32 numChannels = (layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelDescriptions) ? layout->mNumberChannelDescriptions : AudioChannelLayoutTag_GetNumberOfChannels(layout->mChannelLayoutTag);
+  
+  free(layout);
+  
+  return INT2NUM(numChannels);
+}
+
+// add a channel hash with a given value(v)
+#define ADD_CHANNEL(ary, c, v) c=rb_hash_new(); rb_ary_push(ary, c); rb_hash_aset(c, ID2SYM(rb_intern("assignment")), ID2SYM(rb_intern(v)))
+
+static char* track_str_for_AudioChannelLabel(label) {
+  
+  char *trackStr = NULL;
+  
+  switch (label) {
+    
+    case kAudioChannelLabel_Left:
+      trackStr = "left";
+      break;
+    case kAudioChannelLabel_Right:
+      trackStr = "right";
+      break;
+    case kAudioChannelLabel_Center:
+      trackStr = "center";
+      break;
+    case kAudioChannelLabel_LFEScreen:
+      trackStr = "LFEScreen";
+      break;
+    case kAudioChannelLabel_LeftSurround:
+      trackStr = "leftSurround";
+      break;
+    case kAudioChannelLabel_RightSurround:
+      trackStr = "rightSurround";
+      break;
+    case kAudioChannelLabel_LeftCenter:
+      trackStr = "leftCenter";
+      break;
+    case kAudioChannelLabel_RightCenter:
+      trackStr = "rightCenter";
+      break;
+    case kAudioChannelLabel_CenterSurround:
+      trackStr = "centerSurround";
+      break;
+    case kAudioChannelLabel_LeftSurroundDirect:
+      trackStr = "leftSurroundDirect";
+      break;
+    case kAudioChannelLabel_RightSurroundDirect:
+      trackStr = "rightSurroundDirect";
+      break;
+    case kAudioChannelLabel_TopCenterSurround:
+      trackStr = "topCenterSurround";
+      break;
+
+    default:
+      rb_raise(eQuickTime, "Not Implemented: AudioChannelLabel in track_get_audio_channel_map : %d", label);
+      break;
+  }
+  
+  return trackStr;
+}
+
+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;
+  VALUE channel;
+  AudioChannelLayoutTag layoutTag = layout->mChannelLayoutTag;
+  
+  if (layoutTag == kAudioChannelLayoutTag_UseChannelDescriptions) {
+    // using the descriptions
+    // not implemented
+    numChannels = layout->mNumberChannelDescriptions;
+    channels = rb_ary_new2(numChannels);
+    
+    // loop through all channels, adding assignment descriptions
+    AudioChannelDescription desc;
+    char *trackStr;
+    for (x=0; x < numChannels; x++) {
+      desc = layout->mChannelDescriptions[x];
+      trackStr = track_str_for_AudioChannelLabel(desc.mChannelLabel);
+      ADD_CHANNEL(channels, channel, trackStr);
+    }
+    
+
+  } else {
+    numChannels = AudioChannelLayoutTag_GetNumberOfChannels(layoutTag);
+    channels = rb_ary_new2(numChannels);
+
+    if (layoutTag == kAudioChannelLayoutTag_UseChannelBitmap) {
+      // use the bitmap approach
+      // not implemented
+      rb_raise(eQuickTime, "Not Implemented: kAudioChannelLayoutTag_UseChannelBitmap in track_get_audio_channel_map");
+
+
+    } else {
+      // using a standard LayoutTag
+      switch (layoutTag) {
+
+        case kAudioChannelLayoutTag_Mono:
+          ADD_CHANNEL(channels, channel, "mono");
+          break;
+        
+        case kAudioChannelLayoutTag_Stereo:
+          ADD_CHANNEL(channels, channel, "left");
+          ADD_CHANNEL(channels, channel, "right");
+          break;
+
+        default:
+          // unsupported
+          rb_raise(eQuickTime, "Unsupported ChannelLayoutTag in track_get_audio_channel_map: %d", layoutTag);
+          break;
+      }
+
+    }
+
+  }
+  
+  free(layout);
+  
+  return channels;
+}
 
 void Init_quicktime_track()
 {
@@ -375,6 +512,8 @@ 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, "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);

data/rmov.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rmov}
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ryan Bates"]
-  s.date = %q{2009-02-24}
-  s.description = %q{Ruby wrapper for the QuickTime C API.}
+  s.authors = ["Ryan Bates, with updates by 1K Studios, LLC"]
+  s.date = %q{2009-02-27}
+  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"]

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification 
 name: one-k-rmov
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors: 
-- Ryan Bates
+- Ryan Bates, with updates by 1K Studios, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-02-24 00:00:00 -08:00
+date: 2009-02-27 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
-description: Ruby wrapper for the QuickTime C API.
+description: Ruby wrapper for the QuickTime C API.  Updates by 1K include exposing some movie properties such as codec and audio channel descriptions
 email: ryan (at) railscasts (dot) com
 executables: []