diff options
Diffstat (limited to 'dom/media/systemservices')
| -rw-r--r-- | dom/media/systemservices/MediaSystemResourceService.cpp | 17 | ||||
| -rw-r--r-- | dom/media/systemservices/moz.build | 10 |
2 files changed, 0 insertions, 27 deletions
diff --git a/dom/media/systemservices/MediaSystemResourceService.cpp b/dom/media/systemservices/MediaSystemResourceService.cpp index 0e5d6a50c..4434c54c2 100644 --- a/dom/media/systemservices/MediaSystemResourceService.cpp +++ b/dom/media/systemservices/MediaSystemResourceService.cpp @@ -47,23 +47,6 @@ MediaSystemResourceService::MediaSystemResourceService() : mDestroyed(false) { MOZ_ASSERT(CompositorThreadHolder::IsInCompositorThread()); -#ifdef MOZ_WIDGET_GONK - // The maximum number of hardware resoureces available. - // XXX need to hange to a dynamic way. - enum - { - VIDEO_DECODER_COUNT = 1, - VIDEO_ENCODER_COUNT = 1 - }; - - MediaSystemResource* resource; - - resource = new MediaSystemResource(VIDEO_DECODER_COUNT); - mResources.Put(static_cast<uint32_t>(MediaSystemResourceType::VIDEO_DECODER), resource); - - resource = new MediaSystemResource(VIDEO_ENCODER_COUNT); - mResources.Put(static_cast<uint32_t>(MediaSystemResourceType::VIDEO_ENCODER), resource); -#endif } MediaSystemResourceService::~MediaSystemResourceService() diff --git a/dom/media/systemservices/moz.build b/dom/media/systemservices/moz.build index 33e5ed1f1..82a5c5e72 100644 --- a/dom/media/systemservices/moz.build +++ b/dom/media/systemservices/moz.build @@ -42,16 +42,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': UNIFIED_SOURCES += ['OSXRunLoopSingleton.cpp'] EXPORTS += ['OSXRunLoopSingleton.h'] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - if CONFIG['ANDROID_VERSION'] >= '17': - LOCAL_INCLUDES += [ - '%' + '%s/frameworks/wilhelm/include' % CONFIG['ANDROID_SOURCE'], - ] - else: - LOCAL_INCLUDES += [ - '%' + '%s/system/media/wilhelm/include' % CONFIG['ANDROID_SOURCE'], - ] - if CONFIG['_MSC_VER']: DEFINES['__PRETTY_FUNCTION__'] = '__FUNCSIG__' |