ffmpeg-ruby 0.1.0 → 0.1.2

data/Manifest

@@ -8,6 +8,8 @@ ext/ffmpeg_ruby/ffmpeg_avcodec.c
 ext/ffmpeg_ruby/ffmpeg_avcodec.h
 ext/ffmpeg_ruby/ffmpeg_avformat.c
 ext/ffmpeg_ruby/ffmpeg_avformat.h
+ext/ffmpeg_ruby/ffmpeg_avstream.c
+ext/ffmpeg_ruby/ffmpeg_avstream.h
 ext/ffmpeg_ruby/ffmpeg_ruby.c
 ext/ffmpeg_ruby/ffmpeg_ruby.h
 ffmpeg-ruby.gemspec

data/README.rdoc

@@ -21,12 +21,15 @@ If you run into trouble, it could be the C bundle not building. This is known to
 
 You may need to add +--with+ on mac, to point it to macports' /opt/local for the libraries.
 
-This has worked on my snow leopard machine:
+== Mac Notes
+
+Because of the way the library gets built, it needs to match the architecture type of your ruby. You can force it to do this by specifying the ++-arch++ flag. For a 64-bit ruby on Snow Leopard:
 
   $ sudo port install ffmpeg
   (go have coffee)
-  $ env ARCHFLAGS="-arch x86_64" ruby extconf.rb --with-avformat-dir=/opt/local
-  make
+  $ sudo env ARCHFLAGS="-arch x86_64" gem install ffmpeg-ruby
+
+If your machine is 32 bit, the +ARCHFLAGS+ above should be ++ARCHFLAGS="-arch i386"+
 
 This will provide you with a bundle you can require.
 

data/Rakefile

@@ -2,11 +2,11 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new("ffmpeg-ruby", "0.1.0") do |p|
+Echoe.new("ffmpeg-ruby", "0.1.2") do |p|
 	p.description = "FFMpeg Ruby Bridge. Call FFMpeg/LibAVCodec/LibAVFormat directly"
 	p.url         = "http://github.com/hackerdude/ffmpeg-ruby"
 	p.author      = "David Martinez"
-	p.ignore_pattern = ["tmp/*", "script/*"]
+	p.ignore_pattern = ["tmp/*", "script/*", "pkg/*"]
 	p.development_dependencies = [] # TODO How to do native dependencies?
 end
 

data/ext/ffmpeg_ruby/ffmpeg_avcodec.c

@@ -82,11 +82,9 @@ VALUE AVCodec_long_name(VALUE self)
 
 VALUE AVCodec_name(VALUE self)
 {
-	char* tm;
   AVCodec *ptr;
   Data_Get_Struct(self, AVCodec, ptr);
-	tm = ptr->name;
-	return rb_str_new2(tm);
+	return rb_str_new2(ptr->name);
 }
 
 VALUE AVCodec_codec_type(VALUE self)
@@ -167,6 +165,44 @@ VALUE supported_audio_codecs()
 	}
 	return result;
 }
+/*
+ * Similar to avcodec_string but only 
+ * gets the name using thse same logic 
+ */
+VALUE avcodec_canonical_name(AVCodecContext *enc)
+{
+    const char *codec_name;
+    AVCodec *p;
+    char buf1[128];
+
+		p = avcodec_find_decoder(enc->codec_id);
+    if (p) {
+        codec_name = p->name;
+    } else if (enc->codec_id == CODEC_ID_MPEG2TS) {
+        /* fake mpeg2 transport stream codec (currently not
+ *            registered) */
+        codec_name = "mpeg2ts";
+    } else if (enc->codec_name[0] != '\0') {
+        codec_name = enc->codec_name;
+    } else {
+        /* output avi tags */
+        if(   isprint(enc->codec_tag&0xFF) && isprint((enc->codec_tag>>8)&0xFF)
+           && isprint((enc->codec_tag>>16)&0xFF) && isprint((enc->codec_tag>>24)&0xFF)){
+            snprintf(buf1, sizeof(buf1), "%c%c%c%c / 0x%04X",
+                     enc->codec_tag & 0xff,
+                     (enc->codec_tag >> 8) & 0xff,
+                     (enc->codec_tag >> 16) & 0xff,
+                     (enc->codec_tag >> 24) & 0xff,
+                      enc->codec_tag);
+        } else {
+            snprintf(buf1, sizeof(buf1), "0x%04x", enc->codec_tag);
+        }
+        codec_name = buf1;
+    }
+
+		return rb_str_new2(codec_name); // TODO on the ruby side, check enc->mb_decision to add the (hq) if we want to.
+}
+
 
 void Init_ffmpeg_ruby_avcodec(VALUE module)
 {

data/ext/ffmpeg_ruby/ffmpeg_avcodec.h

@@ -1,4 +1,5 @@
 VALUE cFFMpegAVCodecContext;
+VALUE cFFMpegAVCodec;
 
 void Init_ffmpeg_ruby_avcodec(VALUE module)
 
@@ -24,4 +25,5 @@ VALUE AVCodecContext_codec_name(VALUE self);
 VALUE supported_avcodecs();
 VALUE supported_video_codecs();
 VALUE supported_audio_codecs();
+VALUE avcodec_canonical_name(AVCodecContext *enc);
 

data/ext/ffmpeg_ruby/ffmpeg_avformat.c

@@ -72,6 +72,21 @@ VALUE AVFormatContext_new(VALUE klaas, VALUE ruby_filename) {
 		return result;
 }
 
+VALUE AVFormatContext_streams(VALUE self) {
+  AVFormatContext *ptr;
+  Data_Get_Struct(self, AVFormatContext, ptr);
+	VALUE result = rb_ary_new();
+	int i;
+	for(i=0; i<ptr->nb_streams; i++) {
+		// Get a pointer to the codec context for the video stream
+		AVStream  *pStream = ptr->streams[i];
+		VALUE rStream  = Data_Wrap_Struct(cFFMpegAVStream, AVStream_mark, AVStream_free, pStream);
+		rb_obj_call_init(rStream,0,0);
+		rb_ary_push(result, rStream);
+	}
+	return result;
+}
+
 /* Return all the AVCodecContext entries for all streams in the file */
 VALUE AVFormatContext_codec_contexts(VALUE self) {
   AVFormatContext *ptr;
@@ -135,6 +150,7 @@ void Init_ffmpeg_ruby_avformat(VALUE module)
 		cFFMpegAVFormatContext = rb_define_class_under(module, "AVFormatContext", rb_cObject);
 		rb_define_singleton_method(cFFMpegAVFormatContext, "new", AVFormatContext_new, 1);
 		rb_define_method(cFFMpegAVFormatContext, "close_file", AVFormatContext_close_file, 0);
+		rb_define_method(cFFMpegAVFormatContext, "streams", AVFormatContext_streams, 0);
 		rb_define_method(cFFMpegAVFormatContext, "duration", AVFormatContext_duration, 0);
 		rb_define_method(cFFMpegAVFormatContext, "title", AVFormatContext_title, 0);
 		rb_define_method(cFFMpegAVFormatContext, "copyright", AVFormatContext_copyright, 0);

data/ext/ffmpeg_ruby/ffmpeg_avformat.h

@@ -15,6 +15,7 @@ VALUE AVFormatContext_duration(VALUE);
 VALUE AVFormatContext_close_file(VALUE);
 VALUE AVFormatContext_new(VALUE, VALUE);
 VALUE AVFormatContext_codec_contexts(VALUE);
+VALUE AVFormatContext_streams(VALUE);
 VALUE AVFormatContext_title(VALUE);
 VALUE AVFormatContext_author(VALUE);
 VALUE AVFormatContext_copyright(VALUE);
@@ -22,7 +23,11 @@ VALUE AVFormatContext_bit_rate(VALUE);
 VALUE AVFormatContext_album(VALUE);
 void Init_ffmpeg_ruby_avformat(VALUE module);
 
-// Forward declaring some necessary avcodec stuff
+// Forward declaring some necessary stuff from other modules
 void AVCodecContext_mark(void *v);
 void AVCodecContext_free(void *v);
 extern VALUE cFFMpegAVCodecContext;
+
+void AVStream_mark(void *v);
+void AVStream_free(void *v);
+extern VALUE cFFMpegAVStream;

data/ext/ffmpeg_ruby/ffmpeg_avstream.c

@@ -0,0 +1,50 @@
+#include "ruby.h"
+#include <libavformat/avformat.h>
+#include "ffmpeg_avstream.h"
+
+void Init_ffmpeg_ruby_avstream(VALUE module)
+{
+		cFFMpegAVStream = rb_define_class_under(module, "AVStream", rb_cObject);
+		rb_define_method(cFFMpegAVStream, "canonical_codec_name", AVStream_canonical_codec_name, 0);
+		rb_define_method(cFFMpegAVStream, "codec", AVStream_codec, 0);
+		rb_define_method(cFFMpegAVStream, "codec_context", AVStream_codec_context, 0);
+}
+
+void AVStream_free(void *v) {}
+void AVStream_mark(void *v) {}
+
+VALUE AVStream_canonical_codec_name(VALUE self)
+{
+	AVStream *ptr;
+	AVCodec *c;
+
+	Data_Get_Struct(self, AVStream, ptr);
+	//char buf[256];
+	c =avcodec_canonical_name(ptr->codec);
+	return c;
+}
+
+VALUE AVStream_codec(VALUE self)
+{
+	AVStream *pStream;
+	AVCodec *c;
+	Data_Get_Struct(self, AVStream, pStream);
+	c = avcodec_find_decoder(pStream->codec->codec_id);
+	if (!c) {
+		return Qnil;
+	}
+	VALUE rCodec  = Data_Wrap_Struct(cFFMpegAVCodec, AVCodec_mark, AVCodec_free, c);
+	rb_obj_call_init(rCodec,0,0);
+	return rCodec;
+}
+
+VALUE AVStream_codec_context(VALUE self)
+{
+	AVStream *pStream;
+	AVCodecContext *c;
+	Data_Get_Struct(self, AVStream, pStream);
+	c = pStream->codec;
+	VALUE rCodec  = Data_Wrap_Struct(cFFMpegAVCodecContext, AVCodecContext_mark, AVCodecContext_free, c);
+	rb_obj_call_init(rCodec,0,0);
+	return rCodec;
+}

data/ext/ffmpeg_ruby/ffmpeg_avstream.h

@@ -0,0 +1,20 @@
+#include <libavformat/avformat.h>
+#include <ruby.h>
+
+VALUE cFFMpegAVStream;
+
+void AVStream_mark(void *v);
+void AVStream_free(void *v);
+VALUE AVStream_canonical_codec_name(VALUE);
+VALUE AVStream_codec(VALUE);
+VALUE AVStream_codec_context(VALUE);
+
+
+// forward declaring some stuff from codec module
+void AVCodec_mark(void *v);
+void AVCodec_free(void *v);
+void AVCodecContext_mark(void *v);
+void AVCodecContext_free(void *v);
+extern VALUE cFFMpegAVCodec;
+extern VALUE cFFMpegAVCodecContext;
+VALUE avcodec_canonical_name(AVCodecContext *enc);

data/ext/ffmpeg_ruby/ffmpeg_ruby.c

@@ -12,5 +12,6 @@ void Init_ffmpeg_ruby()
 		mFFMpeg = rb_define_module("FFMpeg");
 		Init_ffmpeg_ruby_avcodec(mFFMpeg);
 		Init_ffmpeg_ruby_avformat(mFFMpeg);
+		Init_ffmpeg_ruby_avstream(mFFMpeg);
 }
 

data/ffmpeg-ruby.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffmpeg-ruby}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Martinez"]
-  s.date = %q{2010-02-10}
+  s.date = %q{2010-02-16}
   s.description = %q{FFMpeg Ruby Bridge. Call FFMpeg/LibAVCodec/LibAVFormat directly}
   s.email = %q{}
   s.extensions = ["ext/ffmpeg_ruby/extconf.rb"]
-  s.extra_rdoc_files = ["README.rdoc", "ext/ffmpeg_ruby/conftest.dSYM/Contents/Info.plist", "ext/ffmpeg_ruby/conftest.dSYM/Contents/Resources/DWARF/conftest", "ext/ffmpeg_ruby/extconf.rb", "ext/ffmpeg_ruby/ffmpeg_avcodec.c", "ext/ffmpeg_ruby/ffmpeg_avcodec.h", "ext/ffmpeg_ruby/ffmpeg_avformat.c", "ext/ffmpeg_ruby/ffmpeg_avformat.h", "ext/ffmpeg_ruby/ffmpeg_ruby.c", "ext/ffmpeg_ruby/ffmpeg_ruby.h", "lib/ffmpeg-ruby.rb", "tasks/mac_specific.rake"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "ext/ffmpeg_ruby/conftest.dSYM/Contents/Info.plist", "ext/ffmpeg_ruby/conftest.dSYM/Contents/Resources/DWARF/conftest", "ext/ffmpeg_ruby/extconf.rb", "ext/ffmpeg_ruby/ffmpeg_avcodec.c", "ext/ffmpeg_ruby/ffmpeg_avcodec.h", "ext/ffmpeg_ruby/ffmpeg_avformat.c", "ext/ffmpeg_ruby/ffmpeg_avformat.h", "ext/ffmpeg_ruby/ffmpeg_ruby.c", "ext/ffmpeg_ruby/ffmpeg_ruby.h", "ffmpeg-ruby.gemspec", "lib/ffmpeg-ruby.rb", "tasks/mac_specific.rake", "test/test.rb"]
+  s.extra_rdoc_files = ["README.rdoc", "ext/ffmpeg_ruby/conftest.dSYM/Contents/Info.plist", "ext/ffmpeg_ruby/conftest.dSYM/Contents/Resources/DWARF/conftest", "ext/ffmpeg_ruby/extconf.rb", "ext/ffmpeg_ruby/ffmpeg_avcodec.c", "ext/ffmpeg_ruby/ffmpeg_avcodec.h", "ext/ffmpeg_ruby/ffmpeg_avformat.c", "ext/ffmpeg_ruby/ffmpeg_avformat.h", "ext/ffmpeg_ruby/ffmpeg_avstream.c", "ext/ffmpeg_ruby/ffmpeg_avstream.h", "ext/ffmpeg_ruby/ffmpeg_ruby.c", "ext/ffmpeg_ruby/ffmpeg_ruby.h", "lib/ffmpeg-ruby.rb", "tasks/mac_specific.rake"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "ext/ffmpeg_ruby/conftest.dSYM/Contents/Info.plist", "ext/ffmpeg_ruby/conftest.dSYM/Contents/Resources/DWARF/conftest", "ext/ffmpeg_ruby/extconf.rb", "ext/ffmpeg_ruby/ffmpeg_avcodec.c", "ext/ffmpeg_ruby/ffmpeg_avcodec.h", "ext/ffmpeg_ruby/ffmpeg_avformat.c", "ext/ffmpeg_ruby/ffmpeg_avformat.h", "ext/ffmpeg_ruby/ffmpeg_avstream.c", "ext/ffmpeg_ruby/ffmpeg_avstream.h", "ext/ffmpeg_ruby/ffmpeg_ruby.c", "ext/ffmpeg_ruby/ffmpeg_ruby.h", "ffmpeg-ruby.gemspec", "lib/ffmpeg-ruby.rb", "tasks/mac_specific.rake", "test/test.rb"]
   s.homepage = %q{http://github.com/hackerdude/ffmpeg-ruby}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ffmpeg-ruby", "--main", "README.rdoc"]
   s.require_paths = ["lib", "ext"]

data/test/test.rb

@@ -1,4 +1,6 @@
 require "#{File.dirname(__FILE__)}/../lib/ffmpeg-ruby"
+require 'rubygems'
+require 'ruby-debug'
 
 puts "Here are the video codecs I support, of the #{FFMpeg::AVCodec.supported_avcodecs.length} codecs:"
 FFMpeg::AVCodec.supported_video_codecs.each{|k,v|
@@ -22,7 +24,13 @@ puts "  Author: #{f.author}"
 puts "  Album: #{f.album}"
 puts "  Bit Rate: #{f.bit_rate}"
 
-puts "\nCodec Information for #{filename}"
+puts "\nStream information:"
+f.streams.each{|s|
+	puts "  Canonical Codec: #{s.canonical_codec_name}"
+	puts "  Codec Long Name: #{s.codec_context.long_name}"
+}
+
+puts "\nCodec Context Information for #{filename}"
 f.codec_contexts.each_with_index{|ctx,i|
 	puts "Codec info for stream ##{i}"
 	puts "  Type: #{ctx.codec_type} (#{FFMpeg::MAP_CODEC_TYPES[ctx.codec_type]})"
@@ -34,6 +42,8 @@ f.codec_contexts.each_with_index{|ctx,i|
 	puts "  Audio Sample Rate: #{ctx.sample_rate}"
 }
 
+
+
 puts "-- Now dumping the format:"
 f.dump_format
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ffmpeg-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
 - David Martinez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -08:00
+date: 2010-02-16 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,8 @@ extra_rdoc_files:
 - ext/ffmpeg_ruby/ffmpeg_avcodec.h
 - ext/ffmpeg_ruby/ffmpeg_avformat.c
 - ext/ffmpeg_ruby/ffmpeg_avformat.h
+- ext/ffmpeg_ruby/ffmpeg_avstream.c
+- ext/ffmpeg_ruby/ffmpeg_avstream.h
 - ext/ffmpeg_ruby/ffmpeg_ruby.c
 - ext/ffmpeg_ruby/ffmpeg_ruby.h
 - lib/ffmpeg-ruby.rb
@@ -43,6 +45,8 @@ files:
 - ext/ffmpeg_ruby/ffmpeg_avcodec.h
 - ext/ffmpeg_ruby/ffmpeg_avformat.c
 - ext/ffmpeg_ruby/ffmpeg_avformat.h
+- ext/ffmpeg_ruby/ffmpeg_avstream.c
+- ext/ffmpeg_ruby/ffmpeg_avstream.h
 - ext/ffmpeg_ruby/ffmpeg_ruby.c
 - ext/ffmpeg_ruby/ffmpeg_ruby.h
 - ffmpeg-ruby.gemspec