diff --git a/src/third_party/starboard/rdk/arm/gyp_configuration.py b/src/third_party/starboard/rdk/arm/gyp_configuration.py
index c189893..5cc850a 100644
--- a/src/third_party/starboard/rdk/arm/gyp_configuration.py
+++ b/src/third_party/starboard/rdk/arm/gyp_configuration.py
@@ -47,6 +47,7 @@ class RDKPlatformConfig(platform_configuration.PlatformConfiguration):
super(RDKPlatformConfig, self).__init__(platform)
self.has_ocdm = os.environ.get('COBALT_HAS_OCDM', '0')
+ self.ocdm_library_name = os.environ.get('COBALT_OCDM_LIBRARY_NAME', 'ocdm')
self.sabi_json_path = 'starboard/sabi/arm/%s/sabi-v13.json' % (os.environ.get('COBALT_ARM_CALLCONVENTION', 'hardfp'))
self.enable_evergreen_lite = os.environ.get('COBALT_EVERGREEN_LITE', '0')
self.sysroot = os.path.realpath(os.environ.get('PKG_CONFIG_SYSROOT_DIR', '/'))
@@ -66,6 +67,7 @@ class RDKPlatformConfig(platform_configuration.PlatformConfiguration):
'clang': 0,
'sysroot': self.sysroot,
'has_ocdm': self.has_ocdm,
+ 'ocdm_library_name': self.ocdm_library_name,
'sb_evergreen_compatible': self.enable_evergreen_lite,
'sb_evergreen_compatible_lite': self.enable_evergreen_lite,
'sb_evergreen_compatible_libunwind': self.enable_evergreen_lite,
diff --git a/src/third_party/starboard/rdk/brcm/arm/gyp_configuration.py b/src/third_party/starboard/rdk/brcm/arm/gyp_configuration.py
index 0d99905..8525232 100644
--- a/src/third_party/starboard/rdk/brcm/arm/gyp_configuration.py
+++ b/src/third_party/starboard/rdk/brcm/arm/gyp_configuration.py
@@ -47,6 +47,7 @@ class RDKPlatformConfig(platform_configuration.PlatformConfiguration):
super(RDKPlatformConfig, self).__init__(platform)
self.has_ocdm = os.environ.get('COBALT_HAS_OCDM', '0')
+ self.ocdm_library_name = os.environ.get('COBALT_OCDM_LIBRARY_NAME', 'ocdm')
self.sabi_json_path = 'starboard/sabi/arm/%s/sabi-v13.json' % (os.environ.get('COBALT_ARM_CALLCONVENTION', 'hardfp'))
self.sysroot = os.path.realpath(os.environ.get('PKG_CONFIG_SYSROOT_DIR', '/'))
self.AppendApplicationConfigurationPath(os.path.dirname(__file__))
@@ -65,6 +66,7 @@ class RDKPlatformConfig(platform_configuration.PlatformConfiguration):
'clang': 0,
'sysroot': self.sysroot,
'has_ocdm': self.has_ocdm,
+ 'ocdm_library_name': self.ocdm_library_name,
})
variables.update({
'cobalt_font_package': 'limited',
diff --git a/src/third_party/starboard/rdk/rpi/gyp_configuration.py b/src/third_party/starboard/rdk/rpi/gyp_configuration.py
index b0081b6..918ecd7 100644
--- a/src/third_party/starboard/rdk/rpi/gyp_configuration.py
+++ b/src/third_party/starboard/rdk/rpi/gyp_configuration.py
@@ -47,6 +47,7 @@ class RDKPlatformConfig(platform_configuration.PlatformConfiguration):
super(RDKPlatformConfig, self).__init__(platform)
self.has_ocdm = os.environ.get('COBALT_HAS_OCDM', '0')
+ self.ocdm_library_name = os.environ.get('COBALT_OCDM_LIBRARY_NAME', 'ocdm')
self.sabi_json_path = 'starboard/sabi/arm/%s/sabi-v13.json' % (os.environ.get('COBALT_ARM_CALLCONVENTION', 'hardfp'))
self.sysroot = os.path.realpath(os.environ.get('PKG_CONFIG_SYSROOT_DIR', '/'))
self.AppendApplicationConfigurationPath(os.path.dirname(__file__))
@@ -65,6 +66,7 @@ class RDKPlatformConfig(platform_configuration.PlatformConfiguration):
'clang': 0,
'sysroot': self.sysroot,
'has_ocdm': self.has_ocdm,
+ 'ocdm_library_name': self.ocdm_library_name,
})
variables.update({
'cobalt_font_package': 'limited',
diff --git a/src/third_party/starboard/rdk/shared/media/gst_media_utils.cc b/src/third_party/starboard/rdk/shared/media/gst_media_utils.cc
index 934c5c8..5182351 100644
--- a/src/third_party/starboard/rdk/shared/media/gst_media_utils.cc
+++ b/src/third_party/starboard/rdk/shared/media/gst_media_utils.cc
@@ -203,8 +203,17 @@ std::vector<std::string> CodecToGstCaps(SbMediaAudioCodec codec,
}
case kSbMediaAudioCodecAc3:
- case kSbMediaAudioCodecEac3:
- return {{"audio/x-eac3"}};
+ case kSbMediaAudioCodecEac3:{
+ std::string primary_caps = "audio/x-eac3";
+ if (info) {
+ primary_caps +=
+ ", channels=" + std::to_string(info->number_of_channels);
+ primary_caps += ", rate=" + std::to_string(info->samples_per_second);
+
+ }
+ SB_LOG(INFO) << "Adding audio caps data: " << primary_caps;
+ return {{primary_caps}};
+ }
case kSbMediaAudioCodecOpus: {
std::string primary_caps = "audio/x-opus, channel-mapping-family=0";
diff --git a/src/third_party/starboard/rdk/shared/system.gyp b/src/third_party/starboard/rdk/shared/system.gyp
index 0e8eb74..f48aec8 100644
--- a/src/third_party/starboard/rdk/shared/system.gyp
+++ b/src/third_party/starboard/rdk/shared/system.gyp
@@ -115,15 +115,15 @@
'type': 'none',
'direct_dependent_settings': {
'cflags': [
- '<!@(<(pkg-config) --cflags ocdm)',
+ '<!@(<(pkg-config) --cflags <(ocdm_library_name))',
],
},
'link_settings': {
'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other ocdm)',
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other <(ocdm_library_name))',
],
'libraries': [
- '<!@(<(pkg-config) --libs-only-l ocdm)',
+ '<!@(<(pkg-config) --libs-only-l <(ocdm_library_name))',
'-ldl',
],
}, |
