Skip to content

Commit 20d3068

Browse files
Divya-563Divya-563
committed
Merge branch 'main' into R3
2 parents a006cb5 + c961f94 commit 20d3068

File tree

77 files changed

+8795
-522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+8795
-522
lines changed

‎docs/manual/adding-packages-cmake.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ typical packages will therefore only use a few of them.
100100
necessary to set them in the package's +*.mk+ file unless you want
101101
to override them:
102102

103-
** +CMAKE_BUILD_TYPE+ is driven by +BR2_ENABLE_DEBUG+;
103+
** +CMAKE_BUILD_TYPE+ is driven by +BR2_ENABLE_RUNTIME_DEBUG+;
104104
** +CMAKE_INSTALL_PREFIX+;
105105
** +BUILD_SHARED_LIBS+ is driven by +BR2_STATIC_LIBS+;
106106
** +BUILD_DOC+, +BUILD_DOCS+ are disabled;

‎docs/manual/adding-packages-meson.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,15 @@ will therefore only use a few of them.
116116
single quotes. By default, empty. Note that Buildroot already sets the
117117
correct values for +c+, +cpp+, +ar+, +strip+, and +pkgconfig+.
118118

119+
* +FOO_MESON_EXTRA_PROPERTIES+, to specify a space-separated list of
120+
properties to add to the `[properties]` section of the meson
121+
`cross-compilation.conf` configuration file. The format is
122+
`property-name=<value>` with no space around the +=+ sign, and with
123+
single quotes around string values. By default, empty. Note that
124+
Buildroot already sets values for +needs_exe_wrapper+, +c_args+,
125+
+c_link_args+, +cpp_args+, +cpp_link_args+, +sys_root+, and
126+
+pkg_config_libdir+.
127+
119128
* +FOO_NINJA_ENV+, to specify additional environment variables to pass to
120129
+ninja+, meson companion tool in charge of the build operations. By default,
121130
empty.

‎package/Config.in‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ menu "Target packages"
1010
source "package/skeleton-init-sysv/Config.in"
1111

1212
menu "Audio and video applications"
13+
source "package/aamp/Config.in"
14+
source "package/aampabr/Config.in"
15+
source "package/aampmetrics/Config.in"
1316
source "package/alsa-utils/Config.in"
1417
source "package/atest/Config.in"
1518
source "package/amazon-alexa/Config.in"
@@ -340,6 +343,8 @@ comment "Graphic libraries"
340343
source "package/tk/Config.in"
341344

342345
comment "Other GUIs"
346+
source "package/spark/Config.in"
347+
source "package/pxcore-libnode/Config.in"
343348
source "package/qt5/Config.in"
344349
if BR2_PACKAGE_QT5
345350
comment "QT libraries and helper libraries"
@@ -428,8 +433,7 @@ endmenu
428433
source "package/amd-catalyst/Config.in"
429434
source "package/avrdude/Config.in"
430435
source "package/bcache-tools/Config.in"
431-
source "package/bcm-refsw/Config.in"
432-
source "package/bcm-wifi-dhd/Config.in"
436+
source "package/bcm-refsw/Config.in"
433437
source "package/biosdevname/Config.in"
434438
source "package/brickd/Config.in"
435439
source "package/brltty/Config.in"
@@ -1601,6 +1605,7 @@ menu "Multimedia"
16011605
source "package/libass/Config.in"
16021606
source "package/libbdplus/Config.in"
16031607
source "package/libbluray/Config.in"
1608+
source "package/libdash/Config.in"
16041609
source "package/libcamera/Config.in"
16051610
source "package/libdcadec/Config.in"
16061611
source "package/libdvbcsa/Config.in"

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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
6+
7+
if((mPlayerState != eSTATE_RELEASED) && (mEventListeners[AAMP_EVENT_ALL_EVENTS] || mEventListeners[eventType]))
8+
{
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: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
config BR2_PACKAGE_AAMP
2+
bool "aamp"
3+
default n
4+
select BR2_PACKAGE_LIBCURL
5+
select BR2_PACKAGE_LIBDASH
6+
select BR2_PACKAGE_LIBXML2
7+
select BR2_PACKAGE_CJSON
8+
select BR2_PACKAGE_AAMPABR
9+
select BR2_PACKAGE_AAMPMETRICS
10+
select BR2_PACKAGE_GST1_PLUGINS_BASE
11+
help
12+
RDK AAMP

‎package/aamp/aamp.mk‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
################################################################################
2+
#
3+
# aamp
4+
#
5+
################################################################################
6+
7+
AAMP_VERSION = a72fea4afc3bb8e81fab9f3e6e3604e3ab6f7930
8+
AAMP_SITE_METHOD = git
9+
AAMP_SITE = https://github.com/rdkcmf/rdk-aamp
10+
AAMP_INSTALL_STAGING = YES
11+
12+
AAMP_DEPENDENCIES = libcurl libdash libxml2 aampabr aampmetrics gst1-plugins-base wpeframework
13+
14+
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI), y)
15+
AAMP_DEPENDENCIES += wpeframework-clientlibraries
16+
AAMP_CONF_OPTS += \
17+
-DENABLE_SESSION_STATS=ON \
18+
-DCMAKE_DASH_DRM=ON \
19+
-DCMAKE_USE_OPENCDM_ADAPTER=ON \
20+
-DCMAKE_USE_THUNDER_OCDM_API_0_2=ON
21+
endif
22+
23+
ifeq ($(BR2_PACKAGE_PLAYREADY4),y)
24+
AAMP_CONF_OPTS += \
25+
-DCMAKE_USE_PLAYREADY=ON
26+
endif
27+
28+
$(eval $(cmake-package))

‎package/aampabr/aampabr.mk‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
################################################################################
2+
#
3+
# aampabr
4+
#
5+
################################################################################
6+
7+
AAMPABR_VERSION = 94628fea94ea26527c53a03c6245623017c6cfe9
8+
AAMPABR_SITE_METHOD = git
9+
AAMPABR_SITE = https://github.com/rdkcmf/rdk-aampabr
10+
AAMPABR_INSTALL_STAGING = YES
11+
12+
$(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))

0 commit comments

Comments
 (0)