[Cocoa] Support in-band chapter tracks

eric.carlson@apple.com · eric.carlson@apple.com · commit 957c994a6aa6 · 2021-09-29T15:31:58.000Z
https://bugs.webkit.org/show_bug.cgi?id=230380 <rdar://problem/83218578> Reviewed by Jer Noble. Source/WebCore: Create a text track for every non-empty AVAssetChapterMetadataGroup, and create a VTT cue for every chapter. Test: media/track/track-in-band-chapters.html * SourcesCocoa.txt: * WebCore.xcodeproj/project.pbxproj: * platform/graphics/InbandTextTrackPrivate.h: (WebCore::InbandTextTrackPrivate::setClient): (WebCore::InbandTextTrackPrivate::cueFormat const): * platform/graphics/avfoundation/objc/InbandChapterTrackPrivateAVFObjC.h: Added. (WebCore::InbandChapterTrackPrivateAVFObjC::create): (WebCore::InbandChapterTrackPrivateAVFObjC::setTextTrackIndex): (WebCore::InbandChapterTrackPrivateAVFObjC::ChapterData::operator== const): * platform/graphics/avfoundation/objc/InbandChapterTrackPrivateAVFObjC.mm: Added. (WebCore::InbandChapterTrackPrivateAVFObjC::InbandChapterTrackPrivateAVFObjC): (WebCore::InbandChapterTrackPrivateAVFObjC::processChapters): (WebCore::InbandChapterTrackPrivateAVFObjC::language const): * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h: * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: (WebCore::MediaPlayerPrivateAVFoundationObjC::cancelLoad): (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL): (WebCore::MediaPlayerPrivateAVFoundationObjC::setAsset): (WebCore::MediaPlayerPrivateAVFoundationObjC::metadataLoaded): (WebCore::MediaPlayerPrivateAVFoundationObjC::processChapterTracks): (WebCore::assetMetadataKeyNames): (-[WebCoreAVFMovieObserver chapterMetadataDidChange:]): * platform/graphics/iso/ISOVTTCue.cpp: (WebCore::ISOWebVTTCue::ISOWebVTTCue): * platform/graphics/iso/ISOVTTCue.h: Source/WebCore/PAL: * pal/cocoa/AVFoundationSoftLink.h: * pal/cocoa/AVFoundationSoftLink.mm: LayoutTests: * media/content/multi-language-chapters.mp4: Added. * media/track/track-in-band-chapters-expected.txt: Added. * media/track/track-in-band-chapters.html: Added. * media/track/track-manual-mode.html: Updated because the movie file this uses has in-band chapter tracks. * media/track/track-manual-mode-expected.txt: Ditto. * platform/glib/TestExpectations: Skipped. * platform/win/TestExpectations: Skipped. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@283217 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2021-09-29  Eric Carlson  <eric.carlson@apple.com>
+
+        [Cocoa] Support in-band chapter tracks
+        https://bugs.webkit.org/show_bug.cgi?id=230380
+        <rdar://problem/83218578>
+
+        Reviewed by Jer Noble.
+
+        * media/content/multi-language-chapters.mp4: Added.
+        * media/track/track-in-band-chapters-expected.txt: Added.
+        * media/track/track-in-band-chapters.html: Added.
+        * media/track/track-manual-mode.html: Updated because the movie file this uses has
+        in-band chapter tracks.
+        * media/track/track-manual-mode-expected.txt: Ditto.
+        * platform/glib/TestExpectations: Skipped.
+        * platform/win/TestExpectations: Skipped.
+
 2021-09-28  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
 
         [GLIB] Update test expectations and baselines. Unreviewed test gardening.
diff --git a/LayoutTests/media/content/multi-language-chapters.mp4 b/LayoutTests/media/content/multi-language-chapters.mp4
diff --git a/LayoutTests/media/track/track-in-band-chapters-expected.txt b/LayoutTests/media/track/track-in-band-chapters-expected.txt
@@ -0,0 +1,35 @@
+
+EXPECTED (video.textTracks.length == '3') OK
+
+EXPECTED (track.cues.length == '6') OK
+EXPECTED (track.language == 'en') OK
+EXPECTED (track.kind == 'chapters') OK
+EXPECTED (track.cues[0].text == 'English Chapter 1') OK
+EXPECTED (track.cues[1].text == 'English Chapter 2') OK
+EXPECTED (track.cues[2].text == 'English Chapter 3') OK
+EXPECTED (track.cues[3].text == 'English Chapter 4') OK
+EXPECTED (track.cues[4].text == 'English Chapter 5') OK
+EXPECTED (track.cues[5].text == 'English Chapter 6') OK
+
+EXPECTED (track.cues.length == '6') OK
+EXPECTED (track.language == 'es') OK
+EXPECTED (track.kind == 'chapters') OK
+EXPECTED (track.cues[0].text == 'Spanish Chapter 1') OK
+EXPECTED (track.cues[1].text == 'Spanish Chapter 2') OK
+EXPECTED (track.cues[2].text == 'Spanish Chapter 3') OK
+EXPECTED (track.cues[3].text == 'Spanish Chapter 4') OK
+EXPECTED (track.cues[4].text == 'Spanish Chapter 5') OK
+EXPECTED (track.cues[5].text == 'Spanish Chapter 6') OK
+
+EXPECTED (track.cues.length == '6') OK
+EXPECTED (track.language == 'fr') OK
+EXPECTED (track.kind == 'chapters') OK
+EXPECTED (track.cues[0].text == 'French Chapter 1') OK
+EXPECTED (track.cues[1].text == 'French Chapter 2') OK
+EXPECTED (track.cues[2].text == 'French Chapter 3') OK
+EXPECTED (track.cues[3].text == 'French Chapter 4') OK
+EXPECTED (track.cues[4].text == 'French Chapter 5') OK
+EXPECTED (track.cues[5].text == 'French Chapter 6') OK
+
+END OF TEST
+
diff --git a/LayoutTests/media/track/track-in-band-chapters.html b/LayoutTests/media/track/track-in-band-chapters.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset='utf-8'>
+    <title>In-band chapter tracks.</title>
+    <script src="../video-test.js"></script>
+    <script src="../media-file.js"></script>
+    <script>
+    let tracks = { };
+    var track;
+    window.addEventListener('load', async event => {
+
+        findMediaElement();
+        video.src = findMediaFile('video', '../content/multi-language-chapters');
+
+        await waitForEvent(video, 'canplaythrough');
+        await testExpectedEventually('video.textTracks.length', 3, '==', 1000);
+
+        let checkTrack = async (t, languageCode, languageName) => {
+            consoleWrite('');
+            track = t;
+            await testExpectedEventually('track.cues.length', 6, '==', 1000);
+            testExpected('track.language', languageCode);
+            testExpected('track.kind', 'chapters');
+            for (let i = 0; i < 6; i++)
+                testExpected(`track.cues[${i}].text`, `${languageName} Chapter ${i + 1}`);
+        }
+
+        tracks = Array.from(video.textTracks);
+        tracks.sort((track1, track2) => track1.language > track2.language);
+
+        tracks.forEach(track => track.mode = 'hidden');
+        await checkTrack(tracks[0], 'en', 'English');
+        await checkTrack(tracks[1], 'es', 'Spanish');
+        await checkTrack(tracks[2], 'fr', 'French');
+
+        consoleWrite('');
+        endTest();
+    });
+
+    </script>
+ </head>
+<body>
+    <video controls></video>
+</body>
+</html>
+    
diff --git a/LayoutTests/media/track/track-manual-mode-expected.txt b/LayoutTests/media/track/track-manual-mode-expected.txt
@@ -7,7 +7,7 @@ RUN(internals.setCaptionDisplayMode('manual'))
 EVENT(canplaythrough)
 
 ** Forced tracks should be in .textTracks as well as in the menu
-EXPECTED (video.textTracks.length == '9') OK
+EXPECTED (video.textTracks.length == '11') OK
 
 ** No track should be enabled by default
 EXPECTED (video.textTracks[0].language == 'en') OK
diff --git a/LayoutTests/media/track/track-manual-mode.html b/LayoutTests/media/track/track-manual-mode.html
@@ -10,7 +10,7 @@
             function testTracks()
             {
                 consoleWrite(`<br><i>** Forced tracks should be in .textTracks as well as in the menu`);
-                testExpected("video.textTracks.length", 9);
+                testExpected("video.textTracks.length", 11);
 
                 consoleWrite("<br><i>** No track should be enabled by default<" + "/i>");
                 testExpected("video.textTracks[0].language", "en");
diff --git a/LayoutTests/platform/glib/TestExpectations b/LayoutTests/platform/glib/TestExpectations
@@ -1624,6 +1624,7 @@ webkit.org/b/131546 media/track/track-forced-subtitles-in-band.html [ Timeout Fa
 webkit.org/b/131546 media/track/track-in-band-cues-added-once.html [ Timeout Crash ]
 webkit.org/b/131546 webkit.org/b/198830 media/track/track-in-band-legacy-api.html [ Failure Crash ]
 webkit.org/b/131546 media/track/track-in-band-mode.html [ Skip ]
+media/track/track-in-band-chapters.html [ Skip ]
 
 # DataCue.value not enabled
 http/tests/media/track-in-band-hls-metadata.html [ Skip ]
diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations
@@ -984,6 +984,7 @@ media/audio-constructor-src.html [ Skip ] #  Timeout
 media/track/track-in-band-legacy-api.html [ Skip ]
 media/track/track-in-band-mode.html [ Skip ]
 media/track/track-in-band-duplicate-tracks-when-source-changes.html [ Skip ]
+media/track/track-in-band-chapters.html [ Skip ]
 #fast/media/mq-transform-02.html [ Pass ImageOnlyFailure ]
 #fast/media/mq-transform-03.html [ Pass ImageOnlyFailure ]
 
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,42 @@
+2021-09-29  Eric Carlson  <eric.carlson@apple.com>
+
+        [Cocoa] Support in-band chapter tracks
+        https://bugs.webkit.org/show_bug.cgi?id=230380
+        <rdar://problem/83218578>
+
+        Reviewed by Jer Noble.
+        
+        Create a text track for every non-empty AVAssetChapterMetadataGroup, and create
+        a VTT cue for every chapter.
+
+        Test: media/track/track-in-band-chapters.html
+
+        * SourcesCocoa.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/graphics/InbandTextTrackPrivate.h:
+        (WebCore::InbandTextTrackPrivate::setClient):
+        (WebCore::InbandTextTrackPrivate::cueFormat const):
+        * platform/graphics/avfoundation/objc/InbandChapterTrackPrivateAVFObjC.h: Added.
+        (WebCore::InbandChapterTrackPrivateAVFObjC::create):
+        (WebCore::InbandChapterTrackPrivateAVFObjC::setTextTrackIndex):
+        (WebCore::InbandChapterTrackPrivateAVFObjC::ChapterData::operator== const):
+        * platform/graphics/avfoundation/objc/InbandChapterTrackPrivateAVFObjC.mm: Added.
+        (WebCore::InbandChapterTrackPrivateAVFObjC::InbandChapterTrackPrivateAVFObjC):
+        (WebCore::InbandChapterTrackPrivateAVFObjC::processChapters):
+        (WebCore::InbandChapterTrackPrivateAVFObjC::language const):
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::cancelLoad):
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setAsset):
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::metadataLoaded):
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::processChapterTracks):
+        (WebCore::assetMetadataKeyNames):
+        (-[WebCoreAVFMovieObserver chapterMetadataDidChange:]):
+        * platform/graphics/iso/ISOVTTCue.cpp:
+        (WebCore::ISOWebVTTCue::ISOWebVTTCue):
+        * platform/graphics/iso/ISOVTTCue.h:
+
 2021-09-29  Antti Koivisto  <antti@apple.com>
 
         [CSS Cascade Layers] Add fonts and keyframes in cascade layer order
diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
@@ -1,3 +1,14 @@
+2021-09-29  Eric Carlson  <eric.carlson@apple.com>
+
+        [Cocoa] Support in-band chapter tracks
+        https://bugs.webkit.org/show_bug.cgi?id=230380
+        <rdar://problem/83218578>
+
+        Reviewed by Jer Noble.
+
+        * pal/cocoa/AVFoundationSoftLink.h:
+        * pal/cocoa/AVFoundationSoftLink.mm:
+
 2021-09-28  Alex Christensen  <achristensen@webkit.org>
 
         Mostly fix Mac CMake build
diff --git a/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h b/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h
@@ -160,8 +160,13 @@ SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVMediaCharacteristicLegible, N
 SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly, NSString *)
 #define AVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly PAL::get_AVFoundation_AVPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly()
 
+
+SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVAssetChapterMetadataGroupsDidChangeNotification, NSString *)
+#define AVAssetChapterMetadataGroupsDidChangeNotification PAL::get_AVFoundation_AVAssetChapterMetadataGroupsDidChangeNotification()
 SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVMetadataCommonKeyTitle, NSString *)
 #define AVMetadataCommonKeyTitle PAL::get_AVFoundation_AVMetadataCommonKeyTitle()
+SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVMetadataCommonKeyArtwork, NSString *)
+#define AVMetadataCommonKeyArtwork PAL::get_AVFoundation_AVMetadataCommonKeyArtwork()
 SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVMetadataKeySpaceCommon, NSString *)
 #define AVMetadataKeySpaceCommon PAL::get_AVFoundation_AVMetadataKeySpaceCommon()
 SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVMediaTypeSubtitle, NSString *)
diff --git a/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm b/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm
@@ -152,7 +152,9 @@ static BOOL justReturnsNO()
 SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVMediaTypeMuxed, NSString *, PAL_EXPORT)
 SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVMediaTypeSubtitle, NSString *, PAL_EXPORT)
 SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVMediaTypeVideo, NSString *, PAL_EXPORT)
+SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAssetChapterMetadataGroupsDidChangeNotification, NSString *, PAL_EXPORT)
 SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVMetadataCommonKeyTitle, NSString *, PAL_EXPORT)
+SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVMetadataCommonKeyArtwork, NSString *, PAL_EXPORT)
 SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVMetadataKeySpaceCommon, NSString *, PAL_EXPORT)
 SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVMetadataKeySpaceHLSDateRange, NSString *, PAL_EXPORT)
 SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVMetadataKeySpaceID3, NSString *, PAL_EXPORT)
diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
@@ -305,6 +305,7 @@ platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm
 platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm
 platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm
 platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm
+platform/graphics/avfoundation/objc/InbandChapterTrackPrivateAVFObjC.mm @no-unify
 platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.mm
 platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm
 platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -93,6 +93,8 @@
 		0709D7951AE55A29004E42F8 /* WebMediaSessionManagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 0709D7941AE55A29004E42F8 /* WebMediaSessionManagerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 0709FC4D1025DEE30059CDBA /* AccessibilitySlider.h */; };
 		070E09191875EEFC003A1D3C /* PlatformMediaSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 070E09181875ED93003A1D3C /* PlatformMediaSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		070E2D0F26F250890014AAC3 /* InbandChapterTrackPrivateAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 070E2D0C26F15B180014AAC3 /* InbandChapterTrackPrivateAVFObjC.mm */; };
+		070E2D1026F250930014AAC3 /* InbandChapterTrackPrivateAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = 070E2D0E26F15B190014AAC3 /* InbandChapterTrackPrivateAVFObjC.h */; };
 		070E81D11BF27656001FDA48 /* VideoTrackPrivateMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 070E81D01BF27656001FDA48 /* VideoTrackPrivateMediaStream.h */; };
 		070F549817F12F6B00169E04 /* MediaStreamConstraintsValidationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 070F549717F12F6B00169E04 /* MediaStreamConstraintsValidationClient.h */; };
 		071A9EC3168FBC55002629F9 /* TextTrackCueGeneric.h in Headers */ = {isa = PBXBuildFile; fileRef = 071A9EC1168FB56C002629F9 /* TextTrackCueGeneric.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -5790,6 +5792,8 @@
 		070DD8F50F01868000727DEB /* mediaControls.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mediaControls.css; sourceTree = "<group>"; };
 		070E09181875ED93003A1D3C /* PlatformMediaSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformMediaSession.h; sourceTree = "<group>"; };
 		070E091A1875EF71003A1D3C /* PlatformMediaSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformMediaSession.cpp; sourceTree = "<group>"; };
+		070E2D0C26F15B180014AAC3 /* InbandChapterTrackPrivateAVFObjC.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = InbandChapterTrackPrivateAVFObjC.mm; sourceTree = "<group>"; };
+		070E2D0E26F15B190014AAC3 /* InbandChapterTrackPrivateAVFObjC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InbandChapterTrackPrivateAVFObjC.h; sourceTree = "<group>"; };
 		070E81D01BF27656001FDA48 /* VideoTrackPrivateMediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoTrackPrivateMediaStream.h; sourceTree = "<group>"; };
 		070F549717F12F6B00169E04 /* MediaStreamConstraintsValidationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamConstraintsValidationClient.h; sourceTree = "<group>"; };
 		0711588F17DF633700EDFE2B /* MediaStreamPrivate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamPrivate.cpp; sourceTree = "<group>"; };
@@ -28746,6 +28750,8 @@
 				CDE5959C1BF2757100A1CBE8 /* CDMSessionMediaSourceAVFObjC.mm */,
 				CD19FEAC1F574B6D000C42FB /* ImageDecoderAVFObjC.h */,
 				CD19FEAD1F574B6D000C42FB /* ImageDecoderAVFObjC.mm */,
+				070E2D0E26F15B190014AAC3 /* InbandChapterTrackPrivateAVFObjC.h */,
+				070E2D0C26F15B180014AAC3 /* InbandChapterTrackPrivateAVFObjC.mm */,
 				07AA6B69166D019500D45671 /* InbandTextTrackPrivateAVFObjC.h */,
 				07AA6B6A166D019500D45671 /* InbandTextTrackPrivateAVFObjC.mm */,
 				414598C023C8AD78002B9CC8 /* LocalSampleBufferDisplayLayer.h */,
@@ -32900,6 +32906,7 @@
 				55BBD42924DB560400BB6E0C /* ImageUtilities.h in Headers */,
 				26F756B31B3B66F70005DD79 /* ImmutableNFA.h in Headers */,
 				26F756B51B3B68F20005DD79 /* ImmutableNFANodeBuilder.h in Headers */,
+				070E2D1026F250930014AAC3 /* InbandChapterTrackPrivateAVFObjC.h in Headers */,
 				BE961C5518AD338C00D07DC5 /* InbandDataTextTrack.h in Headers */,
 				078633E923FF347B0087AE21 /* InbandGenericCue.h in Headers */,
 				0706A0D9240830A700E93818 /* InbandGenericCueIdentifier.h in Headers */,
@@ -36465,6 +36472,7 @@
 				A8D06B3A0A265DCD005E7203 /* HTMLNames.cpp in Sources */,
 				1AC900C31943C0FC008625B5 /* HTTPHeaderNames.cpp in Sources */,
 				CD27AE5122A9868700947FF9 /* ImageRotationSessionVT.mm in Sources */,
+				070E2D0F26F250890014AAC3 /* InbandChapterTrackPrivateAVFObjC.mm in Sources */,
 				CD063F821E23FA8900812BE3 /* InitDataRegistry.cpp in Sources */,
 				538EC93E1F99BF5A004D22A8 /* JSQuickTimePluginReplacement.cpp in Sources */,
 				935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */,
diff --git a/Source/WebCore/platform/graphics/InbandTextTrackPrivate.h b/Source/WebCore/platform/graphics/InbandTextTrackPrivate.h
@@ -42,7 +42,7 @@ class InbandTextTrackPrivate : public TrackPrivateBase {
     virtual ~InbandTextTrackPrivate() = default;
 
     InbandTextTrackPrivateClient* client() const override { return m_client; }
-    void setClient(InbandTextTrackPrivateClient* client) { m_client = client; }
+    virtual void setClient(InbandTextTrackPrivateClient* client) { m_client = client; }
 
     enum class Mode : uint8_t {
         Disabled,
@@ -74,7 +74,7 @@ class InbandTextTrackPrivate : public TrackPrivateBase {
     AtomString id() const override { return emptyAtom(); }
     virtual AtomString inBandMetadataTrackDispatchType() const { return emptyAtom(); }
 
-    virtual CueFormat cueFormat() const { return m_format; }
+    CueFormat cueFormat() const { return m_format; }
 
 #if !RELEASE_LOG_DISABLED
     const char* logClassName() const override { return "InbandTextTrackPrivate"; }
diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/InbandChapterTrackPrivateAVFObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/InbandChapterTrackPrivateAVFObjC.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#pragma once
+
+#if ENABLE(VIDEO) && (USE(AVFOUNDATION) || PLATFORM(IOS_FAMILY))
+
+#include "InbandTextTrackPrivate.h"
+#include <wtf/HashSet.h>
+#include <wtf/WeakPtr.h>
+
+OBJC_CLASS AVTimedMetadataGroup;
+OBJC_CLASS NSLocale;
+
+namespace WebCore {
+
+class InbandChapterTrackPrivateAVFObjC : public InbandTextTrackPrivate {
+public:
+    static Ref<InbandChapterTrackPrivateAVFObjC> create(RetainPtr<NSLocale> locale)
+    {
+        return adoptRef(*new InbandChapterTrackPrivateAVFObjC(WTFMove(locale)));
+    }
+
+    virtual ~InbandChapterTrackPrivateAVFObjC() = default;
+
+    InbandTextTrackPrivate::Kind kind() const final { return InbandTextTrackPrivate::Kind::Chapters; }
+    AtomString language() const final;
+
+    int trackIndex() const final { return m_index; }
+    void setTextTrackIndex(int index) { m_index = index; }
+
+    void processChapters(RetainPtr<NSArray<AVTimedMetadataGroup *>>);
+
+private:
+    InbandChapterTrackPrivateAVFObjC(RetainPtr<NSLocale>);
+
+    AtomString inBandMetadataTrackDispatchType() const final { return "com.apple.chapters"_s; }
+    const char* logClassName() const final { return "InbandChapterTrackPrivateAVFObjC"; }
+
+    struct ChapterData {
+        MediaTime m_startTime;
+        MediaTime m_duration;
+        String m_title;
+
+        constexpr bool operator==(const ChapterData& other) const
+        {
+            return m_startTime == other.m_startTime && m_duration == other.m_duration && m_title == other.m_title;
+        }
+    };
+
+    Vector<ChapterData> m_processedChapters;
+    RetainPtr<NSLocale> m_locale;
+    mutable String m_language;
+    int m_index { 0 };
+};
+
+} // namespace WebCore
+
+#endif //  ENABLE(VIDEO) && (USE(AVFOUNDATION) || PLATFORM(IOS_FAMILY))
diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/InbandChapterTrackPrivateAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/InbandChapterTrackPrivateAVFObjC.mm
diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
diff --git a/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp b/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp
diff --git a/Source/WebCore/platform/graphics/iso/ISOVTTCue.h b/Source/WebCore/platform/graphics/iso/ISOVTTCue.h

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`function testTracks()`
`11`	`11`	`{`
`12`	`12`	consoleWrite(`<br><i>** Forced tracks should be in .textTracks as well as in the menu`);
`13`		`- testExpected("video.textTracks.length", 9);`
	`13`	`+ testExpected("video.textTracks.length", 11);`
`14`	`14`
`15`	`15`	`consoleWrite("<br><i>** No track should be enabled by default<" + "/i>");`
`16`	`16`	`testExpected("video.textTracks[0].language", "en");`