Initial implementation of AudioTrack, AudioTrackList, VideoTrack, and VideoTrackList.

Source/core/html/HTMLMediaElement.h

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 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
@@ skipping 31 matching lines @@
 class WebInbandTextTrack;
 class WebLayer;
 }
 
 namespace WebCore {
 
 #if ENABLE(WEB_AUDIO)
 class AudioSourceProvider;
 class MediaElementAudioSourceNode;
 #endif
+class AudioTrackList;
 class ContentType;
 class Event;
 class ExceptionState;
 class HTMLSourceElement;
 class HTMLTrackElement;
 class KURL;
 class MediaController;
 class MediaControls;
 class MediaError;
 class HTMLMediaSource;
 class TextTrackList;
 class TimeRanges;
 class URLRegistry;
+class VideoTrackList;
 
 typedef PODIntervalTree<double, TextTrackCue*> CueIntervalTree;
 typedef CueIntervalTree::IntervalType CueInterval;
 typedef Vector<CueInterval> CueList;
 
 // FIXME: The inheritance from MediaPlayerClient here should be private inheritance.
 // But it can't be until the Chromium WebMediaPlayerClientImpl class is fixed so it
 // no longer depends on typecasting a MediaPlayerClient to an HTMLMediaElement.
 
 class HTMLMediaElement : public Supplementable<HTMLMediaElement>, public HTMLElement, public MediaPlayerClient, public ActiveDOMObject, public MediaControllerInterface
@@ skipping 81 matching lines @@
     virtual double volume() const OVERRIDE FINAL;
     virtual void setVolume(double, ExceptionState&) OVERRIDE FINAL;
     virtual bool muted() const OVERRIDE FINAL;
     virtual void setMuted(bool) OVERRIDE FINAL;
 
     virtual void beginScrubbing() OVERRIDE FINAL;
     virtual void endScrubbing() OVERRIDE FINAL;
 
     virtual bool canPlay() const OVERRIDE FINAL;
 
+    AudioTrackList& audioTracks();
+    void audioTrackChanged(const AtomicString& audioTrackID, bool enabled);
+
+    VideoTrackList& videoTracks();
+    void selectedVideoTrackChanged(const AtomicString& selectedTrackID);
+
     PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, const AtomicString& label, const AtomicString& language, ExceptionState&);
     PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, const AtomicString& label, ExceptionState& exceptionState) { return addTextTrack(kind, label, emptyAtom, exceptionState); }
     PassRefPtr<TextTrack> addTextTrack(const AtomicString& kind, ExceptionState& exceptionState) { return addTextTrack(kind, emptyAtom, emptyAtom, exceptionState); }
 
     TextTrackList* textTracks();
     CueList currentlyActiveCues() const { return m_currentlyActiveCues; }
 
     void addTextTrack(TextTrack*);
     void removeTextTrack(TextTrack*);
     void closeCaptionTracksChanged();
     void notifyMediaPlayerOfTextTrackChanges();
 
     // Implements the "forget the media element's media-resource-specific tracks" algorithm in the HTML5 spec.
     void forgetResourceSpecificTracks();
 
     void didAddTrackElement(HTMLTrackElement*);
     void didRemoveTrackElement(HTMLTrackElement*);
 
+    void addVideoTrack(const AtomicString& id, blink::WebMediaPlayerClient::VideoTrackKind, const AtomicString& label, const AtomicString& language, bool selected);
+    void removeVideoTrack(const AtomicString& id);
+    void addAudioTrack(const AtomicString& id, blink::WebMediaPlayerClient::AudioTrackKind, const AtomicString& label, const AtomicString& language, bool enabled);
+    void removeAudioTrack(const AtomicString& id);
+
     virtual void mediaPlayerDidAddTextTrack(blink::WebInbandTextTrack*) OVERRIDE FINAL;
     virtual void mediaPlayerDidRemoveTextTrack(blink::WebInbandTextTrack*) OVERRIDE FINAL;
     // FIXME: Remove this when WebMediaPlayerClientImpl::loadInternal does not depend on it.
     virtual KURL mediaPlayerPosterURL() OVERRIDE { return KURL(); }
 
     struct TrackGroup {
         enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, Other };
 
         TrackGroup(GroupKind kind)
             : visibleTrack(nullptr)
@@ skipping 212 matching lines @@
 
     void changeNetworkStateFromLoadingToIdle();
 
     const AtomicString& mediaGroup() const;
     void setMediaGroup(const AtomicString&);
     void updateMediaController();
     bool isBlocked() const;
     bool isBlockedOnMediaController() const;
     bool isAutoplaying() const { return m_autoplaying; }
 
+    // Creates placeholder AudioTrack and/or VideoTrack objects when WebMemediaPlayer objects
+    // advertise they have audio and/or video, but don't explicity signal them via
+    // mediaPlayerDidAddAudioTrack() and mediaPlayerDidAddVideoTrack().
+    // FIXME: Remove this once all WebMediaPlayer implementations properly report their track info.
+    void createPlaceholderTracksIfNecessary();
+
+    // Sets the selected/enabled tracks if they aren't set before we initially
+    // transition to HAVE_METADATA.
+    void selectInitialTracksIfNecessary();
+
     Timer<HTMLMediaElement> m_loadTimer;
     Timer<HTMLMediaElement> m_progressEventTimer;
     Timer<HTMLMediaElement> m_playbackProgressTimer;
     RefPtr<TimeRanges> m_playedTimeRanges;
     OwnPtr<GenericEventQueue> m_asyncEventQueue;
 
     double m_playbackRate;
     double m_defaultPlaybackRate;
     NetworkState m_networkState;
     ReadyState m_readyState;
@@ skipping 64 matching lines @@
     bool m_closedCaptionsVisible : 1;
 
     bool m_completelyLoaded : 1;
     bool m_havePreparedToPlay : 1;
 
     bool m_tracksAreReady : 1;
     bool m_haveVisibleTextTrack : 1;
     bool m_processingPreferenceChange : 1;
     double m_lastTextTrackUpdateTime;
 
+    RefPtr<AudioTrackList> m_audioTracks;

[philipj_slow, 2014/03/09 09:04:14]

I realize you're following the existing style, but I can't see a good reason why
this can't just be "AudioTrackList m_audioTracks". The track lists are always
going to be created if a resource load, and allocating the memory for them as
part of HTMLMediaElement seems slightly better than having separate allocations.
More importantly, it lets you remove some null checks and makes the ownership
and non-nullness very clear. I tried the change locally and it compiled at
least. It's up to you how much you want to do in this review, of course.

[philipj_slow, 2014/03/09 16:26:43]

On second though my suggestion doesn't make sense because TrackBaseList is
refcounted and could outlive HTMLMediaElement. One could still create these in
the constructor to avoid some null checks, but I don't think it matters much.

[acolwell GONE FROM CHROMIUM, 2014/03/18 22:02:15]

I moved the list creation to the constructor since I don't see much of a win to
avoid creating them up front.

+    RefPtr<VideoTrackList> m_videoTracks;
     RefPtr<TextTrackList> m_textTracks;
     Vector<RefPtr<TextTrack> > m_textTracksWhenResourceSelectionBegan;
 
     CueIntervalTree m_cueTree;
 
     CueList m_currentlyActiveCues;
     int m_ignoreTrackDisplayUpdate;
 
 #if ENABLE(WEB_AUDIO)
     // This is a weak reference, since m_audioSourceNode holds a reference to us.
@@ skipping 32 matching lines @@
 inline bool isHTMLMediaElement(const Node& node)
 {
     return node.isElementNode() && toElement(node).isMediaElement();
 }
 
 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
 
 } //namespace
 
 #endif