Bug 1110534: Use AVCC wrapper for mac decoder. Adds AnnexB and AVC3 support. r=cpearce

This commit is contained in:
Jean-Yves Avenard 2014-12-23 14:36:10 +11:00
parent 43dc514afc
commit 73cd5036a3

View File

@ -5,6 +5,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "PlatformDecoderModule.h" #include "PlatformDecoderModule.h"
#include "AVCCDecoderModule.h"
#ifdef XP_WIN #ifdef XP_WIN
#include "WMFDecoderModule.h" #include "WMFDecoderModule.h"
#endif #endif
@ -149,7 +151,7 @@ PlatformDecoderModule::CreatePDM()
} }
#endif #endif
#ifdef MOZ_APPLEMEDIA #ifdef MOZ_APPLEMEDIA
nsRefPtr<PlatformDecoderModule> m(new AppleDecoderModule()); nsRefPtr<PlatformDecoderModule> m(new AVCCDecoderModule(new AppleDecoderModule()));
return m.forget(); return m.forget();
#endif #endif
#ifdef MOZ_GONK_MEDIACODEC #ifdef MOZ_GONK_MEDIACODEC