forked from mirrors/gecko-dev
Backed out changeset 2a43d61af1ff (bug 1679927) for causing build bustages on AppleVTDecoder.cpp. CLOSED TREE
This commit is contained in:
parent
288890e8bb
commit
848206a1c2
2 changed files with 2 additions and 7 deletions
|
|
@ -45,7 +45,6 @@ AppleVTDecoder::AppleVTDecoder(const VideoInfo& aConfig,
|
|||
? *aConfig.mColorSpace
|
||||
: DefaultColorSpace({mPictureWidth, mPictureHeight})),
|
||||
mColorRange(aConfig.mColorRange),
|
||||
mColorDepth(aConfig.mColorDepth),
|
||||
mStreamType(MP4Decoder::IsH264(aConfig.mMimeType) ? StreamType::H264
|
||||
: VPXDecoder::IsVP9(aConfig.mMimeType) ? StreamType::VP9
|
||||
: StreamType::Unknown),
|
||||
|
|
@ -608,13 +607,10 @@ CFDictionaryRef AppleVTDecoder::CreateOutputConfiguration() {
|
|||
|
||||
#ifndef MOZ_WIDGET_UIKIT
|
||||
// Output format type:
|
||||
bool is10Bit = (gfx::BitDepthForColorDepth(mColorDepth) == 10);
|
||||
SInt32 PixelFormatTypeValue =
|
||||
mColorRange == gfx::ColorRange::FULL
|
||||
? (is10Bit ? kCVPixelFormatType_420YpCbCr10BiPlanarFullRange
|
||||
: kCVPixelFormatType_420YpCbCr8BiPlanarFullRange)
|
||||
: (is10Bit ? kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange
|
||||
: kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange);
|
||||
? kCVPixelFormatType_420YpCbCr8BiPlanarFullRange
|
||||
: kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
|
||||
AutoCFRelease<CFNumberRef> PixelFormatTypeNumber = CFNumberCreate(
|
||||
kCFAllocatorDefault, kCFNumberSInt32Type, &PixelFormatTypeValue);
|
||||
// Construct IOSurface Properties
|
||||
|
|
|
|||
|
|
@ -92,7 +92,6 @@ class AppleVTDecoder : public MediaDataDecoder,
|
|||
const uint32_t mDisplayHeight;
|
||||
const gfx::YUVColorSpace mColorSpace;
|
||||
const gfx::ColorRange mColorRange;
|
||||
const gfx::ColorDepth mColorDepth;
|
||||
|
||||
// Method to set up the decompression session.
|
||||
MediaResult InitializeSession();
|
||||
|
|
|
|||
Loading…
Reference in a new issue