wip
This commit is contained in:
@@ -659,7 +659,7 @@ class getid3_id3v2 extends getid3_handler
|
||||
// Owner identifier <text string> $00
|
||||
// Identifier <up to 64 bytes binary data>
|
||||
$exploded = explode("\x00", $parsedFrame['data'], 2);
|
||||
$parsedFrame['ownerid'] = (isset($exploded[0]) ? $exploded[0] : '');
|
||||
$parsedFrame['ownerid'] = $exploded[0];
|
||||
$parsedFrame['data'] = (isset($exploded[1]) ? $exploded[1] : '');
|
||||
|
||||
} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'TXXX')) || // 4.2.2 TXXX User defined text information frame
|
||||
@@ -1068,13 +1068,15 @@ class getid3_id3v2 extends getid3_handler
|
||||
$parsedFrame['lyrics'][$timestampindex]['data'] = substr($frame_remainingdata, $frame_offset, $frame_terminatorpos - $frame_offset);
|
||||
|
||||
$frame_remainingdata = substr($frame_remainingdata, $frame_terminatorpos + strlen($frame_textencoding_terminator));
|
||||
if (($timestampindex == 0) && (ord($frame_remainingdata[0]) != 0)) {
|
||||
// timestamp probably omitted for first data item
|
||||
} else {
|
||||
$parsedFrame['lyrics'][$timestampindex]['timestamp'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, 0, 4));
|
||||
$frame_remainingdata = substr($frame_remainingdata, 4);
|
||||
if (strlen($frame_remainingdata)) { // https://github.com/JamesHeinrich/getID3/issues/444
|
||||
if (($timestampindex == 0) && (ord($frame_remainingdata[0]) != 0)) {
|
||||
// timestamp probably omitted for first data item
|
||||
} else {
|
||||
$parsedFrame['lyrics'][$timestampindex]['timestamp'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, 0, 4));
|
||||
$frame_remainingdata = substr($frame_remainingdata, 4);
|
||||
}
|
||||
$timestampindex++;
|
||||
}
|
||||
$timestampindex++;
|
||||
}
|
||||
}
|
||||
unset($parsedFrame['data']);
|
||||
@@ -1304,7 +1306,7 @@ class getid3_id3v2 extends getid3_handler
|
||||
// Adjustment $xx (xx ...)
|
||||
|
||||
$frame_offset = 0;
|
||||
$parsedFrame['adjustmentbits'] = substr($parsedFrame['data'], $frame_offset++, 1);
|
||||
$parsedFrame['adjustmentbits'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
|
||||
$frame_adjustmentbytes = ceil($parsedFrame['adjustmentbits'] / 8);
|
||||
|
||||
$frame_remainingdata = (string) substr($parsedFrame['data'], $frame_offset);
|
||||
|
||||
Reference in New Issue
Block a user