Skip to content

Commit 2e273f2

Browse files
author
Neeraj Deshpande
committed
Merge branch 'main' into development/bcm-refsw-20.2
2 parents 9dd2324 + 30e01a1 commit 2e273f2

34 files changed

+7991
-161
lines changed

‎package/Config.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ menu "Target packages"
1212
menu "Audio and video applications"
1313
source "package/aamp/Config.in"
1414
source "package/aampabr/Config.in"
15+
source "package/aampmetrics/Config.in"
1516
source "package/alsa-utils/Config.in"
1617
source "package/atest/Config.in"
1718
source "package/amazon-alexa/Config.in"
@@ -342,6 +343,8 @@ comment "Graphic libraries"
342343
source "package/tk/Config.in"
343344

344345
comment "Other GUIs"
346+
source "package/spark/Config.in"
347+
source "package/pxcore-libnode/Config.in"
345348
source "package/qt5/Config.in"
346349
if BR2_PACKAGE_QT5
347350
comment "QT libraries and helper libraries"

‎package/aamp/0001-rdk-aamp-disable-getsourceid-chech-temporarily-to-sendsyncevent.patch‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1-
diff --git a/priv_aamp.cpp b/priv_aamp.cpp
2-
index aa589a87..c987d45a 100644
3-
--- a/priv_aamp.cpp
4-
+++ b/priv_aamp.cpp
5-
@@ -7053,10 +7053,10 @@ void PrivateInstanceAAMP::SetState(PrivAAMPState state)
6-
return;
7-
}
1+
diff --git a/AampEventManager.cpp b/AampEventManager.cpp
2+
index fea9673a..2ec52bb7 100644
3+
--- a/AampEventManager.cpp
4+
+++ b/AampEventManager.cpp
5+
@@ -296,9 +296,8 @@ void AampEventManager::SendEvent(const AAMPEventPtr &eventData, AAMPEventMode ev
86

9-
- if (0 == aamp_GetSourceID())
10-
+/* if (0 == aamp_GetSourceID())
7+
if((mPlayerState != eSTATE_RELEASED) && (mEventListeners[AAMP_EVENT_ALL_EVENTS] || mEventListeners[eventType]))
118
{
12-
sentSync = false;
13-
- }
14-
+ }*/
15-
16-
if ( (state == eSTATE_PLAYING || state == eSTATE_BUFFERING || state == eSTATE_PAUSED)
17-
&& mState == eSTATE_SEEKING && (mEventListener || mEventListeners[0] || mEventListeners[AAMP_EVENT_SEEKED]))
9+
- guint sId = GetSourceID();
10+
// if caller is asking for Sync Event , ensure it has proper source Id, else it has to go async event
11+
- if(eventMode==AAMP_EVENT_SYNC_MODE && sId != 0)
12+
+ if(eventMode==AAMP_EVENT_SYNC_MODE)
13+
{
14+
SendEventSync(eventData);
15+
}
16+
@@ -309,7 +308,7 @@ void AampEventManager::SendEvent(const AAMPEventPtr &eventData, AAMPEventMode ev
17+
else
18+
{
19+
//For other events if asyncTune eneabled or calle from non-UI thread , then send the event as Async
20+
- if (mAsyncTuneEnabled || sId == 0)
21+
+ if (mAsyncTuneEnabled)
22+
{
23+
SendEventAsync(eventData);
24+
}

‎package/aamp/0002-rdk-amp-align-ocdm-drm-adapter-interface.patch‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/drm/AampOcdmBasicSessionAdapter.cpp b/drm/AampOcdmBasicSessionAdapter.cpp
2+
index 37493c9c..2e69df15 100755
3+
--- a/drm/AampOcdmBasicSessionAdapter.cpp
4+
+++ b/drm/AampOcdmBasicSessionAdapter.cpp
5+
@@ -26,9 +26,15 @@ int AAMPOCDMBasicSessionAdapter::decrypt(const uint8_t *f_pbIV, uint32_t f_cbIV,
6+
dataToSend = vdata.data();
7+
}
8+
9+
+ //Set the Encryption Scheme and Pattern to defaults.
10+
+ EncryptionScheme encScheme = AesCtr_Cenc;
11+
+ EncryptionPattern pattern = {0};
12+
+
13+
int retvalue = opencdm_session_decrypt(m_pOpenCDMSession,
14+
dataToSend,
15+
sizeToSend,
16+
+ encScheme,
17+
+ pattern,
18+
f_pbIV, f_cbIV,
19+
m_keyId.data(), m_keyId.size());
20+
if (retvalue != 0)

‎package/aamp/Config.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ config BR2_PACKAGE_AAMP
66
select BR2_PACKAGE_LIBXML2
77
select BR2_PACKAGE_CJSON
88
select BR2_PACKAGE_AAMPABR
9+
select BR2_PACKAGE_AAMPMETRICS
910
select BR2_PACKAGE_GST1_PLUGINS_BASE
1011
help
1112
RDK AAMP

‎package/aamp/aamp.mk‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,25 @@
44
#
55
################################################################################
66

7-
AAMP_VERSION = 24a4dfa609c7c6b3c18ee595bde0874c9a5ca7c9
7+
AAMP_VERSION = a72fea4afc3bb8e81fab9f3e6e3604e3ab6f7930
88
AAMP_SITE_METHOD = git
99
AAMP_SITE = https://github.com/rdkcmf/rdk-aamp
1010
AAMP_INSTALL_STAGING = YES
1111

12-
AAMP_DEPENDENCIES = libcurl libdash libxml2 cjson aampabr gst1-plugins-base wpeframework
12+
AAMP_DEPENDENCIES = libcurl libdash libxml2 aampabr aampmetrics gst1-plugins-base wpeframework
1313

1414
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI), y)
15+
AAMP_DEPENDENCIES += wpeframework-clientlibraries
1516
AAMP_CONF_OPTS += \
17+
-DENABLE_SESSION_STATS=ON \
1618
-DCMAKE_DASH_DRM=ON \
1719
-DCMAKE_USE_OPENCDM_ADAPTER=ON \
1820
-DCMAKE_USE_THUNDER_OCDM_API_0_2=ON
1921
endif
2022

23+
ifeq ($(BR2_PACKAGE_PLAYREADY4),y)
24+
AAMP_CONF_OPTS += \
25+
-DCMAKE_USE_PLAYREADY=ON
26+
endif
27+
2128
$(eval $(cmake-package))

‎package/aampabr/aampabr.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55
################################################################################
66

7-
AAMPABR_VERSION = baf59ee4fa697809ed9a11552c02e36a02e28fd7
7+
AAMPABR_VERSION = 94628fea94ea26527c53a03c6245623017c6cfe9
88
AAMPABR_SITE_METHOD = git
9-
AAMPABR_SITE = https://code.rdkcentral.com/r/rdk/components/generic/aampabr
9+
AAMPABR_SITE = https://github.com/rdkcmf/rdk-aampabr
1010
AAMPABR_INSTALL_STAGING = YES
1111

1212
$(eval $(cmake-package))

‎package/aampmetrics/Config.in‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
config BR2_PACKAGE_AAMPMETRICS
2+
bool "aampmetrics"
3+
depends on BR2_PACKAGE_AAMP
4+
help
5+
RDK AAMPMETRICS

‎package/aampmetrics/aampmetrics.mk‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
################################################################################
2+
#
3+
# aampmetrics
4+
#
5+
################################################################################
6+
7+
AAMPMETRICS_VERSION = c6b9de63f2a8755db59ee300c02c6c89e392dad5
8+
AAMPMETRICS_SITE_METHOD = git
9+
AAMPMETRICS_SITE = https://github.com/rdkcmf/rdk-aampmetrics
10+
AAMPMETRICS_INSTALL_STAGING = YES
11+
AAMPMETRICS_DEPENDENCIES = cjson
12+
13+
$(eval $(cmake-package))

‎package/cobalt/cobalt.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
COBALT_VERSION = e5c4fd2aec74ead45dac6c7f57527b9dd8e94267
7+
COBALT_VERSION = 1ce72e8929579921868c9d87a0ba4128cc88d9e9
88
COBALT_SITE_METHOD = git
99
COBALT_SITE = [email protected]:Metrological/cobalt
1010
COBALT_INSTALL_STAGING = YES

‎package/gstreamer1/gst1-aamp/gst1-aamp.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
#
55
################################################################################
66

7-
GST1_AAMP_VERSION = c9d03d4df04e0a09a0b8cd45c122c6add12b0501
7+
GST1_AAMP_VERSION = 8a0d9ef607ea254aff4b897137fd1f743db74c29
88
GST1_AAMP_SITE = http://code.rdkcentral.com/r/rdk/components/generic/gst-plugins-rdk-aamp
99
GST1_AAMP_SITE_METHOD = git
1010

1111
GST1_AAMP_DEPENDENCIES = aamp
1212

1313
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI), y)
1414
GST1_AAMP_CONF_OPTS += \
15+
-DCMAKE_CDM_DRM=ON \
1516
-DCMAKE_DASH_DRM=ON \
1617
-DCMAKE_USE_OPENCDM_ADAPTER=ON
1718
endif

0 commit comments

Comments
 (0)