From f83ae97f18fa9fc7e6ca1a89275b9e2dfb941fde Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@google.com>
Date: Fri, 19 Apr 2024 17:55:09 +0000
Subject: [PATCH] test: Fix codec-switching test config

Related to #6458
---
 .../codec_switching_integration.js            | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/test/codec_switching/codec_switching_integration.js b/test/codec_switching/codec_switching_integration.js
index 8a7b432be9..586c225551 100644
--- a/test/codec_switching/codec_switching_integration.js
+++ b/test/codec_switching/codec_switching_integration.js
@@ -51,10 +51,12 @@ describe('Codec Switching', () => {
       if (!MediaSource.isTypeSupported('audio/webm; codecs="opus"')) {
         pending('Codec OPUS in WEBM is not supported by the platform.');
       }
+
+      // English is AAC MP4.
       const preferredAudioLanguage = 'en';
       player.configure({preferredAudioLanguage: preferredAudioLanguage});
       player.configure('manifest.disableVideo', true);
-      player.configure('streaming.mediaSource.codecSwitchingStrategy',
+      player.configure('mediaSource.codecSwitchingStrategy',
           shaka.config.CodecSwitchingStrategy.RELOAD);
 
       await player.load('/base/test/test/assets/dash-multi-codec/dash.mpd', 9);
@@ -68,6 +70,7 @@ describe('Codec Switching', () => {
       expect(variants.length).toBe(2);
       expect(variants.find((v) => !!v.active).language).toBe('en');
 
+      // Spanish is Opus WebM.
       player.selectAudioLanguage('es');
       await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 10, 45);
 
@@ -86,10 +89,12 @@ describe('Codec Switching', () => {
       if (!MediaSource.isTypeSupported('audio/webm; codecs="opus"')) {
         pending('Codec OPUS in WEBM is not supported by the platform.');
       }
+
+      // English is AAC MP4.
       const preferredAudioLanguage = 'en';
       player.configure({preferredAudioLanguage: preferredAudioLanguage});
       player.configure('manifest.disableVideo', true);
-      player.configure('streaming.mediaSource.codecSwitchingStrategy',
+      player.configure('mediaSource.codecSwitchingStrategy',
           shaka.config.CodecSwitchingStrategy.SMOOTH);
 
       await player.load('/base/test/test/assets/dash-multi-codec/dash.mpd', 9);
@@ -103,6 +108,7 @@ describe('Codec Switching', () => {
       expect(variants.length).toBe(2);
       expect(variants.find((v) => !!v.active).language).toBe('en');
 
+      // Spanish is Opus WebM.
       player.selectAudioLanguage('es');
       await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 10, 45);
 
@@ -119,9 +125,11 @@ describe('Codec Switching', () => {
       if (!MediaSource.isTypeSupported('audio/webm; codecs="opus"')) {
         pending('Codec OPUS in WEBM is not supported by the platform.');
       }
+
+      // English is AAC MP4.
       const preferredAudioLanguage = 'en';
       player.configure({preferredAudioLanguage: preferredAudioLanguage});
-      player.configure('streaming.mediaSource.codecSwitchingStrategy',
+      player.configure('mediaSource.codecSwitchingStrategy',
           shaka.config.CodecSwitchingStrategy.RELOAD);
 
       await player.load('/base/test/test/assets/dash-multi-codec/dash.mpd', 9);
@@ -135,6 +143,7 @@ describe('Codec Switching', () => {
       expect(variants.length).toBe(2);
       expect(variants.find((v) => !!v.active).language).toBe('en');
 
+      // Spanish is Opus WebM.
       player.selectAudioLanguage('es');
       await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 10, 45);
 
@@ -153,9 +162,11 @@ describe('Codec Switching', () => {
       if (!MediaSource.isTypeSupported('audio/webm; codecs="opus"')) {
         pending('Codec OPUS in WEBM is not supported by the platform.');
       }
+
+      // English is AAC MP4.
       const preferredAudioLanguage = 'en';
       player.configure({preferredAudioLanguage: preferredAudioLanguage});
-      player.configure('streaming.mediaSource.codecSwitchingStrategy',
+      player.configure('mediaSource.codecSwitchingStrategy',
           shaka.config.CodecSwitchingStrategy.SMOOTH);
 
       await player.load('/base/test/test/assets/dash-multi-codec/dash.mpd', 9);
@@ -169,6 +180,7 @@ describe('Codec Switching', () => {
       expect(variants.length).toBe(2);
       expect(variants.find((v) => !!v.active).language).toBe('en');
 
+      // Spanish is Opus WebM.
       player.selectAudioLanguage('es');
       await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 10, 45);