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 1115749 - Assert that we hold the monitor at all the MP4Demuxer API entry points. r=rillian

Browse Source 
MP4Demuxer accesses shared state (index, moofparser) in lots of shared helper
routines, so we should assume that it's not safe to touch the demuxer at all
without holding the lock (unless demonstrated otherwise). This stuff should
probably be redesigned, but that's a problem for another day.
This commit is contained in:
Bobby Holley 2014-12-29 16:10:16 -08:00
parent 79dcb2a6e6
commit 35e4ddbeec
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
media/libstagefright/binding/mp4_demuxer.cpp
View File

@ -92,6 +92,7 @@ MP4Demuxer::~MP4Demuxer()
bool
MP4Demuxer::Init()
{
mMonitor->AssertCurrentThreadOwns();
sp<MediaExtractor> e = mPrivate->mExtractor;
for (size_t i = 0; i < e->countTracks(); i++) {
sp<MetaData> metaData = e->getTrackMetaData(i);
@ -138,30 +139,35 @@ MP4Demuxer::Init()
bool
MP4Demuxer::HasValidAudio()
{
mMonitor->AssertCurrentThreadOwns();
return mPrivate->mAudio.get() && mAudioConfig.IsValid();
}
bool
MP4Demuxer::HasValidVideo()
{
mMonitor->AssertCurrentThreadOwns();
return mPrivate->mVideo.get() && mVideoConfig.IsValid();
}
Microseconds
MP4Demuxer::Duration()
{
mMonitor->AssertCurrentThreadOwns();
return std::max(mVideoConfig.duration, mAudioConfig.duration);
}
bool
MP4Demuxer::CanSeek()
{
mMonitor->AssertCurrentThreadOwns();
return mPrivate->mExtractor->flags() & MediaExtractor::CAN_SEEK;
}
void
MP4Demuxer::SeekAudio(Microseconds aTime)
{
mMonitor->AssertCurrentThreadOwns();
if (mPrivate->mAudioIterator) {
mPrivate->mAudioIterator->Seek(aTime);
} else {
@ -173,6 +179,7 @@ MP4Demuxer::SeekAudio(Microseconds aTime)
void
MP4Demuxer::SeekVideo(Microseconds aTime)
{
mMonitor->AssertCurrentThreadOwns();
if (mPrivate->mVideoIterator) {
mPrivate->mVideoIterator->Seek(aTime);
} else {
@ -184,6 +191,7 @@ MP4Demuxer::SeekVideo(Microseconds aTime)
MP4Sample*
MP4Demuxer::DemuxAudioSample()
{
mMonitor->AssertCurrentThreadOwns();
if (mPrivate->mAudioIterator) {
nsAutoPtr<MP4Sample> sample(mPrivate->mAudioIterator->GetNext());
if (sample) {
@ -213,6 +221,7 @@ MP4Demuxer::DemuxAudioSample()
MP4Sample*
MP4Demuxer::DemuxVideoSample()
{
mMonitor->AssertCurrentThreadOwns();
if (mPrivate->mVideoIterator) {
nsAutoPtr<MP4Sample> sample(mPrivate->mVideoIterator->GetNext());
if (sample) {
@ -243,6 +252,7 @@ MP4Demuxer::DemuxVideoSample()
void
MP4Demuxer::UpdateIndex(const nsTArray<mozilla::MediaByteRange>& aByteRanges)
{
mMonitor->AssertCurrentThreadOwns();
for (int i = 0; i < mPrivate->mIndexes.Length(); i++) {
mPrivate->mIndexes[i]->UpdateMoofIndex(aByteRanges);
}
@ -253,6 +263,7 @@ MP4Demuxer::ConvertByteRangesToTime(
const nsTArray<mozilla::MediaByteRange>& aByteRanges,
nsTArray<Interval<Microseconds>>* aIntervals)
{
mMonitor->AssertCurrentThreadOwns();
if (mPrivate->mIndexes.IsEmpty()) {
return;
}
@ -292,6 +303,7 @@ MP4Demuxer::ConvertByteRangesToTime(
int64_t
MP4Demuxer::GetEvictionOffset(Microseconds aTime)
{
mMonitor->AssertCurrentThreadOwns();
if (mPrivate->mIndexes.IsEmpty()) {
return 0;
}