hornetseye-ffmpeg 0.11.0 → 0.11.2

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-ffmpeg'
-PKG_VERSION = '0.11.0'
+PKG_VERSION = '0.11.2'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -46,7 +46,7 @@ desc 'Compile Ruby extension (default)'
 task :all => [ SO_FILE ]
 
 file SO_FILE => OBJ do |t|
-   sh "#{CXX} -shared -o #{t.name} #{OBJ} -lavformat -lswscale #{$LIBRUBYARG}"
+   sh "#{CXX} -shared -o #{t.name} #{OBJ} -lavformat -lavcodec -lavutil -lswscale #{$LIBRUBYARG}"
 end
 
 task :test => [ SO_FILE ]
@@ -80,7 +80,7 @@ def check_program
   f_base_name = 'rakeconf'
   begin
     File.open( "#{f_base_name}.cc", 'w' ) { |f| yield f }
-    `#{CXX} -S #{$CXXFLAGS} -c -o #{f_base_name}.o #{f_base_name}.cc 2>&1 >> rake.log`
+    `#{CXX} #{$CXXFLAGS} -c -o #{f_base_name}.o #{f_base_name}.cc 2>&1 >> rake.log`
     $?.exitstatus == 0
   ensure
     File.delete *Dir.glob( "#{f_base_name}.*" )

data/ext/avinput.cc

@@ -16,7 +16,6 @@
 #ifndef NDEBUG
 #include <iostream>
 #endif
-#include <malloc.h>
 #include "avinput.hh"
 
 #if !defined(INT64_C)
@@ -43,9 +42,9 @@ AVInput::AVInput( const string &mrl, bool audio ) throw (Error):
     ERRORMACRO( err >= 0, Error, , "Error finding stream info for file \""
                 << mrl << "\": " << strerror( errno ) );
     for ( unsigned int i=0; i<m_ic->nb_streams; i++ ) {
-      if ( m_ic->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
+      if ( m_ic->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
         m_videoStream = i;
-      if ( audio && m_ic->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO )
+      if ( audio && m_ic->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
           m_audioStream = i;
     };
 #ifndef NDEBUG
@@ -137,8 +136,8 @@ void AVInput::readAV(void) throw (Error)
   while ( av_read_frame( m_ic, &packet ) >= 0 ) {
     if ( packet.stream_index == m_videoStream ) {
       int frameFinished;
-      int err = avcodec_decode_video( m_videoDec, m_avFrame, &frameFinished,
-                                      packet.data, packet.size );
+      int err = avcodec_decode_video2( m_videoDec, m_avFrame, &frameFinished,
+                                       &packet );
       ERRORMACRO( err >= 0, Error, ,
                   "Error decoding video frame of video \"" << m_mrl << "\"" );
       if ( firstPacketPts == AV_NOPTS_VALUE ) firstPacketPts = packet.pts;
@@ -174,20 +173,22 @@ void AVInput::readAV(void) throw (Error)
       m_audioFrame.reset();
       unsigned char *data = packet.data;
       int size = packet.size;
-      while ( size > 0 ) {
-        short int *buffer =
-          (short int *)memalign( 16, AVCODEC_MAX_AUDIO_FRAME_SIZE * 3 / 2 );
+      while ( packet.size > 0 ) {
+        short int *buffer;
+        ERRORMACRO(posix_memalign((void **)&buffer, 16,
+                                  AVCODEC_MAX_AUDIO_FRAME_SIZE * 3 / 2) == 0, Error, ,
+                   "Error allocating aligned memory");
         buffer[ AVCODEC_MAX_AUDIO_FRAME_SIZE * 3 / 4 - 1 ] = '\000';
         int bufSize = AVCODEC_MAX_AUDIO_FRAME_SIZE * 3 / 2;
-        int len = avcodec_decode_audio2( m_audioDec, buffer, &bufSize, data, size );
+        int len = avcodec_decode_audio3( m_audioDec, buffer, &bufSize, &packet );
         if ( len < 0 ) {
           free( buffer );
           m_audioFrame.reset();
           ERRORMACRO( false, Error, , "Error decoding audio frame of video \""
                       << m_mrl << "\"" );
         };
-        data += len;
-        size -= len;
+        packet.data += len;
+        packet.size -= len;
         if ( bufSize > 0 ) {
           if ( m_audioFrame.get() ) {
             SequencePtr extended( new Sequence( m_audioFrame->size() + bufSize ) );
@@ -201,6 +202,8 @@ void AVInput::readAV(void) throw (Error)
         };
         free( buffer );
       };
+      packet.data = data;
+      packet.size = size;
       av_free_packet( &packet );
       if ( m_audioFrame.get() ) break;
     } else

data/ext/avoutput.cc

@@ -17,6 +17,7 @@
 #ifndef NDEBUG
 #include <iostream>
 #endif
+#include <libavutil/mathematics.h>
 #include "avoutput.hh"
 
 #if !defined(INT64_C)
@@ -42,8 +43,8 @@ AVOutput::AVOutput( const string &mrl, int videoBitRate, int width, int height,
 {
   try {
     AVOutputFormat *format;
-    format = guess_format( NULL, mrl.c_str(), NULL );
-    if ( format == NULL ) format = guess_format( "mpeg", NULL, NULL );
+    format = av_guess_format( NULL, mrl.c_str(), NULL );
+    if ( format == NULL ) format = av_guess_format( "mpeg", NULL, NULL );
     ERRORMACRO( format != NULL, Error, ,
                 "Could not find suitable output format for \"" << mrl << "\""  );
 #ifdef HAVE_LIBAVFORMAT_ALLOC_CONTEXT
@@ -62,7 +63,7 @@ AVOutput::AVOutput( const string &mrl, int videoBitRate, int width, int height,
     m_videoStream->sample_aspect_ratio.den = aspectRatioDen;
     AVCodecContext *c = m_videoStream->codec;
     c->codec_id = videoCodec != CODEC_ID_NONE ? videoCodec : format->video_codec;
-    c->codec_type = CODEC_TYPE_VIDEO;
+    c->codec_type = AVMEDIA_TYPE_VIDEO;
     c->bit_rate = videoBitRate;
     c->width = width;
     c->height = height;
@@ -79,7 +80,7 @@ AVOutput::AVOutput( const string &mrl, int videoBitRate, int width, int height,
       ERRORMACRO( m_audioStream != NULL, Error, , "Could not allocate audio stream" );
       AVCodecContext *c = m_audioStream->codec;
       c->codec_id = audioCodec != CODEC_ID_NONE ? audioCodec : format->audio_codec;
-      c->codec_type = CODEC_TYPE_AUDIO;
+      c->codec_type = AVMEDIA_TYPE_AUDIO;
       c->bit_rate = audioBitRate;
       c->sample_rate = sampleRate;
       c->channels = channels;
@@ -273,7 +274,7 @@ void AVOutput::writeVideo( FramePtr frame ) throw (Error)
         packet.pts = av_rescale_q( c->coded_frame->pts, c->time_base,
                                    m_videoStream->time_base );
       if ( c->coded_frame->key_frame )
-        packet.flags |= PKT_FLAG_KEY;
+        packet.flags |= AV_PKT_FLAG_KEY;
       packet.stream_index = m_videoStream->index;
       packet.data = (uint8_t *)m_videoBuf;
       packet.size = packetSize;
@@ -303,7 +304,7 @@ void AVOutput::writeAudio( SequencePtr frame ) throw (Error)
     if ( c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE )
       packet.pts = av_rescale_q( c->coded_frame->pts, c->time_base,
                                  m_audioStream->time_base );
-    packet.flags |= PKT_FLAG_KEY;
+    packet.flags |= AV_PKT_FLAG_KEY;
     packet.stream_index = m_audioStream->index;
     packet.data = (uint8_t *)m_audioBuf;
     packet.size = packetSize;
@@ -444,8 +445,6 @@ VALUE AVOutput::registerRubyClass( VALUE rbModule )
                    INT2FIX( CODEC_ID_VIXL ) );
   rb_define_const( cRubyClass, "CODEC_ID_QPEG",
                    INT2FIX( CODEC_ID_QPEG ) );
-  rb_define_const( cRubyClass, "CODEC_ID_XVID",
-                   INT2FIX( CODEC_ID_XVID ) );
   rb_define_const( cRubyClass, "CODEC_ID_PNG",
                    INT2FIX( CODEC_ID_PNG ) );
   rb_define_const( cRubyClass, "CODEC_ID_PPM",

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hornetseye-ffmpeg
 version: !ruby/object:Gem::Version 
+  hash: 55
   prerelease: 
-  version: 0.11.0
+  segments: 
+  - 0
+  - 11
+  - 2
+  version: 0.11.2
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 Z
+date: 2012-05-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: malloc
@@ -20,6 +25,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
         version: "1.2"
   type: :runtime
   version_requirements: *id001
@@ -31,6 +40,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 0
+        - 23
         version: "0.23"
   type: :runtime
   version_requirements: *id002
@@ -42,6 +55,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 11
         version: "0.11"
   type: :runtime
   version_requirements: *id003
@@ -53,6 +70,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -97,17 +117,23 @@ 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 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: hornetseye
-rubygems_version: 1.8.5
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Read/write video frames using libffmpeg