зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 555b0322f776 (bug 1358662) for failing mda, crashtests and reftests. r=backout
Android 4.3: mda: test_EndedEvent.html, test_FrameSelection.html OS X 10.10 debug: mda: test_BufferingWait.html Linux x64 asan&pgo: crashtest: video-replay-after-audio-end.html reftest: bug686957.html
This commit is contained in:
Родитель
388d65b332
Коммит
7349ffcf3d
|
@ -692,14 +692,16 @@ WebMDemuxer::GetNextPacket(TrackInfo::TrackType aType,
|
|||
if (isKeyframe) {
|
||||
// We only look for resolution changes on keyframes for both VP8 and
|
||||
// VP9. Other resolution changes are invalid.
|
||||
auto dimensions = nsIntSize(si.w, si.h);
|
||||
if (mLastSeenFrameSize.isSome()
|
||||
&& (dimensions != mLastSeenFrameSize.value())) {
|
||||
mInfo.mVideo.mDisplay = dimensions;
|
||||
if (mLastSeenFrameWidth.isSome()
|
||||
&& mLastSeenFrameHeight.isSome()
|
||||
&& (si.w != mLastSeenFrameWidth.value()
|
||||
|| si.h != mLastSeenFrameHeight.value())) {
|
||||
mInfo.mVideo.mDisplay = nsIntSize(si.w, si.h);
|
||||
mSharedVideoTrackInfo =
|
||||
new TrackInfoSharedPtr(mInfo.mVideo, ++sStreamSourceID);
|
||||
}
|
||||
mLastSeenFrameSize = Some(dimensions);
|
||||
mLastSeenFrameWidth = Some(si.w);
|
||||
mLastSeenFrameHeight = Some(si.h);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -257,7 +257,8 @@ private:
|
|||
int64_t mLastWebMBlockOffset;
|
||||
const bool mIsMediaSource;
|
||||
|
||||
Maybe<nsIntSize> mLastSeenFrameSize;
|
||||
Maybe<uint32_t> mLastSeenFrameWidth;
|
||||
Maybe<uint32_t> mLastSeenFrameHeight;
|
||||
// This will be populated only if a resolution change occurs, otherwise it
|
||||
// will be left as null so the original metadata is used
|
||||
RefPtr<TrackInfoSharedPtr> mSharedVideoTrackInfo;
|
||||
|
|
Загрузка…
Ссылка в новой задаче