WebMediaPlayerImpl should notify ended event

Source/core/html/HTMLMediaElement.cpp

 /*
  * 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 3075 matching lines @@
 
     // 4.8.10.9 steps 12-14. Needed if no ReadyState change is associated with the seek.
     if (m_seeking && m_readyState >= HAVE_CURRENT_DATA && !webMediaPlayer()->seeking())
         finishSeek();
 
     // Always call scheduleTimeupdateEvent when the media engine reports a time discontinuity,
     // it will only queue a 'timeupdate' event if we haven't already posted one at the current
     // movie time.
     scheduleTimeupdateEvent(false);
 
+    // TODO(amogh.bihani): Remove this once chromium change lands.-----------------------------------------
     double now = currentTime();
     double dur = duration();
 
     // When the current playback position reaches the end of the media resource when the direction of
     // playback is forwards, then the user agent must follow these steps:
     if (!std::isnan(dur) && dur && now >= dur && directionOfPlayback() == Forward) {
         // If the media element has a loop attribute specified and does not have a current media controller,

[scherkus (not reviewing), 2014/09/02 20:23:54]

is it possible to refactor your new code to call mediaPlayerEnded() when the
time comparison is met?

[amogh.bihani, 2014/09/03 05:17:18]

Done.

         if (loop() && !m_mediaController) {
             m_sentEndEvent = false;
             //  then seek to the earliest possible position of the media resource and abort these steps.
             seek(0, IGNORE_EXCEPTION);
         } else {
             // If the media element does not have a current media controller, and the media element
             // has still ended playback, and the direction of playback is still forwards, and paused
             // is false,
             if (!m_mediaController && !m_paused) {
                 // changes paused to true and fires a simple event named pause at the media element.
                 m_paused = true;
                 scheduleEvent(EventTypeNames::pause);
             }
             // Queue a task to fire a simple event named ended at the media element.
             if (!m_sentEndEvent) {
                 m_sentEndEvent = true;
                 scheduleEvent(EventTypeNames::ended);
             }
             // If the media element has a current media controller, then report the controller state
             // for the media element's current media controller.
             updateMediaController();
         }
     }
     else
         m_sentEndEvent = false;
+    // ----------------------------------------------------------------------------------------------------
 
     updatePlayState();
 }
+
+void HTMLMediaElement::mediaPlayerEnded()

[scherkus (not reviewing), 2014/09/02 20:23:54]

one thing that's tricky is that with this new code path it's possible that
currentTime will be less than duration (e.g., container's stated duration was
larger than what we actually decoded), which isn't what the spec states

I believe as an interim step we may need to change currentTime() to check for
m_sentEndEvent and return duration()

[amogh.bihani, 2014/09/03 05:17:18]

Done.

+{
+    WTF_LOG(Media, "HTMLMediaElement::mediaPlayerEnded");
+
+    // When the current playback position reaches the end of the media resource when the direction of
+    // playback is forwards, then the user agent must follow these steps:
+    if (!std::isnan(duration()) && directionOfPlayback() == Forward) {
+        // If the media element has a loop attribute specified and does not have a current media controller,
+        if (loop() && !m_mediaController) {
+            m_sentEndEvent = false;
+            //  then seek to the earliest possible position of the media resource and abort these steps.
+            seek(0, IGNORE_EXCEPTION);
+        } else {
+            // If the media element does not have a current media controller, and the media element
+            // has still ended playback, and the direction of playback is still forwards, and paused
+            // is false,
+            if (!m_mediaController && !m_paused) {
+                // changes paused to true and fires a simple event named pause at the media element.
+                m_paused = true;
+                scheduleEvent(EventTypeNames::pause);
+            }
+            // Queue a task to fire a simple event named ended at the media element.
+            if (!m_sentEndEvent) {
+                m_sentEndEvent = true;
+                scheduleEvent(EventTypeNames::ended);
+            }
+            // If the media element has a current media controller, then report the controller state
+            // for the media element's current media controller.
+            updateMediaController();
+        }
+    } else {
+        m_sentEndEvent = false;
+    }
+
+    updatePlayState();
+}
 
 void HTMLMediaElement::mediaPlayerDurationChanged()
 {
     WTF_LOG(Media, "HTMLMediaElement::mediaPlayerDurationChanged");
     // FIXME: Change MediaPlayerClient & WebMediaPlayer to convey
     // the currentTime when the duration change occured. The current
     // WebMediaPlayer implementations always clamp currentTime() to
     // duration() so the requestSeek condition here is always false.
     durationChanged(duration(), currentTime() > duration());
 }
@@ skipping 848 matching lines @@
 
 #if ENABLE(WEB_AUDIO)
 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
 {
     if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider())
         audioSourceProvider()->setClient(0);
 }
 #endif
 
 }