test

Author: MassimoDeLuca

lib/ffmpeg/transcoder.rb

@@ -160,8 +160,14 @@ def pre_encode_if_necessary
 
     def determine_audio_for_pre_encode(path)
       local_movie = Movie.new(path)
-      # If there's a local audio stream, use that
-      return '-map "0:a"' if local_movie.audio_streams.any?
+      # If there's a local audio stream, use that. Map only decodable streams explicitly -
+      # using -map "0:a" would include APAC (Apple Positional Audio Codec) from iPhone
+      # spatial audio, which FFmpeg cannot decode. audio_streams already excludes these.
+      if local_movie.audio_streams.any?
+        puts "|| local_movie.audio_streams: #{local_movie.audio_streams}"
+        puts "|| local_movie.audio_streams inspect: #{local_movie.audio_streams.inspect}"
+        return local_movie.audio_streams.map { |s| "-map \"0:#{s[:index]}\"" }.join(' ')
+      end
       # Otherwise, use a silent audio source
       # | aevalsrc=0 will generate a silent audio source
       # | -shortest will make sure that the output is the duration of the shortest input (meaning the real source input)

spec/ffmpeg/transcoder_spec.rb

@@ -348,7 +348,8 @@ module FFMPEG
           transcoder = Transcoder.new(movie_with_multiple_dimension_inputs, output_path, EncodingOptions.new)
 
           expect(Open3).to receive(:popen3).exactly(2).times # prevent ffprobe calls from being evaluated (check_frame_resolutions)
-          expect(Open3).to receive(:popen3).twice.with match(/.*\[0\:v\]scale\=854\:480.*pad\=854\:480\:\(ow\-iw\)\/2\:\(oh\-ih\)\/2\:color\=black.*\-map \"0\:a\".*/)
+          # Maps decodable audio streams by index (excludes APAC); awesome_widescreen has 1 audio stream
+          expect(Open3).to receive(:popen3).twice.with match(/.*\[0\:v\]scale\=854\:480.*pad\=854\:480\:\(ow\-iw\)\/2\:\(oh\-ih\)\/2\:color\=black.*\-map \"0\:\d+\".*/)
 
           transcoder.send(:pre_encode_if_necessary)
         end
@@ -360,7 +361,8 @@ module FFMPEG
           # Match silent audio fill
           expect(Open3).to receive(:popen3).once.with match(/.*\[0\:v\]scale\=960\:540.*pad\=960\:540\:\(ow\-iw\)\/2\:\(oh\-ih\)\/2\:color\=black.*\-map \"\[a\]\".*/)
           # Retain "real" audio
-          expect(Open3).to receive(:popen3).once.with match(/.*\[0\:v\]scale\=960\:540.*pad\=960\:540\:\(ow\-iw\)\/2\:\(oh\-ih\)\/2\:color\=black.*\-map \"0\:a\".*/)
+          # Retain "real" audio - maps decodable audio streams by index
+          expect(Open3).to receive(:popen3).once.with match(/.*\[0\:v\]scale\=960\:540.*pad\=960\:540\:\(ow\-iw\)\/2\:\(oh\-ih\)\/2\:color\=black.*\-map \"0\:\d+\".*/)
 
           transcoder.send(:pre_encode_if_necessary)
         end