Bug 821160 - Part1: Media plugin backend changes for Froyo support - r=cpeterson
authorChris Double <chris.double@double.co.nz>
Tue, 18 Dec 2012 14:44:10 +1300
changeset 125464 aaf4ae2968bbc90bd4a97a4168ad75073e50bf82
parent 125463 8697feee8fa12e9de7ad78604e5f2a6ce0826387
child 125465 49ff58ad7d2411b8cd54166c50bc825821bdc5bd
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpeterson
bugs821160
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 821160 - Part1: Media plugin backend changes for Froyo support - r=cpeterson
content/media/plugins/MediaPluginHost.cpp
--- a/content/media/plugins/MediaPluginHost.cpp
+++ b/content/media/plugins/MediaPluginHost.cpp
@@ -181,18 +181,22 @@ static const char* GetOmxLibraryName()
     // use a newer version of Gingerbread libstagefright than other 2.3.4 devices.
     return "lib/libomxplugingb.so";
   }
   else if (version == 9 || (version == 10 && release_version <= NS_LITERAL_STRING("2.3.5"))) {
     // Gingerbread versions from 2.3.5 and below have a different DataSource
     // than 2.3.6 and above.
     return "lib/libomxplugingb235.so";
   }
-  else if (version < 9) {
-    // Froyo and below are not supported
+  else if (version == 8) {
+    // Froyo
+    return "lib/libomxpluginfroyo.so";
+  }
+  else if (version < 8) {
+    // Below Froyo not supported
     return nullptr;
   }
 
   // Default libomxplugin for non-gingerbread devices
   return "lib/libomxplugin.so";
 
 #elif defined(ANDROID) && defined(MOZ_WIDGET_GONK)
   return "libomxplugin.so";