Add Audible support to the whispernet client.

chrome/browser/resources/whispernet_proxy/js/wrapper.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 /**
  * Function to convert an array of bytes to a base64 string
  * TODO(rkc): Change this to use a Uint8array instead of a string.
  * @param {string} bytes String containing the bytes we want to convert.
@@ skipping 26 matching lines @@
  * @param {Object} whisperNacl The NaclBridge object to use to communicate with
  * the whispernet wrapper.
  */
 function WhisperEncoder(params, whisperNacl) {
   params = params || {};
   this.repetitions_ = params.repetitions || 3;
 
   this.whisperNacl_ = whisperNacl;
   this.whisperNacl_.addListener(this.onNaclMessage_.bind(this));
 
-  var symbolCoder = {};
-  symbolCoder.sample_rate = params.sampleRate || 48000.0;
-  symbolCoder.upsampling_factor = params.bitsPerSample || 16;
-  symbolCoder.desired_carrier_frequency = params.carrierFrequency || 18500.0;
-  symbolCoder.bits_per_symbol = 4;
-  symbolCoder.min_cycles_per_frame = 4;
-  symbolCoder.baseband_decimation_factor = 4;
-
   var msg = {
     type: 'initialize_encoder',
-    symbol_coder: symbolCoder,
-    encoder_params: {
-      bytes_per_token: 6,
-      include_parity_symbol: true,
-      single_sideband: true
-    }
+    sample_rate: params.sampleRate || 48000.0,
+    upsampling_factor: params.bitsPerSample || 16,
   };
   this.whisperNacl_.send(JSON.stringify(msg));
 }
 
 /**
  * Method to encode a token.
  * @param {string} token Token to encode.
+ * @param {boolean} audible Whether we should use encode audible samples.
  * @param {boolean} raw Whether we should return the encoded samples in raw
  * format or as a Wave file.
  */
-WhisperEncoder.prototype.encode = function(token, raw) {
+WhisperEncoder.prototype.encode = function(token, audible, raw) {
   var msg = {
     type: 'encode_token',
     // Trying to send the token in binary form to Nacl doesn't work correctly.
     // We end up with the correct string + a bunch of extra characters. This is
     // true of returning a binary string too; hence we communicate back and
     // forth by converting the bytes into an array of integers.
     token: stringToArray(token),
     repetitions: this.repetitions_,
+    use_dtmf: audible,
     return_raw_samples: raw
   };
   this.whisperNacl_.send(JSON.stringify(msg));
 };
 
 /**
  * Method to set the callback for encoded audio data received from the encoder
  * when we finish encoding a token.
  * @param {function(string, ArrayBuffer)} callback Callback which will receive
  * the audio samples.
@@ skipping 23 matching lines @@
  * the whispernet wrapper.
  */
 function WhisperDecoder(params, whisperNacl) {
   params = params || {};
 
   this.whisperNacl_ = whisperNacl;
   this.whisperNacl_.addListener(this.onNaclMessage_.bind(this));
 
   var msg = {
     type: 'initialize_decoder',
-    num_channels: params.channels,
-    symbol_coder: {
-      sample_rate: params.sampleRate || 48000.0,
-      upsampling_factor: params.bitsPerSample || 16,
-      desired_carrier_frequency: params.carrierFrequency || 18500.0,
-      bits_per_symbol: 4,
-      min_cycles_per_frame: 4,
-      baseband_decimation_factor: 4
-    },
-    decoder_params: {
-      bytes_per_token: 6,
-      include_parity_symbol: true,
-      max_candidates: 1,
-      broadcaster_stopped_threshold_in_seconds: 10
-    },
-    acquisition_params: {
-      max_buffer_duration_in_seconds: 3
-    }
+    channels: params.channels || 1,
+    sample_rate: params.sampleRate || 48000.0,
+    upsampling_factor: params.bitsPerSample || 16,
+    max_candidates: 1,
+    max_buffer_duration_in_seconds: 3
   };
   this.whisperNacl_.send(JSON.stringify(msg));
 }
 
 /**
  * Method to request the decoder to wipe its internal buffer.
  */
 WhisperDecoder.prototype.wipeDecoder = function() {
   var msg = {
     type: 'wipe_decode_buffer'
@@ skipping 62 matching lines @@
  */
 WhisperDecoder.prototype.handleCandidates_ = function(candidates) {
   if (!this.tokenCallback_ || !candidates || candidates.length == 0)
     return;
 
   var returnCandidates = [];
   for (var i = 0; i < candidates.length; ++i)
     returnCandidates[i] = bytesToBase64(candidates[i]);
   this.tokenCallback_(returnCandidates);
 };