From 96c892ce625171948168176f5bfd66436981fc15 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Tue, 18 Nov 2008 22:07:02 +0000
Subject: [PATCH] Bugfix: don't autorewind if someone seeks to the end while
 paused.

Feature: if there is no metadata telling us the duration, well then
we're up the old poo river. But what we can do is whip out our
trusty paddle and continually call the highest position we've seen
the duration. It makes playback a little weird, but allows seeking
and so is a step in the right direction.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@716 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 .../threerings/flash/media/FlvVideoPlayer.as  | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/as/com/threerings/flash/media/FlvVideoPlayer.as b/src/as/com/threerings/flash/media/FlvVideoPlayer.as
index 56523c5e..bede6b64 100644
--- a/src/as/com/threerings/flash/media/FlvVideoPlayer.as
+++ b/src/as/com/threerings/flash/media/FlvVideoPlayer.as
@@ -161,6 +161,8 @@ public class FlvVideoPlayer extends EventDispatcher
     public function unload () :void
     {
         _metadata = null;
+        _duration = NaN;
+        _gotDurationFromMetadata = false;
         _sizeChecker.reset();
         _positionChecker.reset();
         _vid.attachNetStream(null);
@@ -200,9 +202,14 @@ public class FlvVideoPlayer extends EventDispatcher
         dispatchEvent(new ValueEvent(MediaPlayerCodes.SIZE, _size.clone()));
     }
 
-    protected function handlePositionCheck (event :TimerEvent) :void
+    protected function handlePositionCheck (event :TimerEvent = null) :void
     {
-        dispatchEvent(new ValueEvent(MediaPlayerCodes.POSITION, getPosition()));
+        const pos :Number = getPosition();
+        if (!_gotDurationFromMetadata && (isNaN(_duration) || (pos > _duration))) {
+            _duration = pos;
+            dispatchEvent(new ValueEvent(MediaPlayerCodes.DURATION, _duration));
+        }
+        dispatchEvent(new ValueEvent(MediaPlayerCodes.POSITION, pos));
     }
 
     protected function handleNetStatus (event :NetStatusEvent) :void
@@ -232,14 +239,17 @@ public class FlvVideoPlayer extends EventDispatcher
 
         switch (event.info.code) {
         case "NetStream.Play.Stop":
-            // rewind to the beginning
-            _netStream.seek(0);
-            _netStream.pause();
-            updateState(MediaPlayerCodes.STATE_PAUSED);
+            if (_state == MediaPlayerCodes.STATE_PLAYING) {
+                handlePositionCheck(); // if we never got metadata, retrieve final position as dur
+                // rewind to the beginning
+                _netStream.seek(0);
+                _netStream.pause();
+                updateState(MediaPlayerCodes.STATE_PAUSED);
+            }
             break;
 
         case "NetStream.Seek.Notify":
-            MethodQueue.callLater(handlePositionCheck, [ null ]);
+            MethodQueue.callLater(handlePositionCheck);
             break;
         }
     }
@@ -275,6 +285,7 @@ public class FlvVideoPlayer extends EventDispatcher
     {
         if ("duration" in info) {
             _duration = Number(info.duration);
+            _gotDurationFromMetadata = true;
             if (!isNaN(_duration)) {
                 dispatchEvent(new ValueEvent(MediaPlayerCodes.DURATION, _duration));
             }
@@ -295,7 +306,7 @@ public class FlvVideoPlayer extends EventDispatcher
         } else {
             _positionChecker.reset();
             if (oldState == MediaPlayerCodes.STATE_PLAYING) {
-                handlePositionCheck(null);
+                handlePositionCheck();
             }
         }
 
@@ -319,6 +330,8 @@ public class FlvVideoPlayer extends EventDispatcher
 
     protected var _duration :Number = NaN;
 
+    protected var _gotDurationFromMetadata :Boolean;
+
     protected var _volume :Number = 1;
 
     protected var _metadata :Object;