From e089e337cc06ea9135c878f9351bc8a1e82c4a4b Mon Sep 17 00:00:00 2001 From: nils Date: Thu, 11 Apr 2024 18:16:32 +0200 Subject: [PATCH 1/7] update gpac.html --- share/emscripten/gpac.html | 3901 ++++++++++++++++++++---------------- 1 file changed, 2125 insertions(+), 1776 deletions(-) diff --git a/share/emscripten/gpac.html b/share/emscripten/gpac.html index 4cb1ab6270..c954283646 100644 --- a/share/emscripten/gpac.html +++ b/share/emscripten/gpac.html @@ -1,1907 +1,2264 @@ - + - GPAC WASM - + + + +
+ + Downloading... + +
-
- Home Wiki - GPAC@WASM - Run MP4Box and gpac in your browser ! - +
+
+ +
+
- - - - - - - - - - - - - - - - - - - -
Downloading...
- - - - -
- -
-
- - -
- - - -
- -
- - - - - - - -
+ let fio = { + udta: this.dict.length, + url: url, + _wrap_io: wrap_io, + _pos: 0, + _size: 0, + _stream: null, //FS.open stream object + _file: null, //fileSelector file object + _refs: 0, + _select: 0, + _block_pos_in_file: 0, + _block_pos: 0, //amount of bytes read from block + _ab: null, + _max_bsize: GPAC.read_block_size, //min size, will grow to block_size of fin filter + _discard_next: null, + _timer: null, + _writer: null, + _fetch: null, + _fetch_wait: null, + gfio_url: function() { + return GFIO.get_url(fio._gfio); + } + }; + this.dict.push(fio); + fio._gfio = this.wrap_new(url, fio.udta, this._pf_open, this._pf_seek, (mode==2) ? 0 : this._pf_read, (mode==1) ? 0 : this._pf_write, this._pf_tell, this._pf_eof, 0); + //only run gfio on main thread ? + this.tag_main(fio._gfio); + return fio; + }, + //for file system read, loads next block from file + _load_block: function(fio) { + let max_bsize = fio._max_bsize; + let bsize = (fio._block_pos_in_file + max_bsize > fio._size) ? (fio._size - fio._block_pos_in_file) : max_bsize; + let blob = fio._file.slice(fio._block_pos_in_file, fio._block_pos_in_file + bsize); + let read = new FileReader(); + read.onload = function(evt) { + fio._ab = evt.target.result; + }; + read.readAsArrayBuffer(blob); + } + }; + + - From f4575ecd76fbc77712c6bb68f8ef93b207cc16db Mon Sep 17 00:00:00 2001 From: nils Date: Thu, 11 Apr 2024 18:19:12 +0200 Subject: [PATCH 2/7] disable threads switch --- share/emscripten/gpac.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/emscripten/gpac.html b/share/emscripten/gpac.html index c954283646..e6cb3e9755 100644 --- a/share/emscripten/gpac.html +++ b/share/emscripten/gpac.html @@ -170,6 +170,7 @@
  • experimental wasm playground
    • +
    • From b4fc37d97b946cf6fe521933bb0d6526df96a136 Mon Sep 17 00:00:00 2001 From: nils Date: Thu, 11 Apr 2024 19:13:31 +0200 Subject: [PATCH 3/7] toggle threaded wasm build in gpac.html --- share/emscripten/gpac.html | 39 +++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/share/emscripten/gpac.html b/share/emscripten/gpac.html index e6cb3e9755..36b3a33354 100644 --- a/share/emscripten/gpac.html +++ b/share/emscripten/gpac.html @@ -29,6 +29,10 @@ color: rgb(20, 20, 20); } + #menu label { + margin: 0; + } + svg.icon-theme-toggle.moon g circle { transform: scale(1.4); transition-delay: 0s; @@ -155,7 +159,7 @@ - + @@ -170,16 +174,12 @@
    • experimental wasm playground
      • -
    • @@ -244,6 +244,7 @@ document.getElementById('output').innerHTML += this.value + '
      '; } process_command(); + event.preventDefault(); } " onkeyup=" let idx=cmd_idx; @@ -271,19 +272,16 @@ if (event.ctrlKey) { switch (event.keyCode) { case 67: // Ctrl+C - var cmdElement = document.getElementById('cmd'); setCommand(''); break; case 76: // Ctrl+L outputElement.innerHTML = ''; break; case 65: // Ctrl+A - var cmdElement = document.getElementById('cmd'); cmdElement.selectionStart = 0; cmdElement.selectionEnd = 0; break; case 69: // Ctrl+E - var cmdElement = document.getElementById('cmd'); cmdElement.selectionStart = cmdElement.value.length; cmdElement.selectionEnd = cmdElement.value.length; break; @@ -458,7 +456,7 @@

      Performances

      const outputElement = document.getElementById('output'); const abortElement = document.getElementById('abort'); const threadingElement = document.getElementById('threading'); - + let console_bck = ''; let cmd_idx = -1; let ctrl_down=false; @@ -530,12 +528,8 @@

      Performances

      // unload current GPAC } - threadingElement.onchange = () => { - - } - function setCommand(value) { - cmdElement.value = value; + cmdElement.value = value == '' ? null : value; }; function onGpacReady() { @@ -710,11 +704,12 @@

      Performances

      do_log('Error: ' + arguments[0]); } GPAC.no_log = true; - outputElement.innerHTML += consolePrefix(); + outputElement.innerHTML += `
      ${consolePrefix()}`; isRunning = false; - selCmdElement.removeAttribute("hidden"); + selCmdElement.hidden = false; fsRunForm.hidden = true; runElement.hidden = false; + setCommand(''); } const onCommandRun = (cmd) => { @@ -723,7 +718,7 @@

      Performances

      selCmdElement.hidden = true; runElement.hidden = true; // print command that is being run - outputElement.innerHTML += ''+ cmd +'

      '; + // outputElement.innerHTML += ''+ cmd +'

      '; fsRunForm.removeAttribute("hidden"); isRunning = true; set_status(''); @@ -2603,6 +2598,16 @@

      Performances

      From 45bf365ffef6091184c3588ef9c17fa93076538f Mon Sep 17 00:00:00 2001 From: nils Date: Thu, 11 Apr 2024 19:57:29 +0200 Subject: [PATCH 4/7] cosmetics --- share/emscripten/gpac.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/share/emscripten/gpac.html b/share/emscripten/gpac.html index 36b3a33354..e07884c151 100644 --- a/share/emscripten/gpac.html +++ b/share/emscripten/gpac.html @@ -33,6 +33,10 @@ margin: 0; } + #logo svg:first-child { + margin-right: .5em; + } + svg.icon-theme-toggle.moon g circle { transform: scale(1.4); transition-delay: 0s; @@ -117,13 +121,14 @@ } #status-wrapper { - font-size: x-small; + font-size: small; align-items: center; min-height: 1em; + margin-bottom: 0.5em; } #status { font-weight: bold; - color: rgb(120, 120, 120); + color: var(--pico-primary); } From 69c576267f6fb33609c2eeec03dbe81a556b5b3b Mon Sep 17 00:00:00 2001 From: nils Date: Fri, 12 Apr 2024 01:26:19 +0200 Subject: [PATCH 5/7] update gpac.html --- share/emscripten/favicon-32x32.png | Bin 0 -> 952 bytes share/emscripten/gpac.html | 70 +++++++++++++++-------------- 2 files changed, 36 insertions(+), 34 deletions(-) create mode 100755 share/emscripten/favicon-32x32.png diff --git a/share/emscripten/favicon-32x32.png b/share/emscripten/favicon-32x32.png new file mode 100755 index 0000000000000000000000000000000000000000..356d915841e9dac54ae26de19d2d95df2695e61b GIT binary patch literal 952 zcmV;p14sOcP)Px#z)(z7MNDaNju|cSO-=1eO4=qkhP#Ymi z(KbBkNJzmTHXI&D@l8$GH9zo9PT)B|@=i^}B{%FyN#j657#&BJ7 z8$k0-PV`Jl7aT_3Hay5BH^($P`cYB)PECjuDeq2AU>7s=PEN}xH{m%v#vwM07A%bv zC>kC}q%A$WA~VJyH^d<}oE|UTC@VQ8N$g8ZcP&KPFgDUDJn>6Sj1(v$Ax9b?NbgWj z>`hF^Avx10H=hv|iU0rrKy*@0Qvm+Vy!{yd{{9F4{n4l@@I>0@4*XSHP3NH~cVHXl zr~HgGhm{h8Z2pSoLW%jQvAMc?>-)ycw~EBA|NsC0{%in5i~s-u=Sf6CR5;6Zlj(MX zFc5_!ix8HugP?#*-K%zAq`>>XRc8_{)YINyIoyvslSx8IUsMHA@{iPHWlNqX$sdXO zmpzs=?Mq1WR<{UE!2SUcnf$6m$BwXT5C=4E7WDiTw`(Jufn%xm&Zaa6!0oUV) z$BEgsitAvwrosaJhUO3_h3QFC@me z4Bnx0ClP7;-C!?Pa}NLsBUk}|ed&iT7T3;Z7=iz-6{CI;0eO^KRvP6Z!hx-=V6g>2 zbQ4*61=6jEmzH2}kW5dlQOh`!Xr$|$s79Qy0gwVhABG`sA+xT2RaqGTcQ_msfsKK{ zz1{)UJpwfcNZBX`lvwrxAYw_VjpKvb+olaYM)Fb5uSOYBp~>3DK{i9hn2?MEdI#VM z)i_G#H|<6aaxC#v#mceAFUQ5H&Jha7-`aylH6; zTjkA7yMUB+SAchcM6o_!0R0?GU>k*dy>c-pl(*Mstn&OSJ8(TW%2Ri1*S^^xGCdp) zei4S?D(zGM;>Sn~TVRCR)?fdAf~+)6vjOO$clY+`QMdF>uBP!%aq!3Mq%7VZPY=g! z%>I4gK;3%Z`hriKrXNaq00012dQ@0+Qek%>aB^>EX>4U6ba`-PAZc)PV*mhnoa6Eg z2ys>@D9TUE%t_@^00ScnE@KN5BNI!L6ay0=M1VBIWCJ6!R3OXP)X2ol#2my2%YaCr aN-hBE7ZG&wLN%2D0000 Run MP4Box & GPAC in your browser ! + @@ -225,10 +232,8 @@
    -
    - +
    Downloading... -
    @@ -241,7 +246,7 @@
    -