mediainfo 0.6.2 → 0.7.0

data/test/mediainfo_dinner_test.rb

@@ -58,205 +58,202 @@ class MediainfoDinnerTest < ActiveSupport::TestCase
   ### VIDEO
   
   test "video stream id" do
-    assert_equal "1", @info.video_stream_id
+    assert_equal "1", @info.video.stream_id
   end
   
   test "video   Format" do
-    assert_equal "MPEG-4 Visual", @info.video_format
+    assert_equal "MPEG-4 Visual", @info.video.format
   end
   
   test "video format profile" do
-    assert_equal "Simple@L3", @info.video_format_profile
+    assert_equal "Simple@L3", @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_equal "Default (H.263)", @info.video_format_settings_matrix
+    assert_equal "Default (H.263)", @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 "20", @info.video_codec_id
+    assert_equal "20", @info.video.codec_id
   end
 
   test "video   Duration" do
-    assert_equal 216000, @info.video_duration
-    assert_equal "3mn 36s", @info.video_duration_before_type_cast
+    assert_equal 216000, @info.video.duration
+    assert_equal "3mn 36s", @info.video.duration_before_type_cast
   end
 
   test "video   Bit rate" do
-    assert_equal "219 Kbps", @info.video_bit_rate
+    assert_equal "219 Kbps", @info.video.bit_rate
   end
   
   test "video nominal bit rate" do
-    assert_equal "23.0 Kbps", @info.video_nominal_bit_rate
+    assert_equal "23.0 Kbps", @info.video.nominal_bit_rate
   end
   
   test "video bit rate mode" do
-    assert_equal "Constant", @info.video_bit_rate_mode
-    assert !@info.vbr?
-    assert @info.cbr?
+    assert_equal "Constant", @info.video.bit_rate_mode
+    assert !@info.video.vbr?
+    assert @info.video.cbr?
   end
   
-  test "resolution" do
-    assert_equal "352x288", @info.resolution
+  test "frame size" do
+    assert_equal "352x288", @info.video.frame_size
   end
 
   test "video   Width" do
-    assert_equal 352, @info.video_width
-    assert_equal 352, @info.width
+    assert_equal 352, @info.video.width
   end
 
   test "video   Height" do
-    assert_equal 288, @info.video_height
-    assert_equal 288, @info.height
+    assert_equal 288, @info.video.height
   end
 
   test "video   Display aspect ratio" do
-    assert_equal "1.222", @info.video_display_aspect_ratio
-    assert_equal "1.222", @info.display_aspect_ratio
+    assert_equal "1.222", @info.video.display_aspect_ratio
   end
 
   test "video frame rate" do
-    assert_equal "14.875 fps", @info.video_frame_rate
-    assert_equal 14.875, @info.fps
-    assert_equal 14.875, @info.framerate
+    assert_equal "14.875 fps", @info.video.frame_rate
+    assert_equal 14.875, @info.video.fps
+    assert_equal 14.875, @info.video.framerate
     
-    assert_equal "2.370 fps", @info.video_minimum_frame_rate
-    assert_equal 2.370, @info.min_fps
-    assert_equal 2.370, @info.min_framerate
+    assert_equal "2.370 fps", @info.video.minimum_frame_rate
+    assert_equal 2.370, @info.video.min_fps
+    assert_equal 2.370, @info.video.min_framerate
     
-    assert_equal "27.778 fps", @info.video_maximum_frame_rate
-    assert_equal 27.778, @info.max_fps
-    assert_equal 27.778, @info.max_framerate
+    assert_equal "27.778 fps", @info.video.maximum_frame_rate
+    assert_equal 27.778, @info.video.max_fps
+    assert_equal 27.778, @info.video.max_framerate
   end
   
   test "video frame rate mode" do
-    assert_equal "Variable", @info.video_frame_rate_mode
+    assert_equal "Variable", @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 "0.145", @info.video_bits_pixel_frame
+    assert_equal "0.145", @info.video.bits_pixel_frame
   end
 
   test "video   Stream size" do
-    assert_equal "5.64 MiB (91%)", @info.video_stream_size
+    assert_equal "5.64 MiB (91%)", @info.video.stream_size
   end
 
   ### AUDIO
   
   test "audio stream id" do
-    assert_equal "2", @info.audio_stream_id
+    assert_equal "2", @info.audio.stream_id
   end
   
   test "audio   Format" do
-    assert_equal "QCELP", @info.audio_format
+    assert_equal "QCELP", @info.audio.format
   end
   
   test "audio format info" do
-    assert_nil @info.audio_format_info
+    assert_nil @info.audio.format_info
   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 "E1", @info.audio_codec_id
+    assert_equal "E1", @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 216000, @info.audio_duration
-    assert_equal "3mn 36s", @info.audio_duration_before_type_cast
+    assert_equal 216000, @info.audio.duration
+    assert_equal "3mn 36s", @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 "14.0 Kbps", @info.audio_bit_rate
+    assert_equal "14.0 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 8000, @info.audio_sample_rate
-    assert_equal 8000, @info.audio_sampling_rate
-    assert_equal "8 000 Hz", @info.audio_sampling_rate_before_type_cast
+    assert_equal 8000, @info.audio.sample_rate
+    assert_equal 8000, @info.audio.sampling_rate
+    assert_equal "8 000 Hz", @info.audio.sampling_rate_before_type_cast
   end
 
   test "audio resolution" do
-    assert_equal 16, @info.audio_resolution
-    assert_equal "16 bits", @info.audio_resolution_before_type_cast
+    assert_equal 16, @info.audio.resolution
+    assert_equal "16 bits", @info.audio.resolution_before_type_cast
   end
 
   test "audio   Stream size" do
-    assert_equal "369 KiB (6%)", @info.audio_stream_size
+    assert_equal "369 KiB (6%)", @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
   
   ### IMAGE

data/test/mediainfo_hats_test.rb

@@ -58,197 +58,194 @@ class MediainfoHatsTest < ActiveSupport::TestCase
   ### VIDEO
   
   test "video stream id" do
-    assert_equal "1", @info.video_stream_id
+    assert_equal "1", @info.video.stream_id
   end
   
   test "video   Format" do
-    assert_equal "AVC", @info.video_format
+    assert_equal "AVC", @info.video.format
   end
   
   test "video format profile" do
-    assert_equal "Baseline@L1.0", @info.video_format_profile
+    assert_equal "Baseline@L1.0", @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_equal "No", @info.video_format_settings_cabac
+    assert_equal "No", @info.video.format_settings_cabac
   end
   
   test "video format settings ReFrames" do
-    assert_equal "2 frames", @info.video_format_settings_reframes
+    assert_equal "2 frames", @info.video.format_settings_reframes
   end
 
   test "video   Codec ID" do
-    assert_equal "avc1", @info.video_codec_id
+    assert_equal "avc1", @info.video.codec_id
   end
 
   test "video   Duration" do
-    assert_equal 301000, @info.video_duration
-    assert_equal "5mn 1s", @info.video_duration_before_type_cast
+    assert_equal 301000, @info.video.duration
+    assert_equal "5mn 1s", @info.video.duration_before_type_cast
   end
 
   test "video   Bit rate" do
-    assert_equal "57.5 Kbps", @info.video_bit_rate
+    assert_equal "57.5 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_equal "Variable", @info.video_bit_rate_mode
-    assert @info.vbr?
-    assert !@info.cbr?
+    assert_equal "Variable", @info.video.bit_rate_mode
+    assert @info.video.vbr?
+    assert !@info.video.cbr?
   end
   
-  test "resolution" do
-    assert_equal "176x144", @info.resolution
+  test "frame size" do
+    assert_equal "176x144", @info.video.frame_size
   end
 
   test "video   Width" do
-    assert_equal 176, @info.video_width
-    assert_equal 176, @info.width
+    assert_equal 176, @info.video.width
   end
 
   test "video   Height" do
-    assert_equal 144, @info.video_height
-    assert_equal 144, @info.height
+    assert_equal 144, @info.video.height
   end
 
   test "video   Display aspect ratio" do
-    assert_equal "1.222", @info.video_display_aspect_ratio
-    assert_equal "1.222", @info.display_aspect_ratio
+    assert_equal "1.222", @info.video.display_aspect_ratio
   end
 
   test "video frame rate" do
-    assert_equal "14.985 fps", @info.video_frame_rate
-    assert_equal 14.985, @info.fps
-    assert_equal 14.985, @info.framerate
+    assert_equal "14.985 fps", @info.video.frame_rate
+    assert_equal 14.985, @info.video.fps
+    assert_equal 14.985, @info.video.framerate
   end
   
   test "video frame rate mode" do
-    assert_equal "Constant", @info.video_frame_rate_mode
+    assert_equal "Constant", @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_equal "4:2:0", @info.video_colorimetry
-    assert_equal "4:2:0", @info.video_colorspace
+    assert_equal "4:2:0", @info.video.colorimetry
+    assert_equal "4:2:0", @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 "0.152", @info.video_bits_pixel_frame
+    assert_equal "0.152", @info.video.bits_pixel_frame
   end
 
   test "video   Stream size" do
-    assert_equal "2.07 MiB (69%)", @info.video_stream_size
+    assert_equal "2.07 MiB (69%)", @info.video.stream_size
   end
 
   ### AUDIO
   
   test "audio stream id" do
-    assert_equal "2", @info.audio_stream_id
+    assert_equal "2", @info.audio.stream_id
   end
   
   test "audio   Format" do
-    assert_equal "AAC", @info.audio_format
+    assert_equal "AAC", @info.audio.format
   end
   
   test "audio format info" do
-    assert_equal "Advanced Audio Codec", @info.audio_format_info
+    assert_equal "Advanced Audio Codec", @info.audio.format_info
   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 "40", @info.audio_codec_id
+    assert_equal "40", @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 298000, @info.audio_duration
-    assert_equal "4mn 58s", @info.audio_duration_before_type_cast
+    assert_equal 298000, @info.audio.duration
+    assert_equal "4mn 58s", @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 "24.0 Kbps", @info.audio_bit_rate
+    assert_equal "24.0 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_equal "C", @info.audio_channel_positions
+    assert_equal "C", @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 16000, @info.audio_sample_rate
-    assert_equal 16000, @info.audio_sampling_rate
-    assert_equal "16.0 KHz", @info.audio_sampling_rate_before_type_cast
+    assert_equal 16000, @info.audio.sample_rate
+    assert_equal 16000, @info.audio.sampling_rate
+    assert_equal "16.0 KHz", @info.audio.sampling_rate_before_type_cast
   end
 
   test "audio resolution" do
-    assert_equal 16, @info.audio_resolution
-    assert_equal "16 bits", @info.audio_resolution_before_type_cast
+    assert_equal 16, @info.audio.resolution
+    assert_equal "16 bits", @info.audio.resolution_before_type_cast
   end
 
   test "audio   Stream size" do
-    assert_equal "877 KiB (29%)", @info.audio_stream_size
+    assert_equal "877 KiB (29%)", @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_kind_of Time, @info.audio_encoded_date
+    assert_kind_of Time, @info.audio.encoded_date
   end
   
   test "audio tagged date" do
-    assert_kind_of Time, @info.audio_tagged_date
+    assert_kind_of Time, @info.audio.tagged_date
   end
   
   ### IMAGE