$this->ParseVorbisPageHeader($filedata, $filedataoffset, $oggpageinfo);
+ } elseif (substr($filedata, 0, 8) == 'OpusHead') {
+
+ if( $this->ParseOpusPageHeader($filedata, $filedataoffset, $oggpageinfo) == false ) {
+ return false;
+ }
+
} elseif (substr($filedata, 0, 8) == 'Speex ') {
// http://www.speex.org/manual/node10.html
} else {
- $info['error'][] = 'Expecting either "Speex " or "vorbis" identifier strings, found "'.substr($filedata, 0, 8).'"';
+ $info['error'][] = 'Expecting either "Speex ", "OpusHead" or "vorbis" identifier strings, found "'.substr($filedata, 0, 8).'"';
unset($info['ogg']);
unset($info['mime_type']);
return false;
$this->fseek($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length'], SEEK_CUR);
$this->ParseVorbisComments();
break;
- }
+ case 'opus':
+ $filedata = $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, 0, 8); // hard-coded to 'OpusTags'
+ if(substr($filedata, 0, 8) != 'OpusTags') {
+ $info['error'][] = 'Expected "OpusTags" as header but got "'.substr($filedata, 0, 8).'"';
+ return false;
+ }
+
+ $this->ParseVorbisComments();
+ break;
+
+ }
// Last Page - Number of Samples
if (!getid3_lib::intValueSupported($info['avdataend'])) {
return true;
}
+ // http://tools.ietf.org/html/draft-ietf-codec-oggopus-03
+ public function ParseOpusPageHeader(&$filedata, &$filedataoffset, &$oggpageinfo) {
+ $info = &$this->getid3->info;
+ $info['audio']['dataformat'] = 'opus';
+ $info['mime_type'] = 'audio/ogg; codecs=opus';
+
+ /** @todo find a usable way to detect abr (vbr that is padded to be abr) */
+ $info['audio']['bitrate_mode'] = 'vbr';
+
+ $info['audio']['lossless'] = false;
+
+ $info['ogg']['pageheader']['opus']['opus_magic'] = substr($filedata, $filedataoffset, 8); // hard-coded to 'OpusHead'
+ $filedataoffset += 8;
+ $info['ogg']['pageheader']['opus']['version'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
+ $filedataoffset += 1;
+
+ if ($info['ogg']['pageheader']['opus']['version'] < 1 || $info['ogg']['pageheader']['opus']['version'] > 15) {
+ $info['error'][] = 'Unknown opus version number (only accepting 1-15)';
+ return false;
+ }
+
+ $info['ogg']['pageheader']['opus']['out_channel_count'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
+ $filedataoffset += 1;
+
+ if ($info['ogg']['pageheader']['opus']['out_channel_count'] == 0) {
+ $info['error'][] = 'Invalid channel count in opus header (must not be zero)';
+ return false;
+ }
+
+ $info['ogg']['pageheader']['opus']['pre_skip'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2));
+ $filedataoffset += 2;
+
+ $info['ogg']['pageheader']['opus']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $filedataoffset += 4;
+
+ //$info['ogg']['pageheader']['opus']['output_gain'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2));
+ //$filedataoffset += 2;
+
+ //$info['ogg']['pageheader']['opus']['channel_mapping_family'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
+ //$filedataoffset += 1;
+
+ $info['opus']['opus_version'] = $info['ogg']['pageheader']['opus']['version'];
+ $info['opus']['sample_rate'] = $info['ogg']['pageheader']['opus']['sample_rate'];
+ $info['opus']['out_channel_count'] = $info['ogg']['pageheader']['opus']['out_channel_count'];
+
+ $info['audio']['channels'] = $info['opus']['out_channel_count'];
+ $info['audio']['sample_rate'] = $info['opus']['sample_rate'];
+ return true;
+ }
+
+
public function ParseOggPageHeader() {
// http://xiph.org/ogg/vorbis/doc/framing.html
$oggheader['page_start_offset'] = $this->ftell(); // where we started from in the file
switch ($info['audio']['dataformat']) {
case 'vorbis':
case 'speex':
+ case 'opus':
$CommentStartOffset = $info['ogg']['pageheader'][$VorbisCommentPage]['page_start_offset']; // Second Ogg page, after header block
$this->fseek($CommentStartOffset);
$commentdataoffset = 27 + $info['ogg']['pageheader'][$VorbisCommentPage]['page_segments'];
if ($info['audio']['dataformat'] == 'vorbis') {
$commentdataoffset += (strlen('vorbis') + 1);
}
+ else if ($info['audio']['dataformat'] == 'opus') {
+ $commentdataoffset += strlen('OpusTags');
+ }
+
break;
case 'flac':
$ThisFileInfo_ogg_comments_raw = &$info['ogg']['comments_raw'];
for ($i = 0; $i < $CommentsCount; $i++) {
+ if ($i >= 10000) {
+ // https://github.com/owncloud/music/issues/212#issuecomment-43082336
+ $info['warning'][] = 'Unexpectedly large number ('.$CommentsCount.') of Ogg comments - breaking after reading '.$i.' comments';
+ break;
+ }
+
$ThisFileInfo_ogg_comments_raw[$i]['dataoffset'] = $CommentStartOffset + $commentdataoffset;
if ($this->ftell() < ($ThisFileInfo_ogg_comments_raw[$i]['dataoffset'] + 4)) {
$ogg = new self($this->getid3);
$ogg->setStringMode($data);
$info['ogg']['comments']['picture'][] = array(
- 'image_mime' => $imageinfo['mime'],
- 'data' => $ogg->saveAttachment('coverart', 0, strlen($data), $imageinfo['mime']),
+ 'image_mime' => $imageinfo['mime'],
+ 'datalength' => strlen($data),
+ 'picturetype' => 'cover art',
+ 'image_height' => $imageinfo['height'],
+ 'image_width' => $imageinfo['width'],
+ 'data' => $ogg->saveAttachment('coverart', 0, strlen($data), $imageinfo['mime']),
);
unset($ogg);
return (isset($TheoraPixelFormatLookup[$pixelformat_id]) ? $TheoraPixelFormatLookup[$pixelformat_id] : null);
}
-}
\ No newline at end of file
+}