shaka-player 3.1.3 → 3.2.2

package/test/test/util/manifest_parser_util.js

@@ -56,11 +56,12 @@ shaka.test.ManifestParser = class {
    * @param {?number=} endByte
    * @param {number=} timestampOffset
    * @param {!Array.<!shaka.media.SegmentReference>=} partialReferences
+   * @param {?string=} tilesLayout
    * @return {!shaka.media.SegmentReference}
    */
   static makeReference(uri, start, end, baseUri = '',
       startByte = 0, endByte = null, timestampOffset = 0,
-      partialReferences = []) {
+      partialReferences = [], tilesLayout = '') {
     const getUris = () => uri.length ? [baseUri + uri] : [];
 
     // If a test wants to verify these, they can be set explicitly after
@@ -84,6 +85,7 @@ shaka.test.ManifestParser = class {
         appendWindowStart,
         appendWindowEnd,
         partialReferences,
+        tilesLayout,
     );
   }
 };

package/test/text/ttml_text_parser_unit.js

@@ -476,6 +476,15 @@ describe('TtmlTextParser', () => {
         {periodStart: 0, segmentStart: 0, segmentEnd: 0});
   });
 
+  it('supports comments in the body', () => {
+    verifyHelper(
+        [],
+        '<tt><body><div>' +
+        '<!-- text-based TTML -->' +
+        '</div></body></tt>',
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+  });
+
   it('parses alignment from textAlign attribute of a region', () => {
     verifyHelper(
         [

package/test/text/ui_text_displayer_unit.js

@@ -84,20 +84,16 @@ describe('UITextDisplayer', () => {
     // Wait until updateCaptions_() gets called.
     await shaka.test.Util.delay(0.5);
 
-    const textContainer =
-        videoContainer.querySelector('.shaka-text-container');
-    const captions =
-        textContainer.querySelector('span:not(.shaka-text-wrapper)');
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+    const captions = textContainer.querySelector('div');
     const cssObj = parseCssText(captions.style.cssText);
 
     const expectCssObj = {
       'color': 'green',
-      'background-color': 'black',
       'direction': 'ltr',
       'font-size': '10px',
       'font-style': 'normal',
       'font-weight': 400,
-      'line-height': 2,
       'text-align': 'center',
     };
 
@@ -114,6 +110,8 @@ describe('UITextDisplayer', () => {
     }
 
     expect(cssObj).toEqual(jasmine.objectContaining(expectCssObj));
+    expect(parseCssText(textContainer.querySelector('span').style.cssText))
+        .toEqual(jasmine.objectContaining({'background-color': 'black'}));
   });
 
   it('correctly displays styles for nested cues', async () => {
@@ -137,15 +135,13 @@ describe('UITextDisplayer', () => {
     await shaka.test.Util.delay(0.5);
 
     // Verify styles applied to the nested cues.
-    const textContainer =
-        videoContainer.querySelector('.shaka-text-container');
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
     const captions =
         textContainer.querySelector('span:not(.shaka-text-wrapper)');
     const cssObj = parseCssText(captions.style.cssText);
 
     const expectCssObj = {
       'color': 'green',
-      'background-color': 'black',
       'font-size': '10px',
       'font-style': 'normal',
       'font-weight': 400,
@@ -165,6 +161,8 @@ describe('UITextDisplayer', () => {
     }
 
     expect(cssObj).toEqual(jasmine.objectContaining(expectCssObj));
+    expect(parseCssText(captions.querySelector('span').style.cssText))
+        .toEqual(jasmine.objectContaining({'background-color': 'black'}));
   });
 
   it('correctly displays styles for cellResolution units', async () => {
@@ -191,10 +189,8 @@ describe('UITextDisplayer', () => {
     // style.
     const expectedLinePadding = '11.25px';
 
-    const textContainer =
-        videoContainer.querySelector('.shaka-text-container');
-    const captions =
-        textContainer.querySelector('span:not(.shaka-text-wrapper)');
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+    const captions = textContainer.querySelector('div');
     const cssObj = parseCssText(captions.style.cssText);
     expect(cssObj).toEqual(
         jasmine.objectContaining({
@@ -222,10 +218,8 @@ describe('UITextDisplayer', () => {
     // videoContainerHeight=450px and tts:fontSize="90%" on the default style.
     const expectedFontSize = '27px';
 
-    const textContainer =
-        videoContainer.querySelector('.shaka-text-container');
-    const captions =
-        textContainer.querySelector('span:not(.shaka-text-wrapper)');
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+    const captions = textContainer.querySelector('div');
     const cssObj = parseCssText(captions.style.cssText);
     expect(cssObj).toEqual(
         jasmine.objectContaining({'font-size': expectedFontSize}));
@@ -319,6 +313,24 @@ describe('UITextDisplayer', () => {
     expect(captions.length).toBe(3);
   });
 
+  it('hides currently displayed cue when removed', async () => {
+    const cue = new shaka.text.Cue(0, 50, 'One');
+    textDisplayer.setTextVisibility(true);
+    textDisplayer.append([cue]);
+    video.currentTime = 10;
+    await shaka.test.Util.delay(0.5);
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+
+    let cueElements = textContainer.querySelectorAll('div');
+    expect(cueElements.length).toBe(1);
+    expect(cueElements[0].textContent).toBe('One');
+
+    textDisplayer.remove(0, 100);
+
+    cueElements = textContainer.querySelectorAll('div');
+    expect(cueElements.length).toBe(0);
+  });
+
   it('hides and shows nested cues at appropriate times', async () => {
     const parentCue1 = new shaka.text.Cue(0, 100, '');
     const cue1 = new shaka.text.Cue(0, 50, 'One');

package/test/text/web_vtt_generator_unit.js

@@ -9,23 +9,45 @@ goog.require('shaka.text.WebVttGenerator');
 
 describe('WebVttGenerator', () => {
   it('supports no cues', () => {
-    verifyHelper([], 'WEBVTT\n\n');
+    verifyHelper([], [], 'WEBVTT\n\n');
   });
 
   it('convert cues to WebVTT', () => {
     const shakaCue1 = new shaka.text.Cue(20, 40, 'Test');
+    shakaCue1.textAlign = shaka.text.Cue.textAlign.LEFT;
+    shakaCue1.writingMode = shaka.text.Cue.writingMode.VERTICAL_LEFT_TO_RIGHT;
     const shakaCue2 = new shaka.text.Cue(40, 50, 'Test2');
+    shakaCue2.textAlign = shaka.text.Cue.textAlign.RIGHT;
+    shakaCue2.writingMode = shaka.text.Cue.writingMode.VERTICAL_RIGHT_TO_LEFT;
+    const shakaCue3 = new shaka.text.Cue(50, 51, 'Test3');
+    shakaCue3.textAlign = shaka.text.Cue.textAlign.CENTER;
+    const shakaCue4 = new shaka.text.Cue(52, 53, 'Test4');
+    shakaCue4.textAlign = shaka.text.Cue.textAlign.START;
+    const shakaCue5 = new shaka.text.Cue(53, 54, 'Test5');
+    shakaCue5.textAlign = shaka.text.Cue.textAlign.END;
+
+    const adCuePoints = [];
 
     verifyHelper(
         [
           shakaCue1,
           shakaCue2,
+          shakaCue3,
+          shakaCue4,
+          shakaCue5,
         ],
+        adCuePoints,
         'WEBVTT\n\n' +
-        '00:00:20.000 --> 00:00:40.000\n' +
+        '00:00:20.000 --> 00:00:40.000 align:left vertical:lr\n' +
         'Test\n\n' +
-        '00:00:40.000 --> 00:00:50.000\n' +
-        'Test2\n\n');
+        '00:00:40.000 --> 00:00:50.000 align:right vertical:rl\n' +
+        'Test2\n\n' +
+        '00:00:50.000 --> 00:00:51.000 align:middle\n' +
+        'Test3\n\n' +
+        '00:00:52.000 --> 00:00:53.000 align:start\n' +
+        'Test4\n\n' +
+        '00:00:53.000 --> 00:00:54.000 align:end\n' +
+        'Test5\n\n');
   });
 
   it('creates style tags for cues with underline/italics/bold', () => {
@@ -49,19 +71,71 @@ describe('WebVttGenerator', () => {
     nestedCue4.textDecoration.push(shaka.text.Cue.textDecoration.UNDERLINE);
 
     shakaCue.nestedCues = [nestedCue1, nestedCue2, nestedCue3, nestedCue4];
+
+    const adCuePoints = [];
+
     verifyHelper(
         [shakaCue],
+        adCuePoints,
         'WEBVTT\n\n' +
-        '00:00:10.000 --> 00:00:20.000\n' +
+        '00:00:10.000 --> 00:00:20.000 align:middle\n' +
         '<i><u>Test1</u></i><b><i>Test2</i></b>Test3<u>Test4</u>\n\n');
   });
 
+  it('computes the time with ad cue points', () => {
+    const shakaCue1 = new shaka.text.Cue(20, 30, 'Test');
+    shakaCue1.textAlign = shaka.text.Cue.textAlign.LEFT;
+    shakaCue1.writingMode = shaka.text.Cue.writingMode.VERTICAL_LEFT_TO_RIGHT;
+    const shakaCue2 = new shaka.text.Cue(40, 50, 'Test2');
+    shakaCue2.textAlign = shaka.text.Cue.textAlign.RIGHT;
+    shakaCue2.writingMode = shaka.text.Cue.writingMode.VERTICAL_RIGHT_TO_LEFT;
+    const shakaCue3 = new shaka.text.Cue(50, 51, 'Test3');
+    shakaCue3.textAlign = shaka.text.Cue.textAlign.CENTER;
+    const shakaCue4 = new shaka.text.Cue(52, 53, 'Test4');
+    shakaCue4.textAlign = shaka.text.Cue.textAlign.START;
+    const shakaCue5 = new shaka.text.Cue(53, 54, 'Test5');
+    shakaCue5.textAlign = shaka.text.Cue.textAlign.END;
+
+    const adCuePoints = [
+      {
+        start: 0,
+        end: 10,
+      },
+      {
+        start: 35,
+        end: 45,
+      },
+    ];
+
+    verifyHelper(
+        [
+          shakaCue1,
+          shakaCue2,
+          shakaCue3,
+          shakaCue4,
+          shakaCue5,
+        ],
+        adCuePoints,
+        'WEBVTT\n\n' +
+        '00:00:30.000 --> 00:00:40.000 align:left vertical:lr\n' +
+        'Test\n\n' +
+        '00:01:00.000 --> 00:01:10.000 align:right vertical:rl\n' +
+        'Test2\n\n' +
+        '00:01:10.000 --> 00:01:11.000 align:middle\n' +
+        'Test3\n\n' +
+        '00:01:12.000 --> 00:01:13.000 align:start\n' +
+        'Test4\n\n' +
+        '00:01:13.000 --> 00:01:14.000 align:end\n' +
+        'Test5\n\n');
+  });
+
   /**
    * @param {!Array} cues
+   * @param {!Array} adCuePoints
    * @param {string} text
    */
-  function verifyHelper(cues, text) {
-    const result = shaka.text.WebVttGenerator.convert(cues);
+  function verifyHelper(cues, adCuePoints, text) {
+    const result = shaka.text.WebVttGenerator.convert(cues, adCuePoints);
     expect(text).toBe(result);
   }
 });

package/test/ui/localization_unit.js

@@ -198,7 +198,7 @@ describe('Localization', () => {
       localization.changeLocale([ELVISH_WOODLAND]);
 
       expect(events.length).toBe(1);
-      expect(events[0].locales).toEqual([ELVISH_WOODLAND]);
+      expect(events[0]['locales']).toEqual([ELVISH_WOODLAND]);
     });
 
 
@@ -214,23 +214,23 @@ describe('Localization', () => {
       localization.changeLocale([ELVISH_WOODLAND, DWARFISH_NORTH]);
 
       expect(events.length).toBe(1);
-      expect(events[0].locales).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
+      expect(events[0]['locales']).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
 
       // We should see an event telling us that dwarfish is still missing.
       localization.insert(ELVISH_WOODLAND, new Map());
       localization.changeLocale([ELVISH_WOODLAND, DWARFISH_NORTH]);
 
       expect(events.length).toBe(2);
-      expect(events[0].locales).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
-      expect(events[1].locales).toEqual([DWARFISH_NORTH]);
+      expect(events[0]['locales']).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
+      expect(events[1]['locales']).toEqual([DWARFISH_NORTH]);
 
       // There should be no more events now that we added the last language.
       localization.insert(DWARFISH_NORTH, new Map());
       localization.changeLocale([ELVISH_WOODLAND, DWARFISH_NORTH]);
 
       expect(events.length).toBe(2);
-      expect(events[0].locales).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
-      expect(events[1].locales).toEqual([DWARFISH_NORTH]);
+      expect(events[0]['locales']).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
+      expect(events[1]['locales']).toEqual([DWARFISH_NORTH]);
     });
   });
 
@@ -373,8 +373,8 @@ describe('Localization', () => {
           // it was in the fallback (HALFLING) but not our preferred language
           // (EVLISH).
           expect(events.length).toBe(1);
-          expect(events[0].locales).toEqual([ELVISH_WOODLAND]);
-          expect(events[0].missing).toEqual(['hello']);
+          expect(events[0]['locales']).toEqual([ELVISH_WOODLAND]);
+          expect(events[0]['missing']).toEqual(['hello']);
         });
 
     it('fires when key/value is missing from preferred but found in base',
@@ -400,8 +400,8 @@ describe('Localization', () => {
           // because it was in the base (ELVISH) but not our preferred language
           // (EVLISH_WOODLAND).
           expect(events.length).toBe(1);
-          expect(events[0].locales).toEqual([ELVISH_WOODLAND]);
-          expect(events[0].missing).toEqual(['Best Wishes']);
+          expect(events[0]['locales']).toEqual([ELVISH_WOODLAND]);
+          expect(events[0]['missing']).toEqual(['Best Wishes']);
         });
 
     it('fires when key/value is missing from preferred but found in sibling',
@@ -427,8 +427,8 @@ describe('Localization', () => {
           // understand" because it was in a sibling locale (HALFLING_SHIRE)
           // but not our preferred language (HALFLING_COMMON).
           expect(events.length).toBe(1);
-          expect(events[0].locales).toEqual([HALFLING_COMMON]);
-          expect(events[0].missing).toEqual(['Do you understand']);
+          expect(events[0]['locales']).toEqual([HALFLING_COMMON]);
+          expect(events[0]['missing']).toEqual(['Do you understand']);
         });
 
     it('fires when key/value is missing from some preferred languages',
@@ -454,8 +454,9 @@ describe('Localization', () => {
 
           // There should have no missing localization events.
           expect(events.length).toBe(1);
-          expect(events[0].locales).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
-          expect(events[0].missing).toEqual(['may your forge burn bright']);
+          expect(events[0]['locales']).toEqual(
+              [ELVISH_WOODLAND, DWARFISH_NORTH]);
+          expect(events[0]['missing']).toEqual(['may your forge burn bright']);
         });
   });
 

package/test/ui/text_displayer_layout_unit.js

@@ -141,7 +141,9 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
         cue.region.id = '1';
         // Position the cue *explicitly* at the bottom of the screen.
         cue.region.viewportAnchorX = 0;  // %
-        cue.region.viewportAnchorY = 100;  // %
+        cue.region.viewportAnchorY = 90;  // %
+        cue.region.width = 100;  // %
+        cue.region.height = 10;  // %
         textDisplayer.append([cue]);
 
         await checkScreenshot('ui', 'cue-with-controls');
@@ -314,6 +316,16 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
       await checkScreenshot(prefix, 'nested-cues-with-linebreak');
     });
 
+    // Regression test for #3600
+    it('cue positioning', async () => {
+      const cue = new shaka.text.Cue(0, 1, 'Text');
+      cue.line = 10;
+      cue.lineInterpretation = shaka.text.Cue.lineInterpretation.PERCENTAGE;
+      textDisplayer.append([cue]);
+
+      await checkScreenshot(prefix, 'cue-position');
+    });
+
     // Regression test for #2157 and #2584
     it('region positioning', async () => {
       const nestedCue = new shaka.text.Cue(

package/test/util/stream_utils_unit.js

@@ -537,6 +537,41 @@ describe('StreamUtils', () => {
       expect(manifest.variants.length).toBe(1);
       expect(manifest.variants[0].decodingInfos.length).toBe(0);
     });
+
+    it('includes transferFunction in config when hdr', async () => {
+      window.shakaMediaCapabilities.decodingInfo =
+          shaka.test.Util.spyFunc(decodingInfoSpy);
+
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        manifest.addVariant(0, (variant) => {
+          variant.addVideo(0, (stream) => {
+            stream.mime('video/mp4', 'avc1.640028');
+            stream.hdr = 'SDR';
+          });
+        });
+        manifest.addVariant(1, (variant) => {
+          variant.addVideo(1, (stream) => {
+            stream.mime('video/mp4', 'hvc1.2.4.L150.90');
+            stream.hdr = 'PQ';
+          });
+        });
+        manifest.addVariant(2, (variant) => {
+          variant.addVideo(2, (stream) => {
+            stream.mime('video/mp4', 'hvc1.2.4.L153.B0');
+            stream.hdr = 'HLG';
+          });
+        });
+      });
+
+      await StreamUtils.getDecodingInfosForVariants(manifest.variants,
+          /* usePersistentLicenses= */ false, /* srcEquals= */ false);
+      expect(decodingInfoSpy.calls.argsFor(0)[0].video.transferFunction)
+          .toBe('srgb');
+      expect(decodingInfoSpy.calls.argsFor(1)[0].video.transferFunction)
+          .toBe('pq');
+      expect(decodingInfoSpy.calls.argsFor(2)[0].video.transferFunction)
+          .toBe('hlg');
+    });
   });
 
   describe('filterManifest', () => {
@@ -617,8 +652,7 @@ describe('StreamUtils', () => {
       });
 
       await shaka.util.StreamUtils.filterManifest(
-          fakeDrmEngine, /* currentVariant= */ null, manifest,
-          /* useMediaCapabilities= */ true);
+          fakeDrmEngine, /* currentVariant= */ null, manifest);
 
       // Covers a regression in which we would remove streams with codecs.
       // The last two streams should be removed because their full MIME types
@@ -645,8 +679,7 @@ describe('StreamUtils', () => {
       });
 
       await shaka.util.StreamUtils.filterManifest(
-          fakeDrmEngine, /* currentVariant= */ null, manifest,
-          /* useMediaCapabilities= */ true);
+          fakeDrmEngine, /* currentVariant= */ null, manifest);
       expect(manifest.variants.length).toBe(1);
     });
 
@@ -663,8 +696,7 @@ describe('StreamUtils', () => {
       });
 
       await shaka.util.StreamUtils.filterManifest(
-          fakeDrmEngine, /* currentVariant= */ null, manifest,
-          /* useMediaCapabilities= */ true);
+          fakeDrmEngine, /* currentVariant= */ null, manifest);
 
       expect(manifest.variants.length).toBe(1);
     });
@@ -679,6 +711,7 @@ describe('StreamUtils', () => {
         variant.bandwidth = 5058558;
         variant.addAudio(1, (stream) => {
           stream.bandwidth = 129998;
+          stream.codecs = 'opus';
         });
         variant.addVideo(2, (stream) => {
           stream.bandwidth = 4928560;
@@ -693,6 +726,7 @@ describe('StreamUtils', () => {
         variant.bandwidth = 4911000;
         variant.addAudio(4, (stream) => {
           stream.bandwidth = 129998;
+          stream.codecs = 'vorbis';
         });
         variant.addVideo(5, (stream) => {
           stream.bandwidth = 4781002;
@@ -707,6 +741,7 @@ describe('StreamUtils', () => {
         variant.bandwidth = 10850316;
         variant.addAudio(7, (stream) => {
           stream.bandwidth = 129998;
+          stream.codecs = 'opus';
         });
         variant.addVideo(8, (stream) => {
           stream.bandwidth = 10784324;
@@ -716,6 +751,62 @@ describe('StreamUtils', () => {
       });
     };
 
+    it('chooses preferred audio and video codecs', () => {
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        addVariant1080Avc1(manifest);
+        addVariant1080Vp9(manifest);
+        addVariant2160Vp9(manifest);
+      });
+      const variants =
+          shaka.util.StreamUtils.choosePreferredCodecs(manifest.variants,
+              /* preferredVideoCodecs= */['vp09'],
+              /* preferredAudioCodecs= */['opus']);
+
+      expect(variants.length).toBe(1);
+      expect(variants[0].video.codecs).toBe(vp09Codecs);
+      expect(variants[0].audio.codecs).toBe('opus');
+    });
+
+    it('chooses preferred video codecs', () => {
+      // If no preferred audio codecs is specified or can be found, choose the
+      // variants with preferred video codecs.
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        addVariant1080Avc1(manifest);
+        addVariant1080Vp9(manifest);
+        addVariant2160Vp9(manifest);
+      });
+      const variants =
+          shaka.util.StreamUtils.choosePreferredCodecs(manifest.variants,
+              /* preferredVideoCodecs= */['vp09'],
+              /* preferredAudioCodecs= */[]);
+
+      expect(variants.length).toBe(2);
+      expect(variants[0].video.codecs).toBe(vp09Codecs);
+      expect(variants[0].audio.codecs).toBe('vorbis');
+      expect(variants[1].video.codecs).toBe(vp09Codecs);
+      expect(variants[1].audio.codecs).toBe('opus');
+    });
+
+    it('chooses preferred audio codecs', () => {
+      // If no preferred video codecs is specified or can be found, choose the
+      // variants with preferred audio codecs.
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        addVariant1080Avc1(manifest);
+        addVariant1080Vp9(manifest);
+        addVariant2160Vp9(manifest);
+      });
+      const variants =
+          shaka.util.StreamUtils.choosePreferredCodecs(manifest.variants,
+              /* preferredVideoCodecs= */['foo'],
+              /* preferredAudioCodecs= */['opus']);
+
+      expect(variants.length).toBe(2);
+      expect(variants[0].video.codecs).toBe(avc1Codecs);
+      expect(variants[0].audio.codecs).toBe('opus');
+      expect(variants[1].video.codecs).toBe(vp09Codecs);
+      expect(variants[1].audio.codecs).toBe('opus');
+    });
+
     it('chooses variants with different sizes (density) by codecs', () => {
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         addVariant1080Avc1(manifest);
@@ -723,11 +814,14 @@ describe('StreamUtils', () => {
         addVariant2160Vp9(manifest);
       });
 
-      shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest, 2);
+      shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest,
+          /* preferredVideoCodecs= */[],
+          /* preferredAudioCodecs= */[],
+          /* preferredAudioChannelCount= */2,
+          /* preferredDecodingAttributes= */[]);
 
-      expect(manifest.variants.length).toBe(2);
+      expect(manifest.variants.length).toBe(1);
       expect(manifest.variants[0].video.codecs).toBe(vp09Codecs);
-      expect(manifest.variants[1].video.codecs).toBe(vp09Codecs);
     });
 
     it('chooses variants with same sizes (density) by codecs', () => {
@@ -736,10 +830,59 @@ describe('StreamUtils', () => {
         addVariant1080Vp9(manifest);
       });
 
-      shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest, 2);
+      shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest,
+          /* preferredVideoCodecs= */[],
+          /* preferredAudioCodecs= */[],
+          /* preferredAudioChannelCount= */2,
+          /* preferredDecodingAttributes= */[]);
 
       expect(manifest.variants.length).toBe(1);
       expect(manifest.variants[0].video.codecs).toBe(vp09Codecs);
     });
+
+    it('chooses variants by decoding attributes', async () => {
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        manifest.addVariant(0, (variant) => {
+          variant.bandwidth = 4058558;
+          variant.addVideo(1, (stream) => {
+            stream.mime('video', 'notsmooth');
+          });
+        });
+        manifest.addVariant(1, (variant) => {
+          variant.bandwidth = 4781002;
+          variant.addVideo(2, (stream) => {
+            stream.mime('video', 'smooth');
+          });
+        });
+        manifest.addVariant(3, (variant) => {
+          variant.addVideo(4, (stream) => {
+            variant.bandwidth = 5058558;
+            stream.mime('video', 'smooth-2');
+          });
+        });
+      });
+      window.shakaMediaCapabilities.decodingInfo =
+          shaka.test.Util.spyFunc(decodingInfoSpy);
+      decodingInfoSpy.and.callFake((config) => {
+        const res = config.video.contentType.includes('notsmooth') ?
+           {supported: true, smooth: false} :
+           {supported: true, smooth: true};
+        return Promise.resolve(res);
+      });
+
+      await StreamUtils.getDecodingInfosForVariants(manifest.variants,
+          /* usePersistentLicenses= */false, /* srcEquals= */ false);
+
+      shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest,
+          /* preferredVideoCodecs= */[],
+          /* preferredAudioCodecs= */[],
+          /* preferredAudioChannelCount= */2,
+          /* preferredDecodingAttributes= */
+          [shaka.util.StreamUtils.DecodingAttributes.SMOOTH]);
+      // 2 video codecs are smooth. Choose the one with the lowest bandwidth.
+      expect(manifest.variants.length).toBe(1);
+      expect(manifest.variants[0].id).toBe(1);
+      expect(manifest.variants[0].video.id).toBe(2);
+    });
   });
 });

package/ui/airplay_button.js

@@ -36,7 +36,7 @@ shaka.ui.AirPlayButton = class extends shaka.ui.Element {
     /** @private {!HTMLButtonElement} */
     this.airplayButton_ = shaka.util.Dom.createButton();
     this.airplayButton_.classList.add('shaka-airplay-button');
-    this.airplayButton_.setAttribute('aria-pressed', 'false');
+    this.airplayButton_.ariaPressed = 'false';
 
     /** @private {!HTMLElement} */
     this.airplayIcon_ = shaka.util.Dom.createHTMLElement('i');

package/ui/audio_language_selection.js

@@ -7,7 +7,6 @@
 
 goog.provide('shaka.ui.AudioLanguageSelection');
 
-goog.require('shaka.ui.Constants');
 goog.require('shaka.ui.Enums');
 goog.require('shaka.ui.LanguageUtils');
 goog.require('shaka.ui.Locales');
@@ -96,10 +95,8 @@ shaka.ui.AudioLanguageSelection = class extends shaka.ui.SettingsMenu {
   updateLocalizedStrings_() {
     const LocIds = shaka.ui.Locales.Ids;
 
-    this.backButton.setAttribute(shaka.ui.Constants.ARIA_LABEL,
-        this.localization.resolve(LocIds.BACK));
-    this.button.setAttribute(shaka.ui.Constants.ARIA_LABEL,
-        this.localization.resolve(LocIds.LANGUAGE));
+    this.backButton.ariaLabel = this.localization.resolve(LocIds.BACK);
+    this.button.ariaLabel = this.localization.resolve(LocIds.LANGUAGE);
     this.nameSpan.textContent =
         this.localization.resolve(LocIds.LANGUAGE);
     this.backSpan.textContent =