rik/plibreader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug caused by zero frames set in header

Browse Source 
git-svn-id: http://php-reader.googlecode.com/svn/trunk@192 51a70ab9-7547-0410-9469-37e369ee0574
This commit is contained in:
svollbehr
2010-04-07 21:07:21 +00:00
parent c685291088
commit 9bfe9781fe
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Zend/Media/Mpeg/Abs.php
View File

@@ -196,8 +196,9 @@ final class Zend_Media_Mpeg_Abs extends Zend_Media_Mpeg_Abs_Object
/* Read necessary frames */ /* Read necessary frames */
if ($this->getOption('readmode', 'lazy') == 'lazy') { if ($this->getOption('readmode', 'lazy') == 'lazy') {
if (($header = $this->_xingHeader) !== null || if ((($header = $this->_xingHeader) !== null ||
($header = $this->_vbriHeader) !== null) { ($header = $this->_vbriHeader) !== null) &&
$header->getFrames() != 0) {
$this->_estimatedPlayDuration = $header->getFrames() * $this->_estimatedPlayDuration = $header->getFrames() *
$firstFrame->getSamples() / $firstFrame->getSamples() /
$firstFrame->getSamplingFrequency(); $firstFrame->getSamplingFrequency();
@@ -240,7 +241,7 @@ final class Zend_Media_Mpeg_Abs extends Zend_Media_Mpeg_Abs_Object
*/ */
public function hasXingHeader() public function hasXingHeader()
{ {
return $this->_xingHeader === null; return $this->_xingHeader !== null;
} }
/** /**
@@ -262,7 +263,7 @@ final class Zend_Media_Mpeg_Abs extends Zend_Media_Mpeg_Abs_Object
*/ */
public function hasLameHeader() public function hasLameHeader()
{ {
return $this->_lameHeader === null; return $this->_lameHeader !== null;
} }
/** /**
@@ -277,14 +278,14 @@ final class Zend_Media_Mpeg_Abs extends Zend_Media_Mpeg_Abs_Object
} }
/** /**
* Returns <var>true</var> if the audio bitstream contains the Fraunhofer IIS * Returns <var>true</var> if the audio bitstream contains the Fraunhofer
* VBR header, or <var>false</var> otherwise. * IIS VBR header, or <var>false</var> otherwise.
* *
* @return boolean * @return boolean
*/ */
public function hasVbriHeader() public function hasVbriHeader()
{ {
return $this->_vbriHeader === null; return $this->_vbriHeader !== null;
} }
/** /**
@@ -299,8 +300,8 @@ final class Zend_Media_Mpeg_Abs extends Zend_Media_Mpeg_Abs_Object
} }
/** /**
* Returns the bitrate estimate. This value is either fetched from one of the * Returns the bitrate estimate. This value is either fetched from one of
* headers or calculated based on the read frames. * the headers or calculated based on the read frames.
* *
* @return integer * @return integer
*/ */
@@ -310,8 +311,8 @@ final class Zend_Media_Mpeg_Abs extends Zend_Media_Mpeg_Abs_Object
} }
/** /**
* For variable bitrate files this method returns the exact average bitrate of * For variable bitrate files this method returns the exact average bitrate
* the whole file. * of the whole file.
* *
* @return integer * @return integer
*/ */
@@ -403,7 +404,7 @@ final class Zend_Media_Mpeg_Abs extends Zend_Media_Mpeg_Abs_Object
$this->_reader->setOffset($this->_lastFrameOffset); $this->_reader->setOffset($this->_lastFrameOffset);
} }
for ($i = 0; $this->_reader->getOffset() < $this->_bytes; $i++) { for ($i = 0; ($j = $this->_reader->getOffset()) < $this->_bytes; $i++) {
$options = $this->getOptions(); $options = $this->getOptions();
$frame = new Zend_Media_Mpeg_Abs_Frame($this->_reader, $options); $frame = new Zend_Media_Mpeg_Abs_Frame($this->_reader, $options);
@@ -416,7 +417,9 @@ final class Zend_Media_Mpeg_Abs extends Zend_Media_Mpeg_Abs_Object
if ($limit === null) { if ($limit === null) {
$this->_lastFrameOffset = $this->_reader->getOffset(); $this->_lastFrameOffset = $this->_reader->getOffset();
} }
if ($limit !== null && ($i + 1) == $limit) { if (($limit !== null && (($i + 1) == $limit)) ||
($limit !== null &&
($j + $frame->getLength() >= $this->_bytes))) {
$this->_lastFrameOffset = $this->_reader->getOffset(); $this->_lastFrameOffset = $this->_reader->getOffset();
break; break;
} }