Load CMA backend from shared library

chromecast/media/base/media_codec_support.cc

Index: chromecast/media/base/media_codec_support.cc
diff --git a/chromecast/media/base/media_codec_support.cc b/chromecast/media/base/media_codec_support.cc
index b04a077961e31c0d6274e43feb7e844bb7410fad..57ae5a8974a0083db5efe39bb3bfd3cca691f7fc 100644
--- a/chromecast/media/base/media_codec_support.cc
+++ b/chromecast/media/base/media_codec_support.cc
@@ -4,13 +4,48 @@
 
 #include "chromecast/media/base/media_codec_support.h"
 
-// TODO(gunsch/servolk): delete this file once a solution exists upstream.
+#include "base/bind.h"
+#include "chromecast/media/base/media_caps.h"
+#include "chromecast/public/media_codec_support_shlib.h"
+#include "net/base/mime_util.h"
 
+// TODO(gunsch/servolk): delete this definition once a solution exists upstream.

[gunsch, 2015/07/27 17:14:49]

You might be able to resolve this TODO now. Internal implementation shouldn't be
calling net::DefaultIsCodecSupported after your changes.

[servolk, 2015/07/27 21:25:47]

It's true, internal implementations won't call this anymore. But the problem is
that DefaultIsCodecSupported still doesn't exist in the upstream. So we'll still
need to provide our own implementation for upstream cast_shell builds.

[halliwell, 2015/07/28 02:19:35]

I could remove this TODO by just returning true lower down in this file.  And
we'd replace with a downstream [Local] change to call DefaultIsCodecSupported. 
Alternatively, we remove this stub implementation downstream.

Either way, the TODO in the header will still be there (to define
net::IsCodecSupportedCB).

Let me know if you'd prefer any changes to what's here.

[gunsch, 2015/07/29 17:04:19]

Yeah, go ahead and delete it. We shouldn't be defining things in the net
namespace :)

The only reason we checked it in was because internal code expected it in the
chromium/src repo (due to our downstream hack), so to keep building we at least
needed a definition here. Since you're moving that out of internal, I'd rather
just "return true" below with a TODO.

[halliwell, 2015/07/29 19:58:19]

Ok, removed.

 namespace net {
-
 bool DefaultIsCodecSupported(const std::string&) {
   return true;
 }
+}
+
+namespace chromecast {
+namespace media {
+namespace {
+
+bool IsCodecSupported(const std::string& codec) {
+  MediaCodecSupportShlib::CodecSupport platform_support =
+      MediaCodecSupportShlib::IsSupported(codec);
+  if (platform_support == MediaCodecSupportShlib::kSupported)
+    return true;
+  else if (platform_support == MediaCodecSupportShlib::kNotSupported)
+    return false;
+
+  if (codec == "aac51") {
+    return ::media::HdmiSinkSupportsPcmSurroundSound();
+  }
+  if (codec == "ac-3" || codec == "mp4a.a5") {
+    return ::media::HdmiSinkSupportsAC3();
+  }
+  if (codec == "ec-3" || codec == "mp4a.a6") {
+    return ::media::HdmiSinkSupportsEAC3();
+  }
 
-}  // namespace net
+  return net::DefaultIsCodecSupported(codec);
+}
+
+}  // namespace
+
+net::IsCodecSupportedCB GetIsCodecSupportedOnChromecastCB() {
+  return base::Bind(&IsCodecSupported);
+}
 
+}  // namespace media
+}  // namespace chromecast