From cf1c48478d1f48d763c3bee92d6bc6cfb3e63dba Mon Sep 17 00:00:00 2001 From: George Claghorn Date: Sat, 20 Jan 2018 14:47:04 -0500 Subject: Cope with videos with undefined display aspect ratios --- .../lib/active_storage/analyzer/video_analyzer.rb | 8 ++++++-- activestorage/test/analyzer/video_analyzer_test.rb | 9 +++++++++ .../video_with_undefined_display_aspect_ratio.mp4 | Bin 0 -> 128737 bytes 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 activestorage/test/fixtures/files/video_with_undefined_display_aspect_ratio.mp4 diff --git a/activestorage/lib/active_storage/analyzer/video_analyzer.rb b/activestorage/lib/active_storage/analyzer/video_analyzer.rb index f0d9baa199..656e362187 100644 --- a/activestorage/lib/active_storage/analyzer/video_analyzer.rb +++ b/activestorage/lib/active_storage/analyzer/video_analyzer.rb @@ -55,8 +55,12 @@ module ActiveStorage def display_aspect_ratio if descriptor = video_stream["display_aspect_ratio"] - terms = descriptor.split(":", 2).collect(&:to_i) - terms if terms.count == 2 && terms.min >= 0 + if terms = descriptor.split(":", 2) + numerator = Integer(terms[0]) + denominator = Integer(terms[1]) + + [numerator, denominator] unless numerator == 0 + end end end diff --git a/activestorage/test/analyzer/video_analyzer_test.rb b/activestorage/test/analyzer/video_analyzer_test.rb index fa65877de3..2612006551 100644 --- a/activestorage/test/analyzer/video_analyzer_test.rb +++ b/activestorage/test/analyzer/video_analyzer_test.rb @@ -37,6 +37,15 @@ class ActiveStorage::Analyzer::VideoAnalyzerTest < ActiveSupport::TestCase assert_equal [16, 9], metadata[:display_aspect_ratio] end + test "analyzing a video with an undefined display aspect ratio" do + blob = create_file_blob(filename: "video_with_undefined_display_aspect_ratio.mp4", content_type: "video/mp4") + metadata = extract_metadata_from(blob) + + assert_equal 640, metadata[:width] + assert_equal 480, metadata[:height] + assert_nil metadata[:display_aspect_ratio] + end + test "analyzing a video without a video stream" do blob = create_file_blob(filename: "video_without_video_stream.mp4", content_type: "video/mp4") metadata = extract_metadata_from(blob) diff --git a/activestorage/test/fixtures/files/video_with_undefined_display_aspect_ratio.mp4 b/activestorage/test/fixtures/files/video_with_undefined_display_aspect_ratio.mp4 new file mode 100644 index 0000000000..eb354e756f Binary files /dev/null and b/activestorage/test/fixtures/files/video_with_undefined_display_aspect_ratio.mp4 differ -- cgit v1.2.3