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 2059 matching lines @@
 // playback state
 double HTMLMediaElement::currentTime() const
 {
 #if LOG_CACHED_TIME_WARNINGS
     static const double minCachedDeltaForWarning = 0.01;
 #endif
 
     if (m_readyState == HAVE_NOTHING)
         return 0;
 
+    // currentTime equals the end of the media resource when 'ended' event is fired.
+    // NOTE: Sometimes it happens that the current playback position is not exactly equal to the media duration,
+    // especially in Android, which often stops at a time which is smaller that the actual duration.
+    if (m_sentEndEvent) {
+        return duration();
+    }
+
     if (m_seeking) {
         WTF_LOG(Media, "HTMLMediaElement::currentTime - seeking, returning %f", m_lastSeekTime);
         return m_lastSeekTime;
     }
 
     if (m_cachedTime != MediaPlayer::invalidTime() && m_paused) {
 #if LOG_CACHED_TIME_WARNINGS
         double delta = m_cachedTime - webMediaPlayer()->currentTime();
         if (delta > minCachedDeltaForWarning)
             WTF_LOG(Media, "HTMLMediaElement::currentTime - WARNING, cached time is %f seconds off of media time when paused", delta);
 #endif
         return m_cachedTime;
     }
 
     refreshCachedTime();
 
     return m_cachedTime;
 }
 
 void HTMLMediaElement::setCurrentTime(double time, ExceptionState& exceptionState)
 {
     if (m_mediaController) {
         exceptionState.throwDOMException(InvalidStateError, "The element is slaved to a MediaController.");
         return;
     }
+

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

Sorry, I'll remove this in next PS.

[scherkus (not reviewing), 2014/09/03 17:16:45]

thanks :)

     seek(time, exceptionState);
 }
 
 double HTMLMediaElement::duration() const
 {
     // FIXME: remove m_player check once we figure out how m_player is going
     // out of sync with readystate. m_player is cleared but readystate is not set
     // to HAVE_NOTHING
     if (!m_player || m_readyState < HAVE_METADATA)
         return std::numeric_limits<double>::quiet_NaN();
@@ skipping 971 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.----------------

[scherkus (not reviewing), 2014/09/03 17:16:45]

can you avoid using the "-----" comments? we don't typically use a lot of ASCII
art (the TODO itself is fine, but I'd also link to your existing Chromium-side
code review)

     double now = currentTime();
     double dur = duration();
 
+    if (!std::isnan(dur) && dur && now >= dur && directionOfPlayback() == Forward)
+        mediaPlayerEnded();
+    // ---------------------------------------------------------------------------

[scherkus (not reviewing), 2014/09/03 17:16:45]

remove this whole line

+
+    updatePlayState();
+}
+
+void HTMLMediaElement::mediaPlayerEnded()
+{
+    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(dur) && dur && now >= dur && directionOfPlayback() == Forward) {
+    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;
     }
-    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
@@ skipping 851 matching lines @@
 
 #if ENABLE(WEB_AUDIO)
 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
 {
     if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider())
         audioSourceProvider()->setClient(0);
 }
 #endif
 
 }