Bug 1079621 - Change non-fatal errors to warnings. r=rillian, a=lsblakk
authorJean-Yves Avenard <jyavenard@mozilla.com>
Wed, 12 Nov 2014 12:55:39 +1100
changeset 233859 2d9008e8bed6af1dcc35159fdc357d32249fcd98
parent 233858 3a07770613e6b3c0a63f922968cbd7c4ae9f7548
child 233860 f82b751275b17848539c6dae6986fe9d1f5fa84b
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrillian, lsblakk
bugs1079621
milestone35.0a2
Bug 1079621 - Change non-fatal errors to warnings. r=rillian, a=lsblakk This resolves intermittent failures in continuous integration. NS_ERROR() triggers an assertion in debug builds, which tinderbox reports as a failure. NS_WARNING calls NS_DebugBreak, but with the lower severity level it skips invoking the debugger.
content/media/fmp4/apple/AppleVDADecoder.cpp
content/media/fmp4/apple/AppleVTDecoder.cpp
--- a/content/media/fmp4/apple/AppleVDADecoder.cpp
+++ b/content/media/fmp4/apple/AppleVDADecoder.cpp
@@ -346,17 +346,17 @@ AppleVDADecoder::SubmitFrame(mp4_demuxer
                                  block,
                                  frameInfo);
 
   LOG("[%s]: FrameInfo retain count = %ld",
       __func__, CFGetRetainCount(frameInfo));
   MOZ_ASSERT(CFGetRetainCount(frameInfo) >= 2, "Bad retain count");
 
   if (rv != noErr) {
-    NS_ERROR("AppleVDADecoder: Couldn't pass frame to decoder");
+    NS_WARNING("AppleVDADecoder: Couldn't pass frame to decoder");
     return NS_ERROR_FAILURE;
   }
 
   if (mIs106) {
     // TN2267:
     // frameInfo: A CFDictionaryRef containing information to be returned in
     // the output callback for this frame.
     // This dictionary can contain client provided information associated with
--- a/content/media/fmp4/apple/AppleVTDecoder.cpp
+++ b/content/media/fmp4/apple/AppleVTDecoder.cpp
@@ -235,17 +235,17 @@ AppleVTDecoder::SubmitFrame(mp4_demuxer:
     return NS_ERROR_FAILURE;
   }
   rv = VTDecompressionSessionDecodeFrame(mSession,
                                          sample,
                                          0,
                                          CreateAppleFrameRef(aSample),
                                          &flags);
   if (rv != noErr) {
-    NS_ERROR("Couldn't pass frame to decoder");
+    NS_WARNING("Couldn't pass frame to decoder");
     return NS_ERROR_FAILURE;
   }
 
   // Ask for more data.
   if (mTaskQueue->IsEmpty()) {
     LOG("AppleVTDecoder task queue empty; requesting more data");
     mCallback->InputExhausted();
   }