dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FFProbe now returns Json

Browse source
This commit is contained in:
grosroro 2012-05-31 15:54:28 +02:00
commit fa39cb09eb
2 changed files with 55 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/FFMpeg/FFMpeg.php
View file

@ -186,7 +186,7 @@ class FFMpeg extends Binary
if ($format instanceof Audio\Transcodable) {
$cmd .= ' -acodec ' . $format->getAudioCodec();
}
if ($format instanceof Audio\Resamplable) {
$cmd .= ' -ac 2 -ar ' . $format->getAudioSampleRate();
}
@ -234,17 +234,17 @@ class FFMpeg extends Binary
throw new LogicException('You must set a valid prober if you use RESIZEMODE_INSET');
}
$result = $this->prober->probeStreams($this->pathfile);
$result = json_decode($this->prober->probeStreams($this->pathfile), true);
$originalWidth = $originalHeight = null;
foreach ($result as $stream) {
foreach ($stream as $info) {
if (strpos($info, 'width=') === 0) {
foreach ($stream as $name => $value) {
if ($name == 'width') {
$originalWidth = substr($info, 6);
continue;
}
if (strpos($info, 'height=') === 0) {
if ($name == 'value') {
$originalHeight = substr($info, 7);
continue;
}

56
src/FFMpeg/FFProbe.php
View file

@ -27,7 +27,8 @@ class FFProbe extends Binary
* Probe the format of a given file
*
* @param string $pathfile
* @return string
* @return string A Json object containing the key/values of the probe output
*
* @throws InvalidArgumentException
* @throws RuntimeException
*/
@ -39,14 +40,41 @@ class FFProbe extends Binary
$cmd = $this->binary . ' ' . $pathfile . ' -show_format';
return $this->executeProbe($cmd);
$output = $this->executeProbe($cmd);
$ret = array();
foreach (explode("\n", $output) as $line) {
if (in_array($line, array('[FORMAT]', '[/FORMAT]'))) {
continue;
}
$chunks = explode('=', $line);
$key = array_shift($chunks);
if ('' === trim($key)) {
continue;
}
$value = trim(implode('=', $chunks));
if (ctype_digit($value)) {
$value = (int) $value;
}
$ret[$key] = $value;
}
return json_encode($ret);
}
/**
* Probe the streams contained in a given file
*
* @param string $pathfile
* @return string
* @return array An array of streams array
*
* @throws InvalidArgumentException
* @throws RuntimeException
*/
@ -65,16 +93,32 @@ class FFProbe extends Binary
foreach ($output as $line) {
if (in_array($line, array('[STREAM]', '[/STREAM]'))) {
if ($line == '[STREAM]') {
$n ++;
$ret[$n] = array();
continue;
}
if ($line == '[/STREAM]') {
continue;
}
$ret[$n][] = $line;
$chunks = explode('=', $line);
$key = array_shift($chunks);
if ('' === trim($key)) {
continue;
}
$value = trim(implode('=', $chunks));
if (ctype_digit($value)) {
$value = (int) $value;
}
$ret[$n][$key] = $value;
}
return $ret;
return json_encode(array_values($ret));
}
/**