author | Jonathan Hao <jhao@mozilla.com> |
Thu, 08 Oct 2015 16:31:08 +0800 | |
changeset 300257 | 55f6d836366608ee551fe88c4050acb3b9948995 |
parent 300256 | 7d4827bc9fc1b965945e69497672636f01add93b |
child 300258 | e549ccf6a5d3fe85c7c07555f7c19a743a9ed91c |
push id | 5392 |
push user | raliiev@mozilla.com |
push date | Mon, 14 Dec 2015 20:08:23 +0000 |
treeherder | mozilla-beta@16ce8562a975 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bechen |
bugs | 1205209 |
milestone | 44.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/media/omx/MediaOmxReader.cpp +++ b/dom/media/omx/MediaOmxReader.cpp @@ -384,19 +384,18 @@ bool MediaOmxReader::DecodeVideoFrame(bo // and we will preserve the ratio of the crop rectangle as it // was reported relative to the picture size reported by the container. picture.x = (mPicture.x * frame.Y.mWidth) / mInitialFrame.width; picture.y = (mPicture.y * frame.Y.mHeight) / mInitialFrame.height; picture.width = (frame.Y.mWidth * mPicture.width) / mInitialFrame.width; picture.height = (frame.Y.mHeight * mPicture.height) / mInitialFrame.height; } - MOZ_ASSERT(mStreamSource); // This is the approximate byte position in the stream. - int64_t pos = mStreamSource->Tell(); + int64_t pos = mStreamSource ? mStreamSource->Tell() : 0; nsRefPtr<VideoData> v; if (!frame.mGraphicBuffer) { VideoData::YCbCrBuffer b; b.mPlanes[0].mData = static_cast<uint8_t *>(frame.Y.mData); b.mPlanes[0].mStride = frame.Y.mStride; b.mPlanes[0].mHeight = frame.Y.mHeight; @@ -487,19 +486,18 @@ void MediaOmxReader::NotifyDataArrivedIn } } bool MediaOmxReader::DecodeAudioData() { MOZ_ASSERT(OnTaskQueue()); EnsureActive(); - MOZ_ASSERT(mStreamSource); // This is the approximate byte position in the stream. - int64_t pos = mStreamSource->Tell(); + int64_t pos = mStreamSource ? mStreamSource->Tell() : 0; // Read next frame MPAPI::AudioFrame source; if (!mOmxDecoder->ReadAudio(&source, mAudioSeekTimeUs)) { return false; } mAudioSeekTimeUs = -1;