Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1193864 - Fixed dom/media/platforms/wmf/ compilation on mingw. r=cpearce

Browse Source
This commit is contained in:
Jacek Caban 2015-08-13 17:37:40 +02:00
parent 49f14db98f
commit d246521320
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/media/platforms/wmf/MFTDecoder.cpp
View File

@ -180,10 +180,6 @@ MFTDecoder::CreateOutputSample(RefPtr<IMFSample>* aOutSample)
hr = wmf::MFCreateAlignedMemoryBuffer(bufferSize, alignment, byRef(buffer)); hr = wmf::MFCreateAlignedMemoryBuffer(bufferSize, alignment, byRef(buffer));
NS_ENSURE_TRUE(SUCCEEDED(hr), hr); NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
DWORD maxLength = 0;
DWORD currentLength = 0;
BYTE* dst = nullptr;
hr = sample->AddBuffer(buffer); hr = sample->AddBuffer(buffer);
NS_ENSURE_TRUE(SUCCEEDED(hr), hr); NS_ENSURE_TRUE(SUCCEEDED(hr), hr);

6
dom/media/platforms/wmf/WMFDecoderModule.cpp
View File

@ -98,11 +98,11 @@ WMFDecoderModule::CreateVideoDecoder(const VideoInfo& aConfig,
FlushableTaskQueue* aVideoTaskQueue, FlushableTaskQueue* aVideoTaskQueue,
MediaDataDecoderCallback* aCallback) MediaDataDecoderCallback* aCallback)
{ {
nsAutoPtr<WMFVideoMFTManager> manager = nsAutoPtr<WMFVideoMFTManager> manager(
new WMFVideoMFTManager(aConfig, new WMFVideoMFTManager(aConfig,
aLayersBackend, aLayersBackend,
aImageContainer, aImageContainer,
sDXVAEnabled && ShouldUseDXVA(aConfig)); sDXVAEnabled && ShouldUseDXVA(aConfig)));
nsRefPtr<MFTDecoder> mft = manager->Init(); nsRefPtr<MFTDecoder> mft = manager->Init();
@ -121,7 +121,7 @@ WMFDecoderModule::CreateAudioDecoder(const AudioInfo& aConfig,
FlushableTaskQueue* aAudioTaskQueue, FlushableTaskQueue* aAudioTaskQueue,
MediaDataDecoderCallback* aCallback) MediaDataDecoderCallback* aCallback)
{ {
nsAutoPtr<WMFAudioMFTManager> manager = new WMFAudioMFTManager(aConfig); nsAutoPtr<WMFAudioMFTManager> manager(new WMFAudioMFTManager(aConfig));
nsRefPtr<MFTDecoder> mft = manager->Init(); nsRefPtr<MFTDecoder> mft = manager->Init();
if (!mft) { if (!mft) {

2
dom/media/platforms/wmf/WMFMediaDataDecoder.cpp
View File

@ -48,7 +48,7 @@ WMFMediaDataDecoder::Init()
// A single telemetry sample is reported for each MediaDataDecoder object // A single telemetry sample is reported for each MediaDataDecoder object
// that has detected error or produced output successfully. // that has detected error or produced output successfully.
static void static void
SendTelemetry(HRESULT hr) SendTelemetry(unsigned long hr)
{ {
// Collapse the error codes into a range of 0-0xff that can be viewed in // Collapse the error codes into a range of 0-0xff that can be viewed in
// telemetry histograms. For most MF_E_* errors, unique samples are used, // telemetry histograms. For most MF_E_* errors, unique samples are used,