ffruby 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 38afb037560dc46fb90736c4c3ef17b6e407bf6c
+  data.tar.gz: a9d56a47829cd214d8bad7326c357f607bff0c4a
+SHA512:
+  metadata.gz: e27aadabdf44538cd1d01b6666385ec7c36dcc0097575bf638fc087eaeb6dbb5009e6a91d64535feeedefc3fc1e985b5177e7c42ea65eacfd38bc1133ac62a80
+  data.tar.gz: 6a28bdb98bc27da21a9897dab827efee3086e5f7bf37321da4ccf007a07c386433876e1dbdd0e4eb688914b7d457239788a12635072ffd4dae5c93edee934c86

data/.gitignore

@@ -0,0 +1,9 @@
+/ext/ffruby/*.o
+/ext/ffruby/*.so
+/ext/ffruby/Makefile
+/ext/ffruby/mkmf.log
+/Gemfile.lock
+/lib
+/pkg
+/rdoc
+/tmp

data/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gemspec

data/README.rdoc

@@ -6,11 +6,11 @@ FFruby is a Ruby interface to FFmpeg's libavformat and libavcodec. It allows you
 
 === Where do I go for support and contributions?
 
-We are hosted by RubyForge at http://rubyforge.org/projects/ffruby.
+We are hosted on GitHub at https://github.com/chewi/ffruby.
 
 === Where do I get the latest version?
 
-It should be available through RubyGems as ffruby. Failing that, try RubyForge.
+It should be available through RubyGems as ffruby. Failing that, try GitHub.
 
 === What about transcoding?
 
@@ -22,6 +22,11 @@ Being able to reliably read the source file's metadata is very important in deci
 
 == Changes
 
+=== 0.2.3 (2014/11/15)
+
+- Compatibility with newer FFmpeg versions.
+- Compatibility with Ruby 1.9.
+
 === 0.2.2 (2010/11/29)
 
 - Fix compilation with -fno-common for OS X.
@@ -50,4 +55,4 @@ Being able to reliably read the source file's metadata is very important in deci
 
 == Copyright
 
-Copyright (c) 2007-2010 James Le Cuirot. See LICENSE for details.
+Copyright (c) 2007-2014 James Le Cuirot. See LICENSE for details.

data/Rakefile

@@ -1,48 +1,13 @@
-require 'rubygems'
-require 'rake'
-
-RDOC_FILES = [ "README.rdoc", "ext/ffruby/ffruby{file,stream,}.c" ]
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "ffruby"
-    gem.version = File.read('VERSION')
-    gem.license = "LGPL-2.1"
-    gem.author = "James Le Cuirot"
-    gem.email = "chewi@aura-online.co.uk"
-    gem.rubyforge_project = "ffruby"
-    gem.homepage = "http://rubyforge.org/projects/ffruby/"
-    gem.summary = "A Ruby interface to FFmpeg's libavformat and libavcodec."
-    gem.description = "A Ruby interface to FFmpeg's libavformat and libavcodec. It allows you to query metadata from a wide variety of media files through some simple classes."
-    gem.requirements = "FFmpeg libraries and also development headers if building."
-    gem.files = RDOC_FILES + [ "LICENSE", "Rakefile", "VERSION", "ext/ffruby/{extconf.rb,ffruby.h}" ]
-    gem.extra_rdoc_files = RDOC_FILES 
-  end
-  Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-    rubyforge.remote_doc_path = ""
-  end
-rescue LoadError
-  puts "To prepare a gem, please install the jeweler gem."
-end
-
-begin
-  require 'rake/rdoctask'
-  Rake::RDocTask.new do |rdoc|
-    rdoc.rdoc_dir = 'rdoc'
-    rdoc.title = "FFruby " + File.read('VERSION')
-    rdoc.rdoc_files.include *RDOC_FILES
-  end
-rescue LoadError
-  puts "To build the documentation, please install the rdoc gem."
-end
-
-begin
-  require 'rake/extensiontask'
-  Rake::ExtensionTask.new('ffruby')
-  task :default => :compile
-rescue LoadError
-  puts "To build the library, please install the rake-compiler gem."
+require "bundler/gem_tasks"
+require "rake/extensiontask"
+require "rdoc/task"
+
+spec = Gem::Specification.load(File.expand_path("../ffruby.gemspec", __FILE__))
+Rake::ExtensionTask.new("ffruby", spec)
+
+RDoc::Task.new do |rdoc|
+  rdoc.main = "README.rdoc"
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title = "FFruby " + File.read(File.expand_path("../VERSION", __FILE__)).chomp
+  rdoc.rdoc_files.include *`git ls-files \*.{c,h,rdoc}`.split("\n")
 end

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/ext/ffruby/extconf.rb

@@ -1,10 +1,17 @@
 #!/usr/bin/env ruby
 
 require "mkmf"
+$DEFLIBPATH = []
 
 dir_config("ffmpeg")
+libs = %w( avutil avformat avcodec )
+headers = []
 
-%w( avformat avcodec ).each do |lib|
+libs.each do |lib|
+  have_library(lib)
+end
+
+libs.each do |lib|
   header = "#{lib}.h"
   result = false
 
@@ -12,7 +19,7 @@ dir_config("ffmpeg")
     path = File.join(dir, header)
 
     if checking_for(path) { try_cpp(cpp_include(path)) }
-      result = path
+      headers << result = path
       break
     end
   end
@@ -20,11 +27,13 @@ dir_config("ffmpeg")
   $defs.push "-D#{lib.upcase}_H_PATH=\"<#{result || header}>\""
 end
 
-have_library("avformat")
-have_library("avcodec")
-
 %w( iformat oformat codec ).each do |func|
-  have_func("av_#{func}_next")
+  have_func("av_#{func}_next", headers)
+end
+
+%w( av_dict_get avformat_open_input avformat_close_input avformat_find_stream_info avcodec_open2 ).each do |func|
+  have_func(func, headers)
 end
 
+have_const("AVMEDIA_TYPE_UNKNOWN", headers)
 create_makefile("ffruby")

data/ext/ffruby/ffruby.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2010 James Le Cuirot
+ * Copyright (c) 2007-2014 James Le Cuirot
  *
  * This file is part of FFruby.
  *

data/ext/ffruby/ffruby.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2010 James Le Cuirot
+ * Copyright (c) 2007-2014 James Le Cuirot
  *
  * This file is part of FFruby.
  *
@@ -22,6 +22,7 @@
 #define _FFRUBY_H_
 
 #include <ruby.h>
+#include AVUTIL_H_PATH
 #include AVFORMAT_H_PATH
 #include AVCODEC_H_PATH
 

data/ext/ffruby/ffrubyfile.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2010 James Le Cuirot
+ * Copyright (c) 2007-2014 James Le Cuirot
  *
  * This file is part of FFruby.
  *
@@ -21,6 +21,7 @@
 #include "ffruby.h"
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 VALUE cFFrubyFile;
 
@@ -41,7 +42,11 @@ static void ffrf_free(AVFormatContext *fmt)
 				avcodec_close(fmt->streams[i]->codec);
 		}
 
+#ifdef HAVE_AVFORMAT_CLOSE_INPUT
+		avformat_close_input(&fmt);
+#else
 		av_close_input_file(fmt);
+#endif
 	}
 }
 
@@ -57,60 +62,99 @@ static AVFormatContext* ffrf_get_fmt(VALUE self)
 	return fmt;
 }
 
-/* Returns the title string. */
-static VALUE ffrf_title(VALUE self)
+#ifdef HAVE_AV_DICT_GET
+
+static VALUE ffrf_get_metadata_str(VALUE self, const char *key)
 {
 	AVFormatContext *fmt = ffrf_get_fmt(self);
-	return rb_str_new2(fmt->title);
+	AVDictionaryEntry *tag = av_dict_get(fmt->metadata, key, NULL, 0);
+	return (tag && *tag->value) ? rb_str_new2(tag->value) : Qnil;
 }
 
-/* Returns the author string. */
-static VALUE ffrf_author(VALUE self)
+static VALUE ffrf_get_metadata_int(VALUE self, const char *key)
 {
 	AVFormatContext *fmt = ffrf_get_fmt(self);
-	return rb_str_new2(fmt->author);
+	AVDictionaryEntry *tag = av_dict_get(fmt->metadata, key, NULL, 0);
+
+	if (tag)
+	{
+		int value = atoi(tag->value);
+		if (value != 0) return INT2NUM(value);
+	}
+
+	return Qnil;
+}
+
+#define METADATA_STR(key) ffrf_get_metadata_str(self, # key)
+#define METADATA_INT(key) ffrf_get_metadata_int(self, # key)
+
+#else
+
+static VALUE ffrf_get_metadata_str(char* value)
+{
+	return (value && *value) ? rb_str_new2(value) : Qnil;
+}
+
+static VALUE ffrf_get_metadata_int(int value)
+{
+	return value != 0 ? INT2NUM(value) : Qnil;
+}
+
+#define METADATA_STR(key) ffrf_get_metadata_str(ffrf_get_fmt(self)->key)
+#define METADATA_INT(key) ffrf_get_metadata_int(ffrf_get_fmt(self)->key)
+
+#endif
+
+/* Returns the title string. */
+static VALUE ffrf_title(VALUE self)
+{
+	return METADATA_STR(title);
+}
+
+/* Returns the artist/author string. */
+static VALUE ffrf_artist(VALUE self)
+{
+#ifdef HAVE_AV_DICT_GET
+	return METADATA_STR(artist);
+#else
+	return METADATA_STR(author);
+#endif
 }
 
 /* Returns the copyright string. */
 static VALUE ffrf_copyright(VALUE self)
 {
-	AVFormatContext *fmt = ffrf_get_fmt(self);
-	return rb_str_new2(fmt->copyright);
+	return METADATA_STR(copyright);
 }
 
 /* Returns the comment string. */
 static VALUE ffrf_comment(VALUE self)
 {
-	AVFormatContext *fmt = ffrf_get_fmt(self);
-	return rb_str_new2(fmt->comment);
+	return METADATA_STR(comment);
 }
 
 /* Returns the album string. */
 static VALUE ffrf_album(VALUE self)
 {
-	AVFormatContext *fmt = ffrf_get_fmt(self);
-	return rb_str_new2(fmt->album);
+	return METADATA_STR(album);
 }
 
 /* Returns the genre string. */
 static VALUE ffrf_genre(VALUE self)
 {
-	AVFormatContext *fmt = ffrf_get_fmt(self);
-	return rb_str_new2(fmt->genre);
+	return METADATA_STR(genre);
 }
 
 /* Returns the year. */
 static VALUE ffrf_year(VALUE self)
 {
-	AVFormatContext *fmt = ffrf_get_fmt(self);
-	return INT2NUM(fmt->year);
+	return METADATA_INT(year);
 }
 
 /* Returns the track number. */
 static VALUE ffrf_track(VALUE self)
 {
-	AVFormatContext *fmt = ffrf_get_fmt(self);
-	return INT2NUM(fmt->track);
+	return METADATA_INT(track);
 }
 
 /* Returns the duration in seconds as a float. */
@@ -157,10 +201,18 @@ static VALUE ffrf_streams(VALUE self)
 
 			switch (fmt->streams[i]->codec->codec_type)
 			{
+#ifdef HAVE_CONST_AVMEDIA_TYPE_UNKNOWN
+				case AVMEDIA_TYPE_VIDEO:
+#else
 				case CODEC_TYPE_VIDEO:
+#endif
 					rb_ary_push(streams, rb_class_new_instance(2, args, cFFrubyVideoStream));
 					break;
+#ifdef HAVE_CONST_AVMEDIA_TYPE_UNKNOWN
+				case AVMEDIA_TYPE_AUDIO:
+#else
 				case CODEC_TYPE_AUDIO:
+#endif
 					rb_ary_push(streams, rb_class_new_instance(2, args, cFFrubyAudioStream));
 					break;
 				default:
@@ -183,7 +235,7 @@ static VALUE ffrf_av_streams(VALUE self, VALUE klass)
 	typed_streams = rb_ary_new();
 	Check_Type(streams, T_ARRAY);
 
-	for (i = 0; i < RARRAY(streams)->len; i++)
+	for (i = 0; i < RARRAY_LEN(streams); i++)
 	{
 		if (rb_obj_is_kind_of((stream = rb_ary_entry(streams, i)), klass))
 			rb_ary_push(typed_streams, stream);
@@ -212,13 +264,17 @@ static VALUE ffrf_initialize(VALUE self, VALUE filename)
 {
 	size_t len;
 	char* msg;
-	AVFormatContext *fmt;
 	VALUE exception;
+	AVFormatContext *fmt = NULL;
 
 	VALUE filename_str = rb_funcall(filename, rb_intern("to_s"), 0);
-    char* filename_ptr = RSTRING(filename_str)->ptr;
+	char* filename_ptr = RSTRING_PTR(filename_str);
 
+#ifdef HAVE_AVFORMAT_OPEN_INPUT
+	if (avformat_open_input(&fmt, filename_ptr, NULL, NULL) != 0)
+#else
 	if (av_open_input_file(&fmt, filename_ptr, NULL, 0, NULL) != 0)
+#endif
 	{
 		len = strlen("Cannot open file !") + strlen(filename_ptr) + 1;
 		msg = ALLOC_N(char, len);
@@ -228,7 +284,11 @@ static VALUE ffrf_initialize(VALUE self, VALUE filename)
 		rb_exc_raise(exception);
 	}
 
+#ifdef HAVE_AVFORMAT_FIND_STREAM_INFO
+	if (avformat_find_stream_info(fmt, NULL) < 0)
+#else
 	if (av_find_stream_info(fmt) < 0)
+#endif
 	{
 		len = strlen("Problem reading file !") + strlen(filename_ptr) + 1;
 		msg = ALLOC_N(char, len);
@@ -252,7 +312,7 @@ void Init_ffrf()
 	rb_define_alloc_func(cFFrubyFile, ffrf_alloc);
 	rb_define_method(cFFrubyFile, "initialize", ffrf_initialize, 1);
 	rb_define_method(cFFrubyFile, "title", ffrf_title, 0);
-	rb_define_method(cFFrubyFile, "author", ffrf_author, 0);
+	rb_define_method(cFFrubyFile, "artist", ffrf_artist, 0);
 	rb_define_method(cFFrubyFile, "copyright", ffrf_copyright, 0);
 	rb_define_method(cFFrubyFile, "comment", ffrf_comment, 0);
 	rb_define_method(cFFrubyFile, "album", ffrf_album, 0);
@@ -265,4 +325,5 @@ void Init_ffrf()
 	rb_define_method(cFFrubyFile, "streams", ffrf_streams, 0);
 	rb_define_method(cFFrubyFile, "video_streams", ffrf_video_streams, 0);
 	rb_define_method(cFFrubyFile, "audio_streams", ffrf_audio_streams, 0);
+	rb_define_alias(cFFrubyFile, "author", "artist");
 }

data/ext/ffruby/ffrubystream.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2010 James Le Cuirot
+ * Copyright (c) 2007-2014 James Le Cuirot
  *
  * This file is part of FFruby.
  *
@@ -50,7 +50,11 @@ static void ffrs_open_codec(AVStream* stream)
 		if ((codec = avcodec_find_decoder(stream->codec->codec_id)) == NULL)
 			rb_raise(rb_eIOError, "Cannot find codec!");
 
+#ifdef HAVE_AVCODEC_OPEN2
+		if (avcodec_open2(stream->codec, codec, NULL) < 0)
+#else
 		if (avcodec_open(stream->codec, codec) < 0)
+#endif
 			rb_raise(rb_eIOError, "Cannot open codec!");
 	}
 }
@@ -179,16 +183,14 @@ static VALUE ffras_sample_rate(VALUE self)
 static VALUE ffrs_initialize(VALUE self, VALUE file, VALUE index)
 {
 	AVFormatContext *fmt;
-	AVStream *stream;
 	unsigned int i = FIX2UINT(index);
 
 	Data_Get_Struct(file, AVFormatContext, fmt);
 
-	if (i < 0 || i >= fmt->nb_streams)
+	if (i >= fmt->nb_streams)
 		rb_raise(rb_eIndexError, "Stream index out of range!");
 
 	DATA_PTR(self) = fmt->streams[i];
-	stream = ffrs_get_stream(self);
 
 	return self;
 }

data/ffruby.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name         = "ffruby"
+  s.version      = File.read(File.expand_path("../VERSION", __FILE__)).chomp
+  s.license      = "LGPL-2.1"
+  s.authors      = ["James Le Cuirot"]
+  s.email        = "chewi@aura-online.co.uk"
+  s.homepage     = "https://github.com/chewi/ffruby"
+  s.summary      = "A Ruby interface to FFmpeg's libavformat and libavcodec."
+  s.description  = "A Ruby interface to FFmpeg's libavformat and libavcodec. It allows you to query metadata from a wide variety of media files through some simple classes."
+  s.requirements = "FFmpeg libraries and also development headers if building."
+
+  s.extensions       = ["ext/ffruby/extconf.rb"]
+  s.extra_rdoc_files = `git ls-files \*.{c,h,rdoc}`.split("\n")
+  s.files            = `git ls-files`.split("\n")
+
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rake-compiler"
+end

metadata

@@ -1,36 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ffruby
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+version: !ruby/object:Gem::Version
+  version: 0.2.3
 platform: ruby
-authors: 
+authors:
 - James Le Cuirot
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-29 00:00:00 +00:00
-default_executable: 
-dependencies: []
-
-description: A Ruby interface to FFmpeg's libavformat and libavcodec. It allows you to query metadata from a wide variety of media files through some simple classes.
+date: 2014-11-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A Ruby interface to FFmpeg's libavformat and libavcodec. It allows you
+  to query metadata from a wide variety of media files through some simple classes.
 email: chewi@aura-online.co.uk
 executables: []
-
-extensions: 
+extensions:
 - ext/ffruby/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - ext/ffruby/ffruby.c
+- ext/ffruby/ffruby.h
 - ext/ffruby/ffrubyfile.c
 - ext/ffruby/ffrubystream.c
-files: 
+files:
+- ".gitignore"
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -40,39 +76,30 @@ files:
 - ext/ffruby/ffruby.h
 - ext/ffruby/ffrubyfile.c
 - ext/ffruby/ffrubystream.c
-has_rdoc: true
-homepage: http://rubyforge.org/projects/ffruby/
-licenses: 
+- ffruby.gemspec
+homepage: https://github.com/chewi/ffruby
+licenses:
 - LGPL-2.1
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - FFmpeg libraries and also development headers if building.
-rubyforge_project: ffruby
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby interface to FFmpeg's libavformat and libavcodec.
 test_files: []
-