Merge branch 'main' into add-browsertest-runners-to-ci

Author: Awallky

.github/actions/sccache/action.yaml

@@ -10,15 +10,29 @@ runs:
   - name: Install sccache
     shell: bash
     run: brew install sccache
+  # - name: 'Set up Cloud SDK'
+  #   if: inputs.sccache_gcs_key == ''
+  #   uses: 'google-github-actions/setup-gcloud@v3'
+  #   with:
+  #     version: '>= 363.0.0'
   - name: Configure sccache
     shell: bash
     env:
       SCCACHE_GCS_KEY: ${{ inputs.sccache_gcs_key }}
     run: |
-      printf "%s" "$SCCACHE_GCS_KEY" > "${HOME}/gcloud.json"
-      echo "SCCACHE_GCS_RW_MODE=READ_WRITE" >> $GITHUB_ENV
-      echo "SCCACHE_GCS_KEY_PATH=${HOME}/gcloud.json" >> $GITHUB_ENV
-      echo "SCCACHE_GCS_BUCKET=cobalt-sccache-tvos-bucket" >> $GITHUB_ENV
+      if [[ -n "$SCCACHE_GCS_KEY" ]]; then
+        # If we have a GCS key we use READ_WRITE
+        printf "%s" "$SCCACHE_GCS_KEY" > "${HOME}/gcloud.json"
+        echo "SCCACHE_GCS_KEY_PATH=${HOME}/gcloud.json" >> $GITHUB_ENV
+        echo "SCCACHE_GCS_RW_MODE=READ_WRITE" >> $GITHUB_ENV
+        echo "SCCACHE_GCS_BUCKET=cobalt-sccache-tvos-bucket" >> $GITHUB_ENV
+      else
+        # Read only
+        echo "SCCACHE_BUCKET=cobalt-sccache-tvos-bucket" >> $GITHUB_ENV
+        echo "SCCACHE_ENDPOINT=https://storage.googleapis.com" >> $GITHUB_ENV
+        echo "SCCACHE_S3_NO_CREDENTIALS=true" >> $GITHUB_ENV
+        echo "SCCACHE_REGION=auto" >> $GITHUB_ENV
+      fi
       echo "SCCACHE=1" >> $GITHUB_ENV
       echo "SCCACHE_IDLE_TIMEOUT=0" >> $GITHUB_ENV
   - name: Start sccache server

.github/config/android-arm.json

@@ -7,7 +7,7 @@
   "test_on_device": true,
   "test_device_family": "android",
   "test_e2e": true,
-  "test_yts": false,
+  "test_yts": true,
   "test_yts_playback": true,
   "test_browser": false,
   "test_yts_wpt": false,

.github/config/android-arm64.json

@@ -7,8 +7,8 @@
   "test_on_device": true,
   "test_device_family": "android",
   "test_e2e": true,
-  "test_yts": false,
   "test_browser": false,
+  "test_yts": true,
   "test_root_target": "//cobalt/android:cobalt_apk",
   "test_dimensions": {
     "device_type": "nvidia_shield",

.github/workflows/main.yaml

@@ -456,7 +456,7 @@ jobs:
           targets: ${{ needs.initialize.outputs.targets }}
           test_root_target: ${{ needs.initialize.outputs.test_root_target }}
           test_targets_json_file: out/${{ matrix.platform }}_${{ matrix.config }}/test_targets.json
-          enable_sccache: ${{ needs.initialize.outputs.enable_sccache == 'true' && secrets.sccache_gcs_key != '' }}
+          enable_sccache: ${{ needs.initialize.outputs.enable_sccache == 'true' }}
           sccache_gcs_key: ${{ secrets.sccache_gcs_key }}
 
       - name: Release Package

.github/workflows/nightly_trigger_main.yaml

@@ -3,7 +3,7 @@ name: nightly_trigger_main
 on:
   schedule:
     # GMT timezone.
-    - cron: '0 10 * * *'
+    - cron: '0 10,12,14 * * *'
   workflow_dispatch:
 
 jobs:

cobalt/android/apk/app/src/main/java/dev/cobalt/media/AudioTrackBridge.java

@@ -20,6 +20,7 @@
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
+import android.media.PlaybackParams;
 import android.os.Build;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.RequiresApi;
@@ -227,11 +228,34 @@ public void release() {
     mAvSyncPacketBytesRemaining = 0;
   }
 
+
+  @CalledByNative
+  public boolean setPlaybackRate(float playbackRate) {
+    if (mAudioTrack == null) {
+      Log.e(TAG, "Unable to setPlaybackRate with NULL audio track.");
+      return false;
+    }
+    if (!mTunnelModeEnabled) {
+      Log.i(TAG, "Skip SetPlaybackRate for non tunnel mode tracks.");
+      return true;
+    }
+
+    try {
+      PlaybackParams params = mAudioTrack.getPlaybackParams();
+      params.setSpeed(playbackRate);
+      mAudioTrack.setPlaybackParams(params);
+    } catch (IllegalArgumentException | IllegalStateException e) {
+      Log.e(TAG, String.format("Unable to setPlaybackRate, error: %s", e.toString()));
+      return false;
+    }
+    return true;
+  }
+
   @CalledByNative
   public int setVolume(float gain) {
     if (mAudioTrack == null) {
       Log.e(TAG, "Unable to setVolume with NULL audio track.");
-      return 0;
+      return AudioTrack.ERROR_INVALID_OPERATION;
     }
     return mAudioTrack.setVolume(gain);
   }

media/audio/ios/audio_session_manager_ios.mm

@@ -13,11 +13,9 @@
 
 namespace media {
 
-// Below constant values are taken from :
+// The constant below is taken from:
 // https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/sdk/objc/components/audio/RTCAudioSessionConfiguration.m
 const int kRTCAudioSessionPreferredNumberOfChannels = 1;
-const double kRTCAudioSessionHighPerformanceSampleRate = 48000.0;
-const double kRTCAudioSessionHighPerformanceIOBufferDuration = 0.02;
 
 // static
 AudioSessionManagerIOS& AudioSessionManagerIOS::GetInstance() {
@@ -55,12 +53,6 @@
           error.localizedDescription);
   }
 
-  [audio_session
-      setPreferredSampleRate:kRTCAudioSessionHighPerformanceSampleRate
-                       error:nil];
-  [audio_session setPreferredIOBufferDuration:
-                     kRTCAudioSessionHighPerformanceIOBufferDuration
-                                        error:nil];
   // Find the desired input port
   NSArray* inputs = [audio_session availableInputs];
   AVAudioSessionPortDescription* builtInMic = nil;
@@ -132,9 +124,6 @@
   [audio_session setPreferredInputNumberOfChannels:
                      kRTCAudioSessionPreferredNumberOfChannels
                                              error:nil];
-  [audio_session setPreferredOutputNumberOfChannels:
-                     kRTCAudioSessionPreferredNumberOfChannels
-                                              error:nil];
 }
 
 void AudioSessionManagerIOS::SetActive(bool active) {

starboard/android/shared/audio_track_audio_sink_type.cc

@@ -188,13 +188,19 @@ AudioTrackAudioSink::~AudioTrackAudioSink() {
 
 void AudioTrackAudioSink::SetPlaybackRate(double playback_rate) {
   SB_DCHECK_GE(playback_rate, 0.0);
-  if (playback_rate != 0.0 && playback_rate != 1.0) {
-    SB_NOTIMPLEMENTED() << "TODO: Only playback rates of 0.0 and 1.0 are "
-                           "currently supported.";
-    playback_rate = (playback_rate > 0.0) ? 1.0 : 0.0;
+  SB_DLOG(INFO) << "Set playback rate to " << playback_rate;
+
+  {
+    std::lock_guard lock(mutex_);
+    playback_rate_ = playback_rate;
+  }
+
+  // AudioTrack doesn't support playback speed of 0.
+  if (playback_rate > 0.0) {
+    // AudioTrackBridge.setPlaybackRate() currently is only enabled for tunnel
+    // mode. It will be no-op for non tunnel player.
+    bridge_.SetPlaybackRate(playback_rate);
   }
-  std::lock_guard lock(mutex_);
-  playback_rate_ = playback_rate;
 }
 
 // TODO: Break down the function into manageable pieces.
@@ -439,6 +445,21 @@ int AudioTrackAudioSinkType::GetMinBufferSizeInFrames(
     int sampling_frequency_hz) {
   SB_CHECK(audio_track_audio_sink_type_);
   JNIEnv* env = AttachCurrentThread();
+
+  const bool force_tunnel_mode =
+      features::FeatureList::IsEnabled(features::kForceTunnelMode);
+  if (force_tunnel_mode) {
+    // AudioTrack.setPlaybackParams() needs extra buffer to support playback
+    // speed greater than 1.0x.
+    const double kMaxPlaybackSpeed = 2.0;
+    return std::max<int>(
+        AudioOutputManager::GetInstance()->GetMinBufferSizeInFrames(
+            env, sample_type, channels, sampling_frequency_hz),
+        audio_track_audio_sink_type_->GetMinBufferSizeInFramesInternal(
+            channels, sample_type, sampling_frequency_hz) *
+            kMaxPlaybackSpeed);
+  }
+
   return std::max(
       AudioOutputManager::GetInstance()->GetMinBufferSizeInFrames(
           env, sample_type, channels, sampling_frequency_hz),

starboard/android/shared/audio_track_bridge.cc

@@ -19,6 +19,7 @@
 #include "starboard/android/shared/audio_output_manager.h"
 #include "starboard/android/shared/media_common.h"
 #include "starboard/audio_sink.h"
+#include "starboard/common/check_op.h"
 #include "starboard/common/log.h"
 #include "starboard/shared/starboard/media/media_util.h"
 
@@ -241,6 +242,21 @@ int AudioTrackBridge::WriteSample(const uint8_t* samples,
   return bytes_written;
 }
 
+void AudioTrackBridge::SetPlaybackRate(
+    double playback_rate,
+    JNIEnv* env /*= AttachCurrentThread()*/) {
+  SB_DCHECK(env);
+  SB_DCHECK(is_valid());
+  // AudioTrack doesn't support playback speed of 0.
+  SB_DCHECK_GT(playback_rate, 0.0);
+
+  jboolean status = Java_AudioTrackBridge_setPlaybackRate(
+      env, j_audio_track_bridge_, static_cast<float>(playback_rate));
+  if (!status) {
+    SB_LOG(ERROR) << "Failed to set playback rate to " << playback_rate;
+  }
+}
+
 void AudioTrackBridge::SetVolume(double volume,
                                  JNIEnv* env /*= AttachCurrentThread()*/) {
   SB_DCHECK(env);

starboard/android/shared/audio_track_bridge.h

@@ -71,6 +71,8 @@ class AudioTrackBridge {
                   int64_t sync_time,
                   JNIEnv* env = base::android::AttachCurrentThread());
 
+  void SetPlaybackRate(double playback_rate,
+                       JNIEnv* env = base::android::AttachCurrentThread());
   void SetVolume(double volume,
                  JNIEnv* env = base::android::AttachCurrentThread());