diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-07-06 15:53:52 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-07-06 15:53:52 +0200 |
| commit | 941e54654eabed0a3568f7fefe424a45aa02eddb (patch) | |
| tree | 49aa02b174c428962d99142d8061267bfcd79e69 /dom/media/android | |
| parent | ad9ee72dcd7981bc47b3844a224d69fadfdfd8ef (diff) | |
| parent | 0daa12376295d5d796256a116eb2a348a3a9273f (diff) | |
| download | UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.tar UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.tar.gz UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.tar.lz UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.tar.xz UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into _testBranch_test_1
Diffstat (limited to 'dom/media/android')
| -rw-r--r-- | dom/media/android/AndroidMediaPluginHost.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/dom/media/android/AndroidMediaPluginHost.cpp b/dom/media/android/AndroidMediaPluginHost.cpp index d3dce2b93..d4c4fc59e 100644 --- a/dom/media/android/AndroidMediaPluginHost.cpp +++ b/dom/media/android/AndroidMediaPluginHost.cpp @@ -12,7 +12,6 @@ #include "nsXPCOMStrings.h" #include "nsISeekableStream.h" #include "nsIGfxInfo.h" -#include "gfxCrashReporterUtils.h" #include "prmem.h" #include "prlink.h" #include "AndroidMediaResourceServer.h" @@ -22,7 +21,7 @@ #include "nsIPropertyBag2.h" -#if defined(ANDROID) || defined(MOZ_WIDGET_GONK) +#if defined(ANDROID) #include "android/log.h" #define ALOG(args...) __android_log_print(ANDROID_LOG_INFO, "AndroidMediaPluginHost" , ## args) #else @@ -109,8 +108,6 @@ static bool IsOmxSupported() return false; } - ScopedGfxFeatureReporter reporter("Stagefright", forceEnabled); - if (!forceEnabled) { nsCOMPtr<nsIGfxInfo> gfxInfo = services::GetGfxInfo(); if (gfxInfo) { @@ -125,7 +122,6 @@ static bool IsOmxSupported() } } - reporter.SetSuccessful(); return true; } @@ -134,7 +130,7 @@ static bool IsOmxSupported() // nullptr is returned if Omx decoding is not supported on the device, static const char* GetOmxLibraryName() { -#if defined(ANDROID) && !defined(MOZ_WIDGET_GONK) +#if defined(ANDROID) nsCOMPtr<nsIPropertyBag2> infoService = do_GetService("@mozilla.org/system-info;1"); NS_ASSERTION(infoService, "Could not find a system info service"); @@ -172,7 +168,7 @@ static const char* GetOmxLibraryName() if (!IsOmxSupported()) return nullptr; -#if defined(ANDROID) && !defined(MOZ_WIDGET_GONK) +#if defined(ANDROID) if (version >= 17) { return "libomxpluginkk.so"; } @@ -180,8 +176,6 @@ static const char* GetOmxLibraryName() // Ice Cream Sandwich and Jellybean return "libomxplugin.so"; -#elif defined(ANDROID) && defined(MOZ_WIDGET_GONK) - return "libomxplugin.so"; #else return nullptr; #endif |