fix: Remove active audio channel count from default pref based criteria (#8674)

Closes #8633

Active audio channel count will no longer dictate which variant is
selected in the default preference based criteria implementation

Author: dpfister2

lib/media/preference_based_criteria.js

@@ -98,7 +98,6 @@ shaka.media.PreferenceBasedCriteria = class {
 
     const channelCounts = [
       this.config_.channelCount,
-      this.config_.activeAudioChannelCount,
       this.config_.preferredAudioChannelCount,
     ];
 

test/media/adaptation_set_criteria_unit.js

@@ -848,51 +848,6 @@ describe('AdaptationSetCriteria', () => {
       ]);
     });
 
-    it('chooses variants with active audio channels count when channel count ' +
-      'is not provided', () => {
-      const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-        manifest.addVariant(1, (variant) => {
-          variant.addAudio(10, (stream) => {
-            stream.channelsCount = 2;
-          });
-        });
-        manifest.addVariant(2, (variant) => {
-          variant.addAudio(20, (stream) => {
-            stream.channelsCount = 6;
-          });
-        });
-        manifest.addVariant(3, (variant) => {
-          variant.addAudio(30, (stream) => {
-            stream.channelsCount = 2;
-          });
-        });
-      });
-
-      const builder = new shaka.media.PreferenceBasedCriteria();
-      builder.configure({
-        language: '',
-        role: '',
-        channelCount: 0,
-        hdrLevel: '',
-        spatialAudio: false,
-        videoLayout: '',
-        audioLabel: '',
-        videoLabel: '',
-        codecSwitchingStrategy: shaka.config.CodecSwitchingStrategy.RELOAD,
-        audioCodec: '',
-        activeAudioCodec: '',
-        activeAudioChannelCount: 2,
-        preferredAudioCodecs: [],
-        preferredAudioChannelCount: 0,
-      });
-      const set = builder.create(manifest.variants);
-
-      checkSet(set, [
-        manifest.variants[0],
-        manifest.variants[2],
-      ]);
-    });
-
     it('chooses variants with preferred audio channels count when channel ' +
       'count is not provided', () => {
       const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
@@ -1026,96 +981,6 @@ describe('AdaptationSetCriteria', () => {
       ]);
     });
 
-    it('chooses variants with active audio channel count when ' +
-      'provided channel count returns no variants', () => {
-      const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-        manifest.addVariant(1, (variant) => {
-          variant.addAudio(10, (stream) => {
-            stream.channelsCount = 2;
-          });
-        });
-        manifest.addVariant(2, (variant) => {
-          variant.addAudio(20, (stream) => {
-            stream.channelsCount = 6;
-          });
-        });
-        manifest.addVariant(3, (variant) => {
-          variant.addAudio(30, (stream) => {
-            stream.channelsCount = 2;
-          });
-        });
-      });
-
-      const builder = new shaka.media.PreferenceBasedCriteria();
-      builder.configure({
-        language: '',
-        role: '',
-        channelCount: 1,
-        hdrLevel: '',
-        spatialAudio: false,
-        videoLayout: '',
-        audioLabel: '',
-        videoLabel: '',
-        codecSwitchingStrategy: shaka.config.CodecSwitchingStrategy.RELOAD,
-        audioCodec: '',
-        activeAudioCodec: '',
-        activeAudioChannelCount: 2,
-        preferredAudioCodecs: [],
-        preferredAudioChannelCount: 0,
-      });
-      const set = builder.create(manifest.variants);
-
-      checkSet(set, [
-        manifest.variants[0],
-        manifest.variants[2],
-      ]);
-    });
-
-    it('chooses variants with preferred audio channel count when ' +
-      'active channel count returns no variants', () => {
-      const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-        manifest.addVariant(1, (variant) => {
-          variant.addAudio(10, (stream) => {
-            stream.channelsCount = 2;
-          });
-        });
-        manifest.addVariant(2, (variant) => {
-          variant.addAudio(20, (stream) => {
-            stream.channelsCount = 6;
-          });
-        });
-        manifest.addVariant(3, (variant) => {
-          variant.addAudio(30, (stream) => {
-            stream.channelsCount = 2;
-          });
-        });
-      });
-
-      const builder = new shaka.media.PreferenceBasedCriteria();
-      builder.configure({
-        language: '',
-        role: '',
-        channelCount: 1,
-        hdrLevel: '',
-        spatialAudio: false,
-        videoLayout: '',
-        audioLabel: '',
-        videoLabel: '',
-        codecSwitchingStrategy: shaka.config.CodecSwitchingStrategy.RELOAD,
-        audioCodec: '',
-        activeAudioCodec: '',
-        activeAudioChannelCount: 1,
-        preferredAudioCodecs: [],
-        preferredAudioChannelCount: 2,
-      });
-      const set = builder.create(manifest.variants);
-
-      checkSet(set, [
-        manifest.variants[0],
-        manifest.variants[2],
-      ]);
-    });
-
     it('chooses variants with preferred audio label', () => {
       const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(1, (variant) => {