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

Backed out 3 changesets (bug 951770) for test_playback.html timeouts

Browse Source 
Backed out changeset ed795ed2bc38 (bug 951770)
Backed out changeset b4978efcdad9 (bug 951770)
Backed out changeset 4cddbc0d5183 (bug 951770)
This commit is contained in:
Phil Ringnalda 2014-01-31 23:39:04 -08:00
parent c5a05974f5
commit f92cb7ef5f
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
content/media/webm/WebMReader.cpp
View File

@ -372,7 +372,7 @@ nsresult WebMReader::ReadMetadata(MediaInfo* aInfo,
mHasAudio = true;
mInfo.mAudio.mHasAudio = true;
mAudioCodec = nestegg_track_codec_id(mContext, track);
mCodecDelay = params.codec_delay / NS_PER_USEC;
mCodecDelay = params.codec_delay;
if (mAudioCodec == NESTEGG_CODEC_VORBIS) {
// Get the Vorbis header data
@ -439,12 +439,6 @@ nsresult WebMReader::ReadMetadata(MediaInfo* aInfo,
return NS_ERROR_FAILURE;
}
if (static_cast<int64_t>(mCodecDelay) != FramesToUsecs(mOpusParser->mPreSkip, mOpusParser->mRate).value()) {
LOG(PR_LOG_DEBUG, ("Values for CodecDelay and PreSkip do not match\n"));
Cleanup();
return NS_ERROR_FAILURE;
}
mInfo.mAudio.mRate = mOpusParser->mRate;
mInfo.mAudio.mChannels = mOpusParser->mChannels;
@ -724,7 +718,7 @@ bool WebMReader::DecodeAudioPacket(nestegg_packet* aPacket, int64_t aOffset)
NS_WARNING("Int overflow converting WebM audio duration");
return false;
}
CheckedInt64 time = startTime - mCodecDelay;
CheckedInt64 time = startTime - (mCodecDelay / NS_PER_USEC);
if (!time.isValid()) {
NS_WARNING("Int overflow shifting tstamp by codec delay");
nestegg_free_packet(aPacket);

2
content/media/webm/WebMReader.h
View File

@ -215,7 +215,7 @@ private:
// Number of audio frames we've decoded since decoding began at mAudioStartMs.
uint64_t mAudioFrames;
// Number of microseconds that must be discarded from the start of the Stream.
// Number of nanoseconds that must be discarded from the start of the Stream.
uint64_t mCodecDelay;
// Parser state and computed offset-time mappings. Shared by multiple