diff --git a/content/media/AudioNodeExternalInputStream.cpp b/content/media/AudioNodeExternalInputStream.cpp index daeaad7c7b23..50c8cba32ae5 100644 --- a/content/media/AudioNodeExternalInputStream.cpp +++ b/content/media/AudioNodeExternalInputStream.cpp @@ -412,7 +412,7 @@ AudioNodeExternalInputStream::ProcessInput(GraphTime aFrom, GraphTime aTo, std::min(inputTrackEndPoint, inputEndTicks)); } // Pad if we're looking past the end of the track - segment.AppendNullData(std::max(0, inputEndTicks - inputTrackEndPoint)); + segment.AppendNullData(ticks - segment.GetDuration()); } } diff --git a/content/media/test/crashtests/crashtests.list b/content/media/test/crashtests/crashtests.list index 8768d6d3f441..1a4ca1301599 100644 --- a/content/media/test/crashtests/crashtests.list +++ b/content/media/test/crashtests/crashtests.list @@ -65,6 +65,7 @@ load 933156.html load 952756.html load buffer-source-ended-1.html load offline-buffer-source-ended-1.html +HTTP load media-element-source-seek-1.html skip-if(B2G) load oscillator-ended-1.html # intermittent B2G timeouts, bug 920338 skip-if(B2G) load oscillator-ended-2.html # intermittent B2G timeouts, bug 920338 test-pref(media.mediasource.enabled,true) load 926665.html diff --git a/content/media/test/crashtests/media-element-source-seek-1.html b/content/media/test/crashtests/media-element-source-seek-1.html new file mode 100644 index 000000000000..956465723625 --- /dev/null +++ b/content/media/test/crashtests/media-element-source-seek-1.html @@ -0,0 +1,23 @@ + + + +