hornetseye-ffmpeg 0.3.0 → 0.3.1

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/packagetask'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-ffmpeg'
-PKG_VERSION = '0.3.0'
+PKG_VERSION = '0.3.1'
 CXX = ENV[ 'CXX' ] || 'g++'
 STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -19,7 +19,7 @@ PKG_FILES = [ 'Rakefile', 'README.md', 'COPYING', '.document' ] +
             RB_FILES + CC_FILES + HH_FILES + TS_FILES + TC_FILES
 BIN_FILES = [ 'README.md', 'COPYING', '.document', SO_FILE ] +
             RB_FILES + TS_FILES + TC_FILES
-SUMMARY = %q{Read video frames using libffmpeg}
+SUMMARY = %q{Read/write video frames using libffmpeg}
 DESCRIPTION = %q{This Ruby extension defines the class Hornetseye::AVInput for reading frames from video files.}
 AUTHOR = %q{Jan Wedekind}
 EMAIL = %q{jan@wedesoft.de}
@@ -113,8 +113,8 @@ begin
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.1' ]
-    s.add_dependency %<multiarray>, [ '~> 0.5' ]
-    s.add_dependency %<hornetseye-frame>, [ '~> 0.1' ]
+    s.add_dependency %<multiarray>, [ '~> 0.6' ]
+    s.add_dependency %<hornetseye-frame>, [ '~> 0.2' ]
     s.add_development_dependency %q{rake}
   end
   GEM_SOURCE = "#{PKG_NAME}-#{PKG_VERSION}.gem"
@@ -136,8 +136,8 @@ begin
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.1' ]
-    s.add_dependency %<multiarray>, [ '~> 0.5' ]
-    s.add_dependency %<hornetseye-frame>, [ '~> 0.1' ]
+    s.add_dependency %<multiarray>, [ '~> 0.6' ]
+    s.add_dependency %<hornetseye-frame>, [ '~> 0.2' ]
   end
   GEM_BINARY = "#{PKG_NAME}-#{PKG_VERSION}-#{$BINSPEC.platform}.gem"
   desc "Build the gem file #{GEM_SOURCE}"
@@ -173,7 +173,7 @@ file 'ext/avinput.o' => [ 'ext/avinput.cc', 'ext/avinput.hh', 'ext/error.hh',
 file 'ext/avoutput.o' => [ 'ext/avoutput.cc', 'ext/avoutput.hh', 'ext/error.hh',
                            'ext/frame.hh' ]
 file 'ext/frame.o' => [ 'ext/frame.cc', 'ext/frame.hh' ]
-file 'ext/init.o' => [ 'ext/init.cc', 'ext/avinput.hh' ]
+file 'ext/init.o' => [ 'ext/init.cc', 'ext/avinput.hh', 'ext/avoutput.hh' ]
 
 CLEAN.include 'ext/*.o'
 CLOBBER.include SO_FILE, 'doc', '.yardoc'

data/ext/frame.cc

@@ -17,21 +17,31 @@
 
 using namespace std;
 
-Frame::Frame( const char *typecode, int width, int height, char *data ):
+Frame::Frame( const string &typecode, int width, int height, char *data ):
   m_frame( Qnil )
 {
   VALUE mModule = rb_define_module( "Hornetseye" );
   VALUE cMalloc = rb_define_class_under( mModule, "Malloc", rb_cObject );
   VALUE cFrame = rb_define_class_under( mModule, "Frame", rb_cObject );
-  VALUE rbSize = rb_funcall( cFrame, rb_intern( "typesize" ), 3,
-                             rb_const_get( mModule, rb_intern( typecode ) ),
+  VALUE rbSize = rb_funcall( cFrame, rb_intern( "storage_size" ), 3,
+                             rb_const_get( mModule, rb_intern( typecode.c_str() ) ),
                              INT2NUM( width ), INT2NUM( height ) );
-  VALUE rbMemory = Data_Wrap_Struct( cMalloc, 0, 0, (void *)data );
-  rb_ivar_set( rbMemory, rb_intern( "@size" ), rbSize );
+  VALUE rbMemory;
+  if ( data != NULL ) {
+    rbMemory = Data_Wrap_Struct( cMalloc, 0, 0, (void *)data );
+    rb_ivar_set( rbMemory, rb_intern( "@size" ), rbSize );
+  } else
+    rbMemory = rb_funcall( cMalloc, rb_intern( "new" ), 1, rbSize );
   m_frame = rb_funcall( cFrame, rb_intern( "import" ), 4,
-                        rb_const_get( mModule, rb_intern( typecode ) ),
-                        INT2NUM( width ), INT2NUM( height ),
-                        rbMemory );
+                        rb_const_get( mModule, rb_intern( typecode.c_str() ) ),
+                        INT2NUM( width ), INT2NUM( height ), rbMemory );
+}
+
+string Frame::typecode(void)
+{
+  VALUE rbString = rb_funcall( rb_funcall( m_frame, rb_intern( "typecode" ), 0 ),
+                               rb_intern( "to_s" ), 0 );
+  return StringValuePtr( rbString );
 }
 
 int Frame::width(void)
@@ -46,7 +56,7 @@ int Frame::height(void)
 
 char *Frame::data(void)
 {
-  VALUE rbMemory = rb_iv_get( m_frame, "@memory" );
+  VALUE rbMemory = rb_funcall( m_frame, rb_intern( "memory" ), 0 );
   char *ptr;
   Data_Get_Struct( rbMemory, char, ptr );
   return ptr;

data/ext/frame.hh

@@ -18,13 +18,15 @@
 
 #include <boost/smart_ptr.hpp>
 #include <ruby.h>
+#include <string>
 
 class Frame
 {
 public:
-  Frame( const char *typecode, int width, int height, char *data );
+  Frame( const std::string &typecode, int width, int height, char *data = NULL );
   Frame( VALUE rbFrame ): m_frame( rbFrame ) {}
   virtual ~Frame(void) {}
+  std::string typecode(void);
   int width(void);
   int height(void);
   char *data(void);

data/lib/hornetseye-ffmpeg/avinput.rb

@@ -1,4 +1,4 @@
-# hornetseye-frame - Colourspace conversions and compression
+# hornetseye-ffmpeg - Read/write video frames using libffmpeg
 # Copyright (C) 2010 Jan Wedekind
 #
 # This program is free software: you can redistribute it and/or modify

data/lib/hornetseye-ffmpeg/avoutput.rb

@@ -1,4 +1,4 @@
-# hornetseye-frame - Colourspace conversions and compression
+# hornetseye-ffmpeg - Read/write video frames using libffmpeg
 # Copyright (C) 2010 Jan Wedekind
 #
 # This program is free software: you can redistribute it and/or modify

data/lib/hornetseye_ffmpeg_ext.rb

@@ -1,4 +1,4 @@
-# hornetseye-frame - Colourspace conversions and compression
+# hornetseye-ffmpeg - Read/write video frames using libffmpeg
 # Copyright (C) 2010 Jan Wedekind
 #
 # This program is free software: you can redistribute it and/or modify

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -41,8 +41,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
-        version: "0.5"
+        - 6
+        version: "0.6"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        version: "0.1"
+        - 2
+        version: "0.2"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -128,6 +128,6 @@ rubyforge_project: hornetseye
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Read video frames using libffmpeg
+summary: Read/write video frames using libffmpeg
 test_files: []