Fixed TrackHeaderAtom inheritance chain, which was causing a parsing bug. Made the...

[movie_parser.git] / AtomTester.html

diff --git a/AtomTester.html b/AtomTester.html
index 04199880eaf42f8b2120f540b5b397d14016d519..26172643932f28a827bb6ebe664a8f5b0f1da7ee 100644 (file)
--- a/AtomTester.html
+++ b/AtomTester.html
@@ -3,26 +3,65 @@
     <title>AtomTester</title>
     <script src=Atom.js></script>
     <script>
     <title>AtomTester</title>
     <script src=Atom.js></script>
     <script>

-        var atoms = [];
+        // Add Blob.prototype.slice if it does not already exist:
+        if (typeof(Blob.prototype.slice) == 'undefined' && typeof(Blob.prototype.webkitSlice) != 'undefined')
+            Blob.prototype.slice = Blob.prototype.webkitSlice;
+
+        var moovAtom;

         function onFileSelect(e) {
             var file = e.target.files[0];
             var reader = new FileReader();
         function onFileSelect(e) {
             var file = e.target.files[0];
             var reader = new FileReader();

-            reader.onload = (function(file) {
-                return function(e) {
-                    var offset = 0;
+            output.innerHTML = '';
+            
+            function checkForMoovAtom(offset) {
+                reader.onload = function(e) {
+                    var result = e.target.result;
+                    var basicAtom = new Atom(result);
+                    if (!basicAtom)
+                        return;
+                    else if (basicAtom.type == 'moov') 
+                        readMoovAtom(offset, basicAtom.size);
+                    else
+                        checkForMoovAtom(offset + basicAtom.size);
+                };
+                var subset = file.slice(offset, offset + 16);
+                reader.readAsArrayBuffer(subset);
+            };
+            
+            function readMoovAtom(offset, length) {
+                reader.onload = function(e) { 
+                    moovAtom = Atom.create(e.target.result);

                     var output = document.getElementById('output');
                     var output = document.getElementById('output');

-                    output.innerHTML = '';
-                    while (offset < e.target.result.byteLength) {
-                        var atom = Atom.create(e.target.result, offset);
-                        if (!atom)
-                            break;
-                        atoms.push(atom);
-                        output.appendChild(toDOMNode(atom));
-                        offset += atom.size;
-                    }
+                    output.appendChild(toDOMNode(moovAtom));

                 };
                 };

-            })(file);
-            reader.readAsArrayBuffer(file);
+                var subset = file.slice(offset, offset + length);
+                reader.readAsArrayBuffer(subset);
+            };
+            
+            checkForMoovAtom(0);
+        }
+        
+        function toDOMRepresentation(object)
+        {
+            if (object instanceof Atom)
+                return toDOMNode(object);
+            else if (object instanceof Array) {
+                var span = document.createElement('span');
+                span.appendChild(document.createTextNode('['));
+                for (var i = 0; i < object.length; ++i) {
+                    span.appendChild(toDOMRepresentation(object[i]));
+                    if (i + 1 < object.length)
+                        span.appendChild(document.createTextNode(', '));
+                }
+                span.appendChild(document.createTextNode(']'));
+                return span;
+            }
+            else if (typeof(object) == "string")
+                return document.createTextNode('"' + object + '"');
+            else if (object instanceof Date)
+                return document.createTextNode(object.toLocaleString());
+            else
+                return document.createTextNode(object.toString());

         }
         
         function toDOMNode(object)
         }
         
         function toDOMNode(object)


@@ -35,21 +74,9 @@
                     continue;
                 var div = document.createElement('div');
                 var dt = document.createElement('dt');
                     continue;
                 var div = document.createElement('div');
                 var dt = document.createElement('dt');

-                dt.innerText = property;
-
+                dt.appendChild(document.createTextNode(property));

                 var dd = document.createElement('dd');
                 var dd = document.createElement('dd');

-                if (value instanceof Atom)
-                    dd.appendChild(toDOMNode(value));
-                else if (value instanceof Array) {
-                    dd.appendChild(toDOMNode(value));
-                }
-                else if (typeof(value) == "string")
-                    dd.innerText = '"' + value + '"';
-                else if (value instanceof Date)
-                    dd.innerText = value.toLocaleString();
-                else
-                    dd.innerText = value;
-
+                dd.appendChild(toDOMRepresentation(value));

                 div.appendChild(dt);
                 div.appendChild(dd);
                 output.appendChild(div);
                 div.appendChild(dt);
                 div.appendChild(dd);
                 output.appendChild(div);


@@ -62,16 +89,22 @@
         }
     </script>
     <style>
         }
     </script>
     <style>

-        dl { border: 1px solid black; }
+        dl { border: 1px solid black; padding: 1px; }

         dt, dd { display: inline; }
         dt:after { content:": " }
         dd:after { content:"\A"; white-space:pre; }
         dd dl { margin: 0; vertical-align: top }
         dt, dd { display: inline; }
         dt:after { content:": " }
         dd:after { content:"\A"; white-space:pre; }
         dd dl { margin: 0; vertical-align: top }

+        dd span { display: inline-block; vertical-align: top; }
+
+        dt, dd { display: inline-block; min-width: 8em; }
+        dd { margin-left: 1em; }

         
         /* make the output display as a table */
         
         /* make the output display as a table */

+        /*

         dl { display: table; }
         dl div { display: table-row; }
         dt, dd { display: table-cell; }
         dl { display: table; }
         dl div { display: table-row; }
         dt, dd { display: table-cell; }

+        */

     </style>
 </head>
 <body id="atomtester" onload="setup()">
     </style>
 </head>
 <body id="atomtester" onload="setup()">