From 6e080b252203d0638e9882f9d89d8bddd25df8e6 Mon Sep 17 00:00:00 2001 From: Trek H Date: Thu, 7 May 2020 00:49:43 +0930 Subject: [PATCH] audio-player: moving to vidgrind repo --- cmd/audio-player/adpcm.js | 179 --------------------------------- cmd/audio-player/favicon.ico | Bin 15406 -> 0 bytes cmd/audio-player/index.html | 44 -------- cmd/audio-player/main.js | 108 -------------------- cmd/audio-player/pcm-to-wav.js | 97 ------------------ 5 files changed, 428 deletions(-) delete mode 100644 cmd/audio-player/adpcm.js delete mode 100644 cmd/audio-player/favicon.ico delete mode 100644 cmd/audio-player/index.html delete mode 100644 cmd/audio-player/main.js delete mode 100644 cmd/audio-player/pcm-to-wav.js diff --git a/cmd/audio-player/adpcm.js b/cmd/audio-player/adpcm.js deleted file mode 100644 index 0648fbaa..00000000 --- a/cmd/audio-player/adpcm.js +++ /dev/null @@ -1,179 +0,0 @@ -/* -NAME - adpcm.js - -AUTHOR - Trek Hopton - -LICENSE - This file is Copyright (C) 2018 the Australian Ocean Lab (AusOcean) - - It is free software: you can redistribute it and/or modify them - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. - - It is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License in gpl.txt. - If not, see [GNU licenses](http://www.gnu.org/licenses). -*/ - -/* - Original IMA/DVI ADPCM specification: (http://www.cs.columbia.edu/~hgs/audio/dvi/IMA_ADPCM.pdf). - Reference algorithms for ADPCM compression and decompression are in part 6. -*/ - - -class Decoder { - constructor() { - this.est = 0; // Estimation of sample based on quantised ADPCM nibble. - this.idx = 0; // Index to step used for estimation. - this.step = 0; - } - - // Table of index changes (see spec). - static get indexTable() { - return [ - -1, -1, -1, -1, 2, 4, 6, 8, - -1, -1, -1, -1, 2, 4, 6, 8 - ]; - } - - // Quantize step size table (see spec). - static get stepTable() { - return [ - 7, 8, 9, 10, 11, 12, 13, 14, - 16, 17, 19, 21, 23, 25, 28, 31, - 34, 37, 41, 45, 50, 55, 60, 66, - 73, 80, 88, 97, 107, 118, 130, 143, - 157, 173, 190, 209, 230, 253, 279, 307, - 337, 371, 408, 449, 494, 544, 598, 658, - 724, 796, 876, 963, 1060, 1166, 1282, 1411, - 1552, 1707, 1878, 2066, 2272, 2499, 2749, 3024, - 3327, 3660, 4026, 4428, 4871, 5358, 5894, 6484, - 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, - 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, - 32767 - ]; - } - - static get byteDepth() { return 2; } // We are working with 16-bit samples. - static get headSize() { return 8; } // Number of bytes in the header of ADPCM. - static get chunkLenSize() { return 4; } // Length in bytes of the chunk length field in header. - static get compFact() { return 4; } // In general ADPCM compresses by a factor of 4. - - // decodeSample takes 4 bits which represents a single ADPCM nibble, and returns a 16 bit decoded PCM sample. - decodeSample(nibble) { - let diff = 0; - if ((nibble & 4) != 0) { - diff += this.step; - } - if ((nibble & 2) != 0) { - diff += this.step >> 1; - } - if ((nibble & 1) != 0) { - diff += this.step >> 2; - } - diff += this.step >> 3; - - if ((nibble & 8) != 0) { - diff = -diff; - } - this.est += diff; - this.idx += Decoder.indexTable[nibble]; - - if (this.idx < 0) { - this.idx = 0; - } else if (this.idx > Decoder.stepTable.length - 1) { - this.idx = Decoder.stepTable.length - 1; - } - - this.step = Decoder.stepTable[this.idx]; - - return this.est; - } - - // decode takes an array of bytes of arbitrary length representing adpcm and decodes it into pcm. - decode(b) { - let result = new Uint16Array(Decoder.decBytes(b)/Decoder.byteDepth); - let resultOff = 0; - // Iterate over each chunk and decode it. - let chunkLen; - for (let off = 0; off + Decoder.headSize <= b.length; off += chunkLen) { - // Read length of chunk and check if whole chunk exists. - chunkLen = Decoder.bytesToInt32(b.slice(off, off + Decoder.chunkLenSize)) - if (off + chunkLen > b.length) { - break; - } - - // Initialize Decoder. - this.est = Decoder.bytesToInt16(b.slice(off + Decoder.chunkLenSize, off + Decoder.chunkLenSize + Decoder.byteDepth)); - this.idx = b[off + Decoder.chunkLenSize + Decoder.byteDepth]; - this.step = Decoder.stepTable[this.idx]; - - result[resultOff] = Decoder.bytesToInt16(b.slice(off + Decoder.chunkLenSize, off + Decoder.chunkLenSize + Decoder.byteDepth)); - resultOff++; - - for (let i = off + Decoder.headSize; i < off + chunkLen - b[off + Decoder.chunkLenSize + 3]; i++) { - let twoNibs = b[i]; - let nib2 = twoNibs >> 4; - let nib1 = (nib2 << 4) ^ twoNibs; - - let sample1 = this.decodeSample(nib1); - result[resultOff] = sample1; - resultOff++; - - let sample2 = this.decodeSample(nib2); - result[resultOff] = sample2; - resultOff++; - } - if (b[off + Decoder.chunkLenSize + 3] == 1) { - let padNib = b[off + chunkLen - 1]; - let sample = this.decodeSample(padNib); - result[resultOff] = sample; - resultOff++; - } - } - return result; - } - - // bytesToInt16 takes an array of bytes (assumed to be values between 0 and 255), interprates them as little endian and converts it to an int16. - static bytesToInt16(b) { - return (b[0] | (b[1] << 8)); - } - - // bytesToInt32 takes an array of bytes (assumed to be values between 0 and 255), interprates them as little endian and converts it to an int32. - static bytesToInt32(b) { - return (b[0] | - (b[1] << 8) | - (b[2] << 16) | - (b[3] << 24)); - } - - // decBytes takes a parameter that is assumed to be a byte array containing one or more adpcm chunks. - // It reads the chunk lengths from the chunk headers to calculate and return the number of pcm bytes that are expected to be decoded from the adpcm. - static decBytes(b){ - let chunkLen; - let n = 0; - for (let off = 0; off + Decoder.headSize <= b.length; off += chunkLen) { - chunkLen = Decoder.bytesToInt32(b.slice(off, off + Decoder.chunkLenSize)) - if (off + chunkLen > b.length) { - break; - } - - // Account for uncompressed sample in header. - n += Decoder.byteDepth; - // Account for PCM bytes that will result from decoding ADPCM. - n += (chunkLen - Decoder.headSize)*Decoder.compFact; - // Account for padding. - if(b[off+Decoder.chunkLenSize+3] == 0x01){ - n -= Decoder.byteDepth; - } - } - return n; - } -} \ No newline at end of file diff --git a/cmd/audio-player/favicon.ico b/cmd/audio-player/favicon.ico deleted file mode 100644 index 465b02c257d3a5388ce1a7744355834fbd37fa82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15406 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 diff --git a/cmd/audio-player/index.html b/cmd/audio-player/index.html deleted file mode 100644 index 55b39f02..00000000 --- a/cmd/audio-player/index.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - Audio Player - - - - - - - -
-
-
- URL: -
-
- -
-
-
-
-
- -
-
-
- -
-
-
-
-
- ©2019 Australian Ocean Laboratory Limited (AusOcean) (License) -
-
- - - \ No newline at end of file diff --git a/cmd/audio-player/main.js b/cmd/audio-player/main.js deleted file mode 100644 index a71d1687..00000000 --- a/cmd/audio-player/main.js +++ /dev/null @@ -1,108 +0,0 @@ -/* -NAME - main.js - -AUTHOR - Trek Hopton - Alan Noble - -LICENSE - This file is Copyright (C) 2018 the Australian Ocean Lab (AusOcean) - - It is free software: you can redistribute it and/or modify them - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. - - It is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License in gpl.txt. - If not, see [GNU licenses](http://www.gnu.org/licenses). -*/ - -// playFile will process and play the chosen target file. -function playFile() { - const input = event.target.files[0] - const reader = new FileReader() - - reader.onload = event => { - bytes = new Uint8Array(event.target.result); - - let dec = new Decoder(); - - // Decode adpcm to pcm. - let decoded = dec.decode(bytes); - - // Convert raw pcm to wav TODO(Trek): make these configurable. - let wav = pcmToWav(new Uint8Array(decoded.buffer), 48000, 1, 16); - - // Play wav data in player. - const blob = new Blob([wav], { - type: 'audio/wav' - }); - const url = URL.createObjectURL(blob); - - const audio = document.getElementById('audio'); - const source = document.getElementById('source'); - - source.src = url; - audio.load(); - audio.play(); - } - reader.onerror = error => reject(error) - reader.readAsArrayBuffer(input) - -} - -// getQuery gets everything after the question mark in the URL. -function getQuery() { - let regex = new RegExp("\\?(.*)"); - let match = regex.exec(window.location.href); - if (match == null) { - return ''; - } else { - return decodeURIComponent(match[1].replace(/\+/g, " ")); - } -} - -// load gets the file from the given url and displays a link for download. -function load() { - let url = document.getElementById('url').value; - if (url == "") { - url = getQuery() - document.getElementById('url').value = url; - } - if (url[0] == '/') { - url = window.location.protocol + '//' + window.location.host + url; - } - if (url == "") { - return; - } - - let request = new XMLHttpRequest(); - request.responseType = "blob"; - request.onreadystatechange = function () { - if (request.readyState === XMLHttpRequest.DONE) { - if (request.status === 200) { - console.log("request received"); - - data = request.response; - - dataURL = URL.createObjectURL(data); - - let link = document.getElementById("link"); - link.href = dataURL; - link.download = "media.ts"; - link.innerHTML = "Download"; - - } else { - console.log('There was a problem with the request. Status: ' + request.status); - } - } - } - request.open("GET", url, true); - request.send(); -} \ No newline at end of file diff --git a/cmd/audio-player/pcm-to-wav.js b/cmd/audio-player/pcm-to-wav.js deleted file mode 100644 index 32848abb..00000000 --- a/cmd/audio-player/pcm-to-wav.js +++ /dev/null @@ -1,97 +0,0 @@ -/* -NAME - pcm-to-wav.js - -AUTHOR - Trek Hopton - -LICENSE - This file is Copyright (C) 2018 the Australian Ocean Lab (AusOcean) - - It is free software: you can redistribute it and/or modify them - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. - - It is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License in gpl.txt. - If not, see [GNU licenses](http://www.gnu.org/licenses). -*/ - -// pcmToWav takes raw pcm data along with the sample rate, number of channels and bit-depth, -// and adds a WAV header to it so that it can be read and played by common players. -// Input should be a Uint16Array containing 16 bit PCM samples, output will be a Uint8Array representing the bytes of the wav file. -// WAV spec.: http://soundfile.sapp.org/doc/WaveFormat/ -function pcmToWav(data, rate, channels, bitdepth) { - let subChunk2ID = [100, 97, 116, 97]; // "data". - let subChunk2Size = int32ToBytes(data.length); - - let subChunk1ID = [102, 109, 116, 32]; // "fmt ". - let subChunk1Size = int32ToBytes(16); - let audioFmt = int16ToBytes(1); // 1 = PCM. - let numChannels = int16ToBytes(channels); - let sampleRate = int32ToBytes(rate); - let byteRate = int32ToBytes(rate * channels * bitdepth / 8); - let blockAlign = int16ToBytes(channels * bitdepth / 8); - let bitsPerSample = int16ToBytes(bitdepth) - - let chunkID = [82, 73, 70, 70]; // "RIFF". - let chunkSize = int32ToBytes(36 + data.length); - let format = [87, 65, 86, 69]; // "WAVE". - - let result = new Uint8Array((data.length*2) + 44); - let off = 0; - - result.set(chunkID, off); - off += 4; - result.set(chunkSize, off); - off += 4; - result.set(format, off); - off += 4; - result.set(subChunk1ID, off); - off += 4; - result.set(subChunk1Size, off); - off += 4; - result.set(audioFmt, off); - off += 2; - result.set(numChannels, off); - off += 2; - result.set(sampleRate, off); - off += 4; - result.set(byteRate, off); - off += 4; - result.set(blockAlign, off); - off += 2; - result.set(bitsPerSample, off); - off += 2; - result.set(subChunk2ID, off); - off += 4; - result.set(subChunk2Size, off); - off += 4; - - result.set(data, off); - - return result; -} - -// int32ToBytes takes a number assumed to be an int 32 and converts it to an array containing bytes (Little Endian). -function int32ToBytes(num) { - let b = new Uint8Array(4); - b[0] = (num & 0x000000ff); - b[1] = (num & 0x0000ff00) >> 8; - b[2] = (num & 0x00ff0000) >> 16; - b[3] = (num & 0xff000000) >> 24; - return b; -} - -// int16ToBytes takes a number assumed to be an int 16 and converts it to an array containing bytes (Little Endian). -function int16ToBytes(num) { - let b = new Uint8Array(2); - b[0] = (num & 0x00ff); - b[1] = (num & 0xff00) >> 8; - return b; -} \ No newline at end of file