Bug 820661 - Implement support for libstagefright video decoding on HTC EVO Design Gingerbread Android phone - r=cpeterson
authorChris Double <chris.double@double.co.nz>
Thu, 13 Dec 2012 11:56:01 +1300
changeset 115871 c4b354cd4b9819f7f260d1713710552d02b1c89d
parent 115870 2d36cae22daf1776ad55eb1da85cca7701bcf5e6
child 115872 46826841e0fee9a6ef8cbf2d2daa5fd00c2df602
push id24028
push useremorley@mozilla.com
push dateThu, 13 Dec 2012 15:56:02 +0000
treeherderautoland@9db79b97abbb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpeterson
bugs820661
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 820661 - Implement support for libstagefright video decoding on HTC EVO Design Gingerbread Android phone - r=cpeterson
content/media/plugins/MediaPluginHost.cpp
--- a/content/media/plugins/MediaPluginHost.cpp
+++ b/content/media/plugins/MediaPluginHost.cpp
@@ -170,16 +170,22 @@ static const char* GetOmxLibraryName()
   else if (version == 13 || version == 12 || version == 11) {
     return "lib/libomxpluginhc.so";
   }
   else if (version == 10 && release_version >= NS_LITERAL_STRING("2.3.6")) {
     // Gingerbread versions from 2.3.6 and above have a different DataSource
     // layout to those on 2.3.5 and below.
     return "lib/libomxplugingb.so";
   }
+  else if (version == 10 && release_version >= NS_LITERAL_STRING("2.3.4") &&
+           device.Find("HTC") == 0) {
+    // HTC devices running Gingerbread 2.3.4+ (HTC Desire HD, HTC Evo Design, etc) seem to
+    // 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
     return nullptr;