496246 - HandleDecodeError called too late

Status: RESOLVED FIXED

(Core :: Audio/Video, defect)

Description

[Matthew Gregan [:kinetik]]

While comparing content/media/video and content/html/content/src/nsHTMLMediaElement.cpp between trunk and 1.9.1 to make sure the code has not diverged unexpectedly, I noticed what looks like a mismerge:

@@ -1331,11 +1331,11 @@
       aMonitor.Enter();
     } while (mState != DECODER_STATE_SHUTDOWN && r == E_OGGPLAY_TIMEOUT);
 
+    HandleDecodeErrors(r);
+
     if (mState == DECODER_STATE_SHUTDOWN)
       break;
 
-    HandleDecodeErrors(r);
-
     FrameData* nextFrame = NextFrame();
     if (!nextFrame)
       break;

This could lead to bugs, because HandleDecodeError can set mState to SHUTDOWN if an error occurred.  In the 1.9.1 variant of the code, this would happen too late, since we've already checked for mState == SHUTDOWN.

Comment 1

[Matthew Gregan [:kinetik]]

Attachment: patch v0 for 1.9.1 only (already on trunk)

Sync 1.9.1 code to trunk.  As this code is already on trunk, it is safe to take it on 1.9.1.  Fixes an important error handling case.

Comment 2

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Comment on attachment 381441 [details] [diff] [review]
patch v0 for 1.9.1 only (already on trunk)

trivial change to fix mismerge from trunk to branch

Comment 3

[Mike Beltzner [:beltzner, not reading bugmail]]

Comment on attachment 381441 [details] [diff] [review]
patch v0 for 1.9.1 only (already on trunk)

a191=beltzner

Comment 4

[:Gavin Sharp [email: [e-mail]]]

https://hg.mozilla.org/releases/mozilla-1.9.1/rev/46d21040f011