Bug 1299714 - Add back the missing timeout protection back to |VideoTrackEncoder::Init|. r?pehrsons,jesup
MozReview-Commit-ID: AhgikMTvxAE
--- a/dom/media/encoder/TrackEncoder.cpp
+++ b/dom/media/encoder/TrackEncoder.cpp
@@ -214,16 +214,25 @@ VideoTrackEncoder::Init(const VideoSegme
LOG("[VideoTrackEncoder]: Fail to initialize the encoder!");
NotifyCancel();
}
break;
}
iter.Next();
}
+
+ mNotInitDuration += aSegment.GetDuration();
+ if ((mNotInitDuration / mTrackRate > INIT_FAILED_DURATION) &&
+ mInitCounter > 1) {
+ LOG("[VideoTrackEncoder]: Initialize failed for %ds.", INIT_FAILED_DURATION);
+ NotifyEndOfStream();
+ return;
+ }
+
}
void
VideoTrackEncoder::SetCurrentFrames(const VideoSegment& aSegment)
{
if (mCanceled) {
return;
}