streamio-ffmpeg 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d040320bc3f959563977e37be82de8c7dcc0b6dd
-  data.tar.gz: f3074b7953107d34c7560efc1be4ae5ab104341d
+  metadata.gz: 08518b33cf87b6865e01d8b69f7f0cd00cbd97c4
+  data.tar.gz: 790f1693d24204bc9e666d1c9ea8d78fea404edd
 SHA512:
-  metadata.gz: aedc131eef3f61197c5db195f8ed3f22dbd8dff133b47f8b3cdfc9c1c64640fee671cb087011e27a3d795e95d7764d431c6212ebcd763f0fa09c993a6de8bafe
-  data.tar.gz: 0ceaeb9d374541e9de8d1b70623632913ff69d60a39c8482fe7a28cc9a56be5bd983a7fa4414117045791355ebd7a2aa1a6bdf402a7b76b2571c0b068b31174c
+  metadata.gz: 57178e111057a58fe46314656a9d7da0c2060b70d6d03b54972d600fb086bfb07495d7628ac0158cdfbe336d58b61547c6b162888787e41b2b1dc4a41e28385b
+  data.tar.gz: fb5c8b00b1906ecd7790a42cba66acf9baf699e2137d62a3dc68f6696219933e6ab7dc17f8051300418f69a7c38ee955ddc76b9dc3cc8c249d2802d2ef3d4281

data/CHANGELOG

@@ -1,6 +1,12 @@
 == Master
 
-Current with 3.0.1
+Current with 3.0.2
+
+== 3.0.2 2016-11-18
+
+Improvements:
+* Issue #153 Adds support for multiple audio streams
+* Issue #150 Does not trust reported SAR/DAR as these may not be defined per https://trac.ffmpeg.org/ticket/3798
 
 == 3.0.1 2016-11-10
 

data/README.md

@@ -1,7 +1,9 @@
 Streamio FFMPEG
 ===============
 
-[![Code Climate](https://codeclimate.com/github/streamio/streamio-ffmpeg/badges/gpa.svg)](https://codeclimate.com/github/streamio/streamio-ffmpeg)
+[![Build Status](https://travis-ci.org/bikeath1337/streamio-ffmpeg.svg?branch=master)](https://travis-ci.org/bikeath1337/streamio-ffmpeg)
+[![Code Climate](https://codeclimate.com/github/bikeath1337/streamio-ffmpeg/badges/gpa.svg)](https://codeclimate.com/github/bikeath1337/streamio-ffmpeg)
+[![Test Coverage](https://codeclimate.com/github/bikeath1337/streamio-ffmpeg/badges/coverage.svg)](https://codeclimate.com/github/bikeath1337/streamio-ffmpeg/coverage)
 
 Simple yet powerful wrapper around the ffmpeg command for reading metadata and transcoding movies.
 
@@ -62,6 +64,9 @@ movie.audio_codec # "aac"
 movie.audio_sample_rate # 44100
 movie.audio_channels # 2
 
+# Multiple audio streams
+movie.audio_streams[0] # "aac, 44100 Hz, stereo, s16, 75 kb/s" (raw audio stream info)
+
 movie.valid? # true (would be false if ffmpeg fails to read the movie)
 ```
 

data/lib/ffmpeg/movie.rb

@@ -6,7 +6,7 @@ module FFMPEG
   class Movie
     attr_reader :path, :duration, :time, :bitrate, :rotation, :creation_time
     attr_reader :video_stream, :video_codec, :video_bitrate, :colorspace, :width, :height, :sar, :dar, :frame_rate
-    attr_reader :audio_stream, :audio_codec, :audio_bitrate, :audio_sample_rate, :audio_channels
+    attr_reader :audio_streams, :audio_stream, :audio_codec, :audio_bitrate, :audio_sample_rate, :audio_channels, :audio_tags
     attr_reader :container
     attr_reader :metadata, :format_tags
 
@@ -97,15 +97,28 @@ module FFMPEG
                       end
         end
 
-        # TODO: Handle multiple audio codecs
-        audio_stream = audio_streams.first
+        @audio_streams = audio_streams.map do |stream|
+          {
+            :index => stream[:index],
+            :channels => stream[:channels].to_i,
+            :codec_name => stream[:codec_name],
+            :sample_rate => stream[:sample_rate].to_i,
+            :bitrate => stream[:bit_rate].to_i,
+            :channel_layout => stream[:channel_layout],
+            :tags => stream[:streams],
+            :overview => "#{stream[:codec_name]} (#{stream[:codec_tag_string]} / #{stream[:codec_tag]}), #{stream[:sample_rate]} Hz, #{stream[:channel_layout]}, #{stream[:sample_fmt]}, #{stream[:bit_rate]} bit/s"
+          }
+        end
+
+        audio_stream = @audio_streams.first
         unless audio_stream.nil?
-          @audio_channels = audio_stream[:channels].to_i
+          @audio_channels = audio_stream[:channels]
           @audio_codec = audio_stream[:codec_name]
-          @audio_sample_rate = audio_stream[:sample_rate].to_i
-          @audio_bitrate = audio_stream[:bit_rate].to_i
+          @audio_sample_rate = audio_stream[:sample_rate]
+          @audio_bitrate = audio_stream[:bitrate]
           @audio_channel_layout = audio_stream[:channel_layout]
-          @audio_stream = "#{audio_codec} (#{audio_stream[:codec_tag_string]} / #{audio_stream[:codec_tag]}), #{audio_sample_rate} Hz, #{audio_channel_layout}, #{audio_stream[:sample_fmt]}, #{audio_bitrate} bit/s"
+          @audio_tags = audio_stream[:audio_tags]
+          @audio_stream = audio_stream[:overview]
         end
 
       end
@@ -193,17 +206,18 @@ module FFMPEG
 
     protected
     def aspect_from_dar
-      return nil unless dar
-      w, h = dar.split(":")
-      aspect = (@rotation==nil) || (@rotation==180)? (w.to_f / h.to_f):(h.to_f / w.to_f)
-      aspect.zero? ? nil : aspect
+      calculate_aspect(dar)
     end
 
     def aspect_from_sar
-      return nil unless sar
-      w, h = sar.split(":")
-      aspect = (@rotation==nil) || (@rotation==180)? (w.to_f / h.to_f):(h.to_f / w.to_f)
-      aspect.zero? ? nil : aspect
+      calculate_aspect(sar)
+    end
+
+    def calculate_aspect(ratio)
+      return nil unless ratio
+      w, h = ratio.split(':')
+      return nil if w == '0' || h == '0'
+      @rotation.nil? || (@rotation == 180) ? (w.to_f / h.to_f) : (h.to_f / w.to_f)
     end
 
     def aspect_from_dimensions

data/lib/ffmpeg/version.rb

@@ -1,3 +1,3 @@
 module FFMPEG
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: streamio-ffmpeg
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Rackfish AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json