Skip to content
Snippets Groups Projects
Commit fcbf389c authored by Brad Werth's avatar Brad Werth
Browse files

Bug 1790281: Fixup a bad merge from Bug 1787561. r=alwu

When D155902 merged and landed, it undid a recent change in
RemoteVideoDecoderParent::ProcessDecodedData without causing a compiler
error. This fixes up the merge to what was intended.

Differential Revision: https://phabricator.services.mozilla.com/D157080
parent 1ba236a5
No related branches found
No related tags found
No related merge requests found
......@@ -274,10 +274,14 @@ MediaResult RemoteVideoDecoderParent::ProcessDecodedData(
MediaDataIPDL(data->mOffset, data->mTime, data->mTimecode,
data->mDuration, data->mKeyframe),
video->mDisplay,
RemoteImageHolder(mParent,
XRE_IsGPUProcess() ? VideoBridgeSource::GpuProcess
: VideoBridgeSource::RddProcess,
size, video->mImage->GetColorDepth(), sd),
RemoteImageHolder(
mParent,
XRE_IsGPUProcess()
? VideoBridgeSource::GpuProcess
: (XRE_IsRDDProcess()
? VideoBridgeSource::RddProcess
: VideoBridgeSource::MFMediaEngineCDMProcess),
size, video->mImage->GetColorDepth(), sd),
video->mFrameID);
array.AppendElement(std::move(output));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment