Add capacitor #3
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,51 @@ | ||
| import Component from '@glimmer/component'; | ||
| import { action } from '@ember/object'; | ||
| import { Plugins } from '@capacitor/core'; | ||
| const { VoiceRecorder, Device } = Plugins; | ||
| import { Base64Binary } from 'wuf/utils/base64Binary'; | ||
|
|
||
| export default class AudioCapturerComponent extends Component { | ||
| @action | ||
| async startRecording() { | ||
| const deviceInfo = await Device.getInfo(); | ||
|
|
||
| if (deviceInfo.operatingSystem === 'ios') { | ||
| const canRecord = await VoiceRecorder.canDeviceVoiceRecord(); | ||
| if (canRecord) { | ||
| const permissionGranted = await VoiceRecorder.requestAudioRecordingPermission(); | ||
| if (permissionGranted) { | ||
| await VoiceRecorder.startRecording(); | ||
| } | ||
| } | ||
| } else { | ||
| const stream = await navigator.mediaDevices.getUserMedia({ | ||
| audio: true, | ||
| video: false | ||
| }); | ||
| const options = { mimeType: 'audio/webm' }; | ||
| this.mediaRecorder = new MediaRecorder(stream, options); | ||
|
|
||
| this.mediaRecorder.addEventListener('dataavailable', e => { | ||
| this.args.uploadAudioVideo({ blob: e.data }); | ||
| }); | ||
|
|
||
| this.mediaRecorder.start(); | ||
| } | ||
| } | ||
|
|
||
| @action | ||
| async stopRecording() { | ||
| const deviceInfo = await Device.getInfo(); | ||
|
|
||
| if (deviceInfo.operatingSystem === 'ios') { | ||
| let result = await VoiceRecorder.stopRecording(); | ||
| let byteArray = Base64Binary.decodeArrayBuffer(result.value.recordDataBase64); | ||
|
|
||
| this.args.uploadAudioVideo(byteArray); | ||
| } else { | ||
| if (this.mediaRecorder) { | ||
| this.mediaRecorder.stop(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| Copyright (c) 2011, Daniel Guerrero | ||
| All rights reserved. | ||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are met: | ||
| * Redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
| * Redistributions in binary form must reproduce the above copyright | ||
| notice, this list of conditions and the following disclaimer in the | ||
| documentation and/or other materials provided with the distribution. | ||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
| ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| DISCLAIMED. IN NO EVENT SHALL DANIEL GUERRERO BE LIABLE FOR ANY | ||
| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| /** | ||
| * Uses the new array typed in javascript to binary base64 encode/decode | ||
| * at the moment just decodes a binary base64 encoded | ||
| * into either an ArrayBuffer (decodeArrayBuffer) | ||
| * or into an Uint8Array (decode) | ||
| * | ||
| * References: | ||
| * https://developer.mozilla.org/en/JavaScript_typed_arrays/ArrayBuffer | ||
| * https://developer.mozilla.org/en/JavaScript_typed_arrays/Uint8Array | ||
| */ | ||
|
|
||
| export const Base64Binary = { | ||
| _keyStr : 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=', | ||
|
|
||
| /* will return a Uint8Array type */ | ||
| decodeArrayBuffer: function(input) { | ||
| var bytes = (input.length/4) * 3; | ||
| var ab = new ArrayBuffer(bytes); | ||
| this.decode(input, ab); | ||
|
|
||
| return ab; | ||
| }, | ||
|
|
||
| removePaddingChars: function(input){ | ||
| var lkey = this._keyStr.indexOf(input.charAt(input.length - 1)); | ||
| if(lkey == 64){ | ||
| return input.substring(0,input.length - 1); | ||
| } | ||
| return input; | ||
| }, | ||
|
|
||
| decode: function (input, arrayBuffer) { | ||
| //get last chars to see if are valid | ||
| input = this.removePaddingChars(input); | ||
| input = this.removePaddingChars(input); | ||
|
|
||
| var bytes = parseInt((input.length / 4) * 3, 10); | ||
|
|
||
| var uarray; | ||
| var chr1, chr2, chr3; | ||
| var enc1, enc2, enc3, enc4; | ||
| var i = 0; | ||
| var j = 0; | ||
|
|
||
| if (arrayBuffer) | ||
| uarray = new Uint8Array(arrayBuffer); | ||
| else | ||
| uarray = new Uint8Array(bytes); | ||
|
|
||
| input = input.replace(/[^A-Za-z0-9+/=]/g, ''); | ||
|
|
||
| for (i=0; i<bytes; i+=3) { | ||
| //get the 3 octects in 4 ascii chars | ||
| enc1 = this._keyStr.indexOf(input.charAt(j++)); | ||
| enc2 = this._keyStr.indexOf(input.charAt(j++)); | ||
| enc3 = this._keyStr.indexOf(input.charAt(j++)); | ||
| enc4 = this._keyStr.indexOf(input.charAt(j++)); | ||
|
|
||
| chr1 = (enc1 << 2) | (enc2 >> 4); | ||
| chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); | ||
| chr3 = ((enc3 & 3) << 6) | enc4; | ||
|
|
||
| uarray[i] = chr1; | ||
| if (enc3 != 64) uarray[i+1] = chr2; | ||
| if (enc4 != 64) uarray[i+2] = chr3; | ||
| } | ||
|
|
||
| return uarray; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "appId": "com.example.app", | ||
| "appName": "ember-capacitor-app", | ||
| "bundledWebRuntime": false, | ||
| "npmClient": "yarn", | ||
| "webDir": "dist", | ||
| "server": { | ||
| "url": "http://localhost:4200", | ||
| "allowNavigation": [ | ||
| "example.org", | ||
| "*.example.org" | ||
| ] | ||
| }, | ||
| "plugins": { | ||
| "SplashScreen": { | ||
| "launchShowDuration": 0 | ||
| } | ||
| }, | ||
| "cordova": {} | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jaredgalanis shouldn't this match the format from before where it's an object with
blobas the key?this.args.uploadAudioVideo({ blob: e.data });I think if we pass the same data format, we can ensure that it should draw the same.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So I tried passing instantiating a Blob with the ArrayBuffer that we get out of converting the base64 string with this in mind, but it didn't work unfortunately.