wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 752796 - Stop MediaDecoderStateMachine::SendStreamData from trying to A/V sync unnecessarily r=roc

Browse Source
This commit is contained in:
Edwin Flores 2013-09-06 15:14:48 +12:00
parent 0101780c06
commit dd810a473b
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/media/MediaDecoderStateMachine.cpp
View File

@ -726,8 +726,6 @@ void MediaDecoderStateMachine::SendStreamData()
if (mAudioCaptured) {
// Discard audio packets that are no longer needed.
int64_t audioPacketTimeToDiscard =
std::min(minLastAudioPacketTime, mStartTime + mCurrentFrameTime);
while (true) {
nsAutoPtr<AudioData> a(mReader->AudioQueue().PopFront());
if (!a)
@ -738,7 +736,7 @@ void MediaDecoderStateMachine::SendStreamData()
// very start. That's OK, we'll play silence instead for a brief moment.
// That's OK. Seeking to this time would have a similar issue for such
// badly muxed resources.
if (a->GetEnd() >= audioPacketTimeToDiscard) {
if (a->GetEnd() >= minLastAudioPacketTime) {
mReader->AudioQueue().PushFront(a.forget());
break;
}

15
content/media/test/Makefile.in
View File

@ -129,6 +129,9 @@ MOCHITEST_FILES = \
test_streams_srcObject.html \
test_reset_src.html \
test_streams_autoplay.html \
test_streams_element_capture.html \
test_streams_element_capture_reset.html \
test_streams_element_capture_createObjectURL.html \
test_streams_gc.html \
test_streams_tracks.html \
$(filter disabled-for-intermittent-failures--bug-608634, test_error_in_video_document.html) \
@ -143,18 +146,6 @@ MOCHITEST_FILES = \
test_bug895305.html \
$(NULL)
# Disabled on Windows for frequent intermittent failures
ifneq ($(OS_ARCH), WINNT)
MOCHITEST_FILES += \
test_streams_element_capture.html \
test_streams_element_capture_reset.html \
test_streams_element_capture_createObjectURL.html \
$(NULL)
else
$(filter disabled-on-windows-for-timeouts--bug-752796, test_streams_element_capture.html)
$(filter disabled-on-windows-for-timeouts--bug-752796, test_streams_element_capture_reset.html)
endif
# Don't run in suite
ifndef MOZ_SUITE
MOCHITEST_FILES += test_play_twice.html