mediainfo 0.6.2 → 0.7.0

data/test/mediainfo_omen_image_test.rb

@@ -59,125 +59,125 @@ class MediainfoOmenImageTest < ActiveSupport::TestCase
   end
 
   ### VIDEO
-
+=begin
   test "video   Format" do
-    assert_nil @info.video_format
+    assert_nil @info.video.format
   end
   
   test "video format profile" do
-    assert_nil @info.video_format_profile
+    assert_nil @info.video.format_profile
   end
   
   test "video format settings CABAC" do
-    assert_nil @info.video_format_settings_cabac
+    assert_nil @info.video.format_settings_cabac
   end
   
   test "video format settings ReFrames" do
-    assert_nil @info.video_format_settings_cabac
+    assert_nil @info.video.format_settings_cabac
   end
 
   test "video   Codec ID" do
-    assert_nil @info.video_codec_id
+    assert_nil @info.video.codec_id
   end
 
   test "video   Duration" do
-    assert_nil @info.video_duration
+    assert_nil @info.video.duration
   end
 
   test "video   Bit rate" do
-    assert_nil @info.video_bit_rate
+    assert_nil @info.video.bit_rate
   end
   
   test "video bit rate mode" do
-    assert_nil @info.video_bit_rate_mode
+    assert_nil @info.video.bit_rate_mode
   end
   
-  test "resolution" do
-    assert_equal "480x336", @info.resolution
+  test "frame size" do
+    assert_equal "480x336", @info.frame_size
   end
 
   test "video   Width" do
-    assert_nil @info.video_width
+    assert_nil @info.video.width
   end
 
   test "video   Height" do
-    assert_nil @info.video_height
+    assert_nil @info.video.height
   end
 
   test "video   Display aspect ratio" do
-    assert_nil @info.video_display_aspect_ratio
+    assert_nil @info.video.display_aspect_ratio
     assert_nil @info.display_aspect_ratio
   end
 
   test "video   Frame rate" do
-    assert_nil @info.video_frame_rate
+    assert_nil @info.video.frame_rate
     assert_nil @info.fps
     assert_nil @info.framerate
   end
   
   test "video frame rate mode" do
-    assert_nil @info.video_frame_rate_mode
+    assert_nil @info.video.frame_rate_mode
   end
 
   test "video   Resolution" do
-    assert_nil @info.video_resolution
+    assert_nil @info.video.resolution
   end
   
   test "video colorimetry" do
-    assert_nil @info.video_colorimetry
-    assert_nil @info.video_colorspace
+    assert_nil @info.video.colorimetry
+    assert_nil @info.video.colorspace
   end
 
   test "video   Scan type" do
-    assert_nil @info.video_scan_type
+    assert_nil @info.video.scan_type
     assert !@info.interlaced?
     assert !@info.progressive?
   end
 
   test "video   Bits/(Pixel*Frame)" do
-    assert_nil @info.video_bits_pixel_frame
+    assert_nil @info.video.bits_pixel_frame
   end
 
   test "video   Stream size" do
-    assert_nil @info.video_stream_size
+    assert_nil @info.video.stream_size
   end
 
   ### AUDIO
 
   test "audio   Format" do
-    assert_nil @info.audio_format
+    assert_nil @info.audio.format
   end
   
   test "audio Format settings, Endianness" do
-    assert_nil @info.audio_format_settings_endianness
+    assert_nil @info.audio.format_settings_endianness
   end
   
   test "audio Format settings, Sign" do
-    assert_nil @info.audio_format_settings_sign
+    assert_nil @info.audio.format_settings_sign
   end
 
   test "audio   Codec ID" do
-    assert_nil @info.audio_codec_id
+    assert_nil @info.audio.codec_id
   end
 
   test "audio   Codec ID/Info" do
-    assert_nil @info.audio_codec_info
+    assert_nil @info.audio.codec_info
   end
 
   test "audio   Duration" do
-    assert_nil @info.audio_duration
+    assert_nil @info.audio.duration
   end
 
   test "audio   Bit rate mode" do
-    assert_nil @info.audio_bit_rate_mode
+    assert_nil @info.audio.bit_rate_mode
   end
 
   test "audio   Bit rate" do
-    assert_nil @info.audio_bit_rate
+    assert_nil @info.audio.bit_rate
   end
 
   test "audio   Channel(s)" do
-    assert_nil @info.audio_channels
+    assert_nil @info.audio.channels
   end
   
   test "stereo?" do
@@ -189,46 +189,44 @@ class MediainfoOmenImageTest < ActiveSupport::TestCase
   end
 
   test "audio   Sampling rate" do
-    assert_nil @info.audio_sampling_rate
+    assert_nil @info.audio.sampling_rate
   end
 
   test "audio   Resolution" do
-    assert_nil @info.audio_resolution
+    assert_nil @info.audio.resolution
   end
 
   test "audio   Stream size" do
-    assert_nil @info.audio_stream_size
+    assert_nil @info.audio.stream_size
   end
 
   test "audio   Interleave, duration" do
-    assert_nil @info.audio_interleave_duration
+    assert_nil @info.audio.interleave_duration
   end
   
   test "audio encoded date" do
-    assert_nil @info.audio_encoded_date
+    assert_nil @info.audio.encoded_date
   end
   
   test "audio tagged date" do
-    assert_nil @info.audio_tagged_date
+    assert_nil @info.audio.tagged_date
   end
-  
+=end
   ### IMAGE
   
   test "image format" do
-    assert_equal "JPEG", @info.image_format
+    assert_equal "JPEG", @info.image.format
   end
   
   test "image width" do
-    assert_equal 480, @info.image_width
-    assert_equal 480, @info.width
+    assert_equal 480, @info.image.width
   end
   
   test "image height" do
-    assert_equal 336, @info.image_height
-    assert_equal 336, @info.height
+    assert_equal 336, @info.image.height
   end
   
   test "image resolution" do
-    assert_equal "24 bits", @info.image_resolution
+    assert_equal "24 bits", @info.image.resolution
   end
 end

data/test/mediainfo_test.rb

@@ -28,7 +28,9 @@ class MediainfoTest < ActiveSupport::TestCase
     :video_scan_type,
     :video_resolution,
     :video_colorimetry,
+    :video_standard,
     :video_format,
+    :video_format_info,
     :video_format_profile,
     :video_format_version,
     :video_format_settings_cabac,
@@ -62,8 +64,11 @@ class MediainfoTest < ActiveSupport::TestCase
     :audio_resolution,
     :audio_format,
     :audio_format_info,
+    :audio_format_profile,
     :audio_format_settings_endianness,
     :audio_format_settings_sign,
+    :audio_format_settings_sbr,
+    :audio_format_version,
     :audio_codec_id,
     :audio_codec_id_hint,
     :audio_codec_info,

data/test/mediainfo_vimeo_test.rb

@@ -62,201 +62,198 @@ class MediainfoVimeoTest < ActiveSupport::TestCase
   ### VIDEO
   
   test "video stream  id" do
-    assert_equal "0", @info.video_stream_id
+    assert_equal "0", @info.video.stream_id
   end
   
   test "video   Format" do
-    assert_equal "M-JPEG", @info.video_format
+    assert_equal "M-JPEG", @info.video.format
   end
   
   test "video format profile" do
-    assert_nil @info.video_format_profile
+    assert_nil @info.video.format_profile
   end
   
   test "video format version" do
-    assert_nil @info.video_format_version
+    assert_nil @info.video.format_version
   end
   
   test "video format settings Matrix" do
-    assert_nil @info.video_format_settings_matrix
+    assert_nil @info.video.format_settings_matrix
   end
   
   test "video format settings CABAC" do
-    assert_nil @info.video_format_settings_cabac
+    assert_nil @info.video.format_settings_cabac
   end
   
   test "video format settings ReFrames" do
-    assert_nil @info.video_format_settings_reframes
+    assert_nil @info.video.format_settings_reframes
   end
 
   test "video   Codec ID" do
-    assert_equal "MJPG", @info.video_codec_id
+    assert_equal "MJPG", @info.video.codec_id
   end
 
   test "video   Duration" do
-    assert_equal 15164, @info.video_duration
-    assert_equal "15s 164ms", @info.video_duration_before_type_cast
+    assert_equal 15164, @info.video.duration
+    assert_equal "15s 164ms", @info.video.duration_before_type_cast
   end
 
   test "video   Bit rate" do
-    assert_equal "2 019 Kbps", @info.video_bit_rate
+    assert_equal "2 019 Kbps", @info.video.bit_rate
   end
   
   test "video nominal bit rate" do
-    assert_nil @info.video_nominal_bit_rate
+    assert_nil @info.video.nominal_bit_rate
   end
   
   test "video bit rate mode" do
-    assert_nil @info.video_bit_rate_mode
-    assert @info.vbr?
-    assert !@info.cbr?
+    assert_nil @info.video.bit_rate_mode
+    assert @info.video.vbr?
+    assert !@info.video.cbr?
   end
   
-  test "resolution" do
-    assert_equal "320x240", @info.resolution
+  test "frame size" do
+    assert_equal "320x240", @info.video.frame_size
   end
 
   test "video   Width" do
-    assert_equal 320, @info.video_width
-    assert_equal 320, @info.width
+    assert_equal 320, @info.video.width
   end
 
   test "video   Height" do
-    assert_equal 240, @info.video_height
-    assert_equal 240, @info.height
+    assert_equal 240, @info.video.height
   end
 
   test "video   Display aspect ratio" do
-    assert_equal "4:3", @info.video_display_aspect_ratio
-    assert_equal "4:3", @info.display_aspect_ratio
+    assert_equal "4:3", @info.video.display_aspect_ratio
   end
 
   test "video frame rate" do
-    assert_equal "15.102 fps", @info.video_frame_rate
-    assert_equal 15.102, @info.fps
-    assert_equal 15.102, @info.framerate
+    assert_equal "15.102 fps", @info.video.frame_rate
+    assert_equal 15.102, @info.video.fps
+    assert_equal 15.102, @info.video.framerate
   end
   
   test "video frame rate mode" do
-    assert_nil @info.video_frame_rate_mode
+    assert_nil @info.video.frame_rate_mode
   end
 
   test "video   Resolution" do
-    assert_equal 24, @info.video_resolution
-    assert_equal "24 bits", @info.video_resolution_before_type_cast
+    assert_equal 24, @info.video.resolution
+    assert_equal "24 bits", @info.video.resolution_before_type_cast
   end
   
   test "video colorimetry" do
-    assert_nil @info.video_colorimetry
-    assert_nil @info.video_colorspace
+    assert_nil @info.video.colorimetry
+    assert_nil @info.video.colorspace
   end
 
   test "video   Scan type" do
-    assert_equal "Progressive", @info.video_scan_type
-    assert !@info.interlaced?
-    assert @info.progressive?
+    assert_equal "Progressive", @info.video.scan_type
+    assert !@info.video.interlaced?
+    assert @info.video.progressive?
   end
   
   test "video scan order" do
-    assert_nil @info.video_scan_order
+    assert_nil @info.video.scan_order
   end
 
   test "video   Bits/(Pixel*Frame)" do
-    assert_equal "1.741", @info.video_bits_pixel_frame
+    assert_equal "1.741", @info.video.bits_pixel_frame
   end
 
   test "video   Stream size" do
-    assert_equal "3.65 MiB (97%)", @info.video_stream_size
+    assert_equal "3.65 MiB (97%)", @info.video.stream_size
   end
 
   ### AUDIO
   
   test "audio stream id" do
-    assert_nil @info.audio_stream_id
+    assert_nil @info.audio.stream_id
   end
   
   test "audio   Format" do
-    assert_equal "ADPCM", @info.audio_format
+    assert_equal "ADPCM", @info.audio.format
   end
   
   test "audio format info" do
-    assert_nil @info.audio_format_info
+    assert_nil @info.audio.format_info
   end
   
   test "audio codec id hint" do
-    assert_equal "Intel", @info.audio_codec_id_hint
+    assert_equal "Intel", @info.audio.codec_id_hint
   end
   
   test "audio Format settings, Endianness" do
-    assert_nil @info.audio_format_settings_endianness
+    assert_nil @info.audio.format_settings_endianness
   end
   
   test "audio Format settings, Sign" do
-    assert_nil @info.audio_format_settings_sign
+    assert_nil @info.audio.format_settings_sign
   end
 
   test "audio   Codec ID" do
-    assert_equal "11", @info.audio_codec_id
+    assert_equal "11", @info.audio.codec_id
   end
 
   test "audio   Codec ID/Info" do
-    assert_nil @info.audio_codec_info
+    assert_nil @info.audio.codec_info
   end
 
   test "audio   Duration" do
-    assert_equal 15164, @info.audio_duration
-    assert_equal "15s 164ms", @info.audio_duration_before_type_cast
+    assert_equal 15164, @info.audio.duration
+    assert_equal "15s 164ms", @info.audio.duration_before_type_cast
   end
 
   test "audio   Bit rate mode" do
-    assert_equal "Constant", @info.audio_bit_rate_mode
+    assert_equal "Constant", @info.audio.bit_rate_mode
   end
 
   test "audio   Bit rate" do
-    assert_equal "44.1 Kbps", @info.audio_bit_rate
+    assert_equal "44.1 Kbps", @info.audio.bit_rate
   end
 
   test "audio   Channel(s)" do
-    assert_equal 1, @info.audio_channels
+    assert_equal 1, @info.audio.channels
   end
   
   test "audio channel positions" do
-    assert_nil @info.audio_channel_positions
+    assert_nil @info.audio.channel_positions
   end
   
   test "stereo?" do
-    assert !@info.stereo?
+    assert !@info.audio.stereo?
   end
   
   test "mono?" do
-    assert @info.mono?
+    assert @info.audio.mono?
   end
 
   test "audio   Sampling rate" do
-    assert_equal 11025, @info.audio_sample_rate
-    assert_equal 11025, @info.audio_sampling_rate
-    assert_equal "11.025 KHz", @info.audio_sampling_rate_before_type_cast
+    assert_equal 11025, @info.audio.sample_rate
+    assert_equal 11025, @info.audio.sampling_rate
+    assert_equal "11.025 KHz", @info.audio.sampling_rate_before_type_cast
   end
 
   test "audio resolution" do
-    assert_equal 4, @info.audio_resolution
-    assert_equal "4 bits", @info.audio_resolution_before_type_cast
+    assert_equal 4, @info.audio.resolution
+    assert_equal "4 bits", @info.audio.resolution_before_type_cast
   end
 
   test "audio   Stream size" do
-    assert_equal "82.8 KiB (2%)", @info.audio_stream_size
+    assert_equal "82.8 KiB (2%)", @info.audio.stream_size
   end
 
   test "audio   Interleave, duration" do
-    assert_equal "67 ms (1.00 video frame)", @info.audio_interleave_duration
+    assert_equal "67 ms (1.00 video frame)", @info.audio.interleave_duration
   end
   
   test "audio encoded date" do
-    assert_nil @info.audio_encoded_date
+    assert_nil @info.audio.encoded_date
   end
   
   test "audio tagged date" do
-    assert_nil @info.audio_tagged_date
+    assert_nil @info.audio.tagged_date
   end
   
   ### IMAGE