Changeset 24696 for trunk/wp-includes/ID3/module.audio-video.matroska.php

Timestamp:

07/13/2013 12:37:36 AM (12 years ago)

Author:

nacin

Message:

ID3 1.9.7.

props wonderboymusic.
fixes #24737.

File:

• trunk/wp-includes/ID3/module.audio-video.matroska.php (modified) (8 diffs)

trunk/wp-includes/ID3/module.audio-video.matroska.php

@@ -217 +217 @@
     // public options
     public static $hide_clusters    = true;  // if true, do not return information about CLUSTER chunks, since there's a lot of them and they're not usually useful [default: TRUE]
-    public static $parse_whole_file = false; // true to parse the whole file, not only header [default: FALSE]
-
-    // private parser settings/placeholders
-    private $EBMLbuffer        = '';
-    private $EBMLbuffer_offset = 0;
-    private $EBMLbuffer_length = 0;
-    private $current_offset    = 0;
-    private $unuseful_elements = array(EBML_ID_CRC32, EBML_ID_VOID);
+    public static $parse_whole_file = false; // true to parse the whole file, not only header [default: FALSE]
+
+    // private parser settings/placeholders
+    private $EBMLbuffer        = '';
+    private $EBMLbuffer_offset = 0;
+    private $EBMLbuffer_length = 0;
+    private $current_offset    = 0;
+    private $unuseful_elements = array(EBML_ID_CRC32, EBML_ID_VOID);
 
     public function Analyze()
@@ -496 +496 @@
         }
 
-        // determine mime type
+        // determine mime type
         if (!empty($info['video']['streams'])) {
             $info['mime_type'] = ($info['matroska']['doctype'] == 'webm' ? 'video/webm' : 'video/x-matroska');
@@ -508 +508 @@
     }
 
-    private function parseEBML(&$info) {
+    private function parseEBML(&$info) {
         // http://www.matroska.org/technical/specs/index.html#EBMLBasics
         $this->current_offset = $info['avdataoffset'];
@@ -537 +537 @@
                                 break;
 
-                            case EBML_ID_CRC32: // not useful, ignore
-                                $this->current_offset = $element_data['end'];
-                                unset($element_data);
-                                break;
-
                             default:
                                 $this->unhandledElement('header', __LINE__, $element_data);
                         }
-                        if (!empty($element_data)) {
-                            unset($element_data['offset'], $element_data['end']);
-                            $info['matroska']['header']['elements'][] = $element_data;
-                        }
+
+                        unset($element_data['offset'], $element_data['end']);
+                        $info['matroska']['header']['elements'][] = $element_data;
                     }
                     break;
@@ -875 +869 @@
 
                                                     case EBML_ID_CUETRACKPOSITIONS:
-                                                        $cuetrackpositions_entry = array();
+                                                        $cuetrackpositions_entry = array();
 
                                                         while ($this->getEBMLelement($sub_sub_subelement, $sub_subelement['end'], true)) {
@@ -913 +907 @@
 
                             case EBML_ID_TAGS: // Element containing elements specific to Tracks/Chapters.
-                                $tags_entry = array();
+                                $tags_entry = array();
 
                                 while ($this->getEBMLelement($subelement, $element_data['end'], false)) {
@@ -1210 +1204 @@
             }
         }
-    }
+    }
 
     private function EnsureBufferHasEnoughData($min_data=1024) {
@@ -1392 +1386 @@
         $block_data['flags']['lacing_type'] = self::BlockLacingType($block_data['flags']['lacing']);
 
-        // Lace (when lacing bit is set)
+        // Lace (when lacing bit is set)
         if ($block_data['flags']['lacing'] > 0) {
             $block_data['lace_frames'] = getid3_lib::BigEndian2Int($this->readEBMLelementData(1)) + 1; // Number of frames in the lace-1 (uint8)