944615 - gUM with audio on emulator fails

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Emulator, defect)

Description

[StevenLee[:slee]]

On emulator, when we calling gUM with audio, it fails. Because the mic on emulator only supports 8k audio. GIPS always initialized with 48k on B2G, [1]. 

[1] http://dxr.mozilla.org/mozilla-central/source/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc#314

Comment 1

[StevenLee[:slee]]

Attachment: patch

Making AudioHardwareGeneric supports more sampling frequency.

Comment 2

[Jason Smith [:jsmith]]

After enabling this, we might want to consider fixing the gUM mochitests to leverage real devices for audio instead the fake streams. That will get us better test coverage.

Comment 3

[Vicamo Yang [:vicamo][:vyang]]

(In reply to StevenLee from comment #1)
> Making AudioHardwareGeneric supports more sampling frequency.

Note: this patch is to be applied to device/generic/goldfish of 'master' branch.  For emulator-jb, a similar thing has to be applied to device/generic/goldfish/audio/audio_hw.c:

  static size_t in_get_buffer_size(...)
  {
    return IN_BUFFER_SIZE;
  }

Comment 4

[Vicamo Yang [:vicamo][:vyang]]

(In reply to Vicamo Yang [:vicamo][:vyang] from comment #3)
>   static size_t in_get_buffer_size(...)

Correct: static size_t adev_get_input_buffer_size(...)

Comment 5

[Vicamo Yang [:vicamo][:vyang]]

Comment on attachment 8340947 [details] [diff] [review]
patch

Review of attachment 8340947 [details] [diff] [review]:
-----------------------------------------------------------------

::: audio/AudioHardwareGeneric.cpp
@@ +210,5 @@
> +           return 1024*channelCount;
> +       } else {
> +           return 512*channelCount;
> +       }
> +    }

nit:

  uint32_t bytesPerSample = audio_bytes_per_sample(format);
  uint32_t samplesPerChannel = 0;

  if (sampleRate == 8000 || sampleRate == 16000) {
    samplesPerChannel = sampleRate / 50;
  } else if (sampleRate >= 44100) {
    samplesPerChannel = 512;
  } else {
    samplesPerChannel = 256;
  }

  return samplesPerChannel * channelCount * bytesPerSample;

::: audio/AudioHardwareGeneric.h
@@ +134,4 @@
>      virtual    void        closeInputStream(AudioStreamIn* in);
>  
>              void            closeOutputStream(AudioStreamOutGeneric* out);
> +    virtual size_t getInputBufferSize(uint32_t sampleRate, int format, int channelCount);

nit: align to |closeOutputStream|.

Comment 6

[StevenLee[:slee]]

Attachment: patch v2

Comment 7

[Vicamo Yang [:vicamo][:vyang]]

Please have a pull request to https://github.com/mozilla-b2g/device_generic_goldfish/ :)

Comment 8

[StevenLee[:slee]]

Attachment: Pull request of patch

Comment 9

[Ivan Tsay (:ITsay)]

Plus this one for emulator to better support audio test

Comment 10

[Randell Jesup [:jesup] (needinfo me)]

As soon as this is pulled and installed, we need to land the test patch from bug 853356 (which is perma-orange without it, since it wants 44100Hz).  mwu: any chance of pull/install?

Comment 11

[Jason Smith [:jsmith]]

(In reply to Ivan Tsay (:ITsay) from comment #9)
> Plus this one for emulator to better support audio test

Tests won't block the release, so this isn't a blocker.

Comment 12

[Ryan VanderMeulen [:RyanVM]]

Master: https://github.com/mozilla-b2g/device_generic_goldfish/commit/5be0a9c4b3c6c004786917fdb5bee248960d045b