MPEG.pm (Image-ExifTool-12.57) | : | MPEG.pm (Image-ExifTool-12.58) | ||
---|---|---|---|---|
skipping to change at line 21 | skipping to change at line 21 | |||
# 4) http://ffmpeg.org/ | # 4) http://ffmpeg.org/ | |||
# 5) http://sourceforge.net/projects/mediainfo/ | # 5) http://sourceforge.net/projects/mediainfo/ | |||
#------------------------------------------------------------------------------ | #------------------------------------------------------------------------------ | |||
package Image::ExifTool::MPEG; | package Image::ExifTool::MPEG; | |||
use strict; | use strict; | |||
use vars qw($VERSION); | use vars qw($VERSION); | |||
use Image::ExifTool qw(:DataAccess :Utils); | use Image::ExifTool qw(:DataAccess :Utils); | |||
$VERSION = '1.16'; | $VERSION = '1.17'; | |||
%Image::ExifTool::MPEG::Audio = ( | %Image::ExifTool::MPEG::Audio = ( | |||
GROUPS => { 2 => 'Audio' }, | GROUPS => { 2 => 'Audio' }, | |||
'Bit11-12' => { | 'Bit11-12' => { | |||
Name => 'MPEGAudioVersion', | Name => 'MPEGAudioVersion', | |||
RawConv => '$self->{MPEG_Vers} = $val', | RawConv => '$self->{MPEG_Vers} = $val', | |||
PrintConv => { | PrintConv => { | |||
0 => 2.5, | 0 => 2.5, | |||
2 => 2, | 2 => 2, | |||
3 => 1, | 3 => 1, | |||
skipping to change at line 601 | skipping to change at line 601 | |||
my ($w1, $w2) = unpack('N2', $$buffPt); | my ($w1, $w2) = unpack('N2', $$buffPt); | |||
# validate as much as possible | # validate as much as possible | |||
if (($w1 & 0x000000f0) == 0x00000000 or # 0000 is a forbidden aspect rat io | if (($w1 & 0x000000f0) == 0x00000000 or # 0000 is a forbidden aspect rat io | |||
($w1 & 0x000000f0) == 0x000000f0 or # 1111 is a reserved aspect rati o | ($w1 & 0x000000f0) == 0x000000f0 or # 1111 is a reserved aspect rati o | |||
($w1 & 0x0000000f) == 0 or # frame rate must be 1-8 | ($w1 & 0x0000000f) == 0 or # frame rate must be 1-8 | |||
($w1 & 0x0000000f) > 8) | ($w1 & 0x0000000f) > 8) | |||
{ | { | |||
return 0; | return 0; | |||
} | } | |||
# set file type if not done already | # set file type if not done already | |||
$et->SetFileType('MPEG') unless $$et{VALUE}{FileType}; | $et->SetFileType('MPEG') unless $$et{FileType}; | |||
my $tagTablePtr = GetTagTable('Image::ExifTool::MPEG::Video'); | my $tagTablePtr = GetTagTable('Image::ExifTool::MPEG::Video'); | |||
ProcessFrameHeader($et, $tagTablePtr, $w1, $w2); | ProcessFrameHeader($et, $tagTablePtr, $w1, $w2); | |||
return 1; | return 1; | |||
} | } | |||
#------------------------------------------------------------------------------ | #------------------------------------------------------------------------------ | |||
# Read MPEG audio and video frame headers | # Read MPEG audio and video frame headers | |||
# Inputs: 0) ExifTool object reference, 1) Reference to audio/video data | # Inputs: 0) ExifTool object reference, 1) Reference to audio/video data | |||
# Returns: 1 on success, 0 if no video header was found | # Returns: 1 on success, 0 if no video header was found | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |