mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-05 15:28:39 +09:00
Merge remote-tracking branch 'origin/tracking' into custom
This commit is contained in:
commit
0c6e087291
55 changed files with 320 additions and 34 deletions
|
|
@ -365,7 +365,9 @@ MediaFormatReader::DecoderFactory::DoCreateDecoder(TrackType aTrack)
|
|||
: *ownerData.mOriginalInfo->GetAsAudioInfo(),
|
||||
ownerData.mTaskQueue,
|
||||
ownerData.mCallback.get(),
|
||||
#ifdef MOZ_GMP
|
||||
mOwner->mCrashHelper,
|
||||
#endif
|
||||
ownerData.mIsBlankDecode,
|
||||
&result
|
||||
});
|
||||
|
|
@ -383,7 +385,9 @@ MediaFormatReader::DecoderFactory::DoCreateDecoder(TrackType aTrack)
|
|||
ownerData.mCallback.get(),
|
||||
mOwner->mKnowsCompositor,
|
||||
mOwner->GetImageContainer(),
|
||||
#ifdef MOZ_GMP
|
||||
mOwner->mCrashHelper,
|
||||
#endif
|
||||
ownerData.mIsBlankDecode,
|
||||
&result
|
||||
});
|
||||
|
|
@ -576,9 +580,11 @@ MediaFormatReader::InitInternal()
|
|||
mVideo.mTaskQueue =
|
||||
new TaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER));
|
||||
|
||||
#ifdef MOZ_GMP
|
||||
// Note: GMPCrashHelper must be created on main thread, as it may use
|
||||
// weak references, which aren't threadsafe.
|
||||
mCrashHelper = mDecoder->GetCrashHelper();
|
||||
#endif
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue