Skip to content

Commit 10c1ac4

Browse files
HaseenaSainulDivya-563
HaseenaSainul
authored and
Divya-563
committed
Merge pull request #336 from WebPlatformForEmbedded/development/streamer-recipe
Streamer: package files integrated
1 parent f197310 commit 10c1ac4

17 files changed

+916
-35
lines changed

‎package/Config.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ endmenu
433433
source "package/amd-catalyst/Config.in"
434434
source "package/avrdude/Config.in"
435435
source "package/bcache-tools/Config.in"
436-
source "package/bcm-refsw/Config.in"
436+
source "package/bcm-refsw/Config.in"
437437
source "package/biosdevname/Config.in"
438438
source "package/brickd/Config.in"
439439
source "package/brltty/Config.in"

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

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
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
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+
}
68

7-
if((mPlayerState != eSTATE_RELEASED) && (mEventListeners[AAMP_EVENT_ALL_EVENTS] || mEventListeners[eventType]))
9+
- if (0 == aamp_GetSourceID())
10+
+/* if (0 == aamp_GetSourceID())
811
{
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-
}
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]))

‎package/aamp/Config.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ config BR2_PACKAGE_AAMP
66
select BR2_PACKAGE_LIBXML2
77
select BR2_PACKAGE_CJSON
88
select BR2_PACKAGE_AAMPABR
9-
select BR2_PACKAGE_AAMPMETRICS
109
select BR2_PACKAGE_GST1_PLUGINS_BASE
1110
help
1211
RDK AAMP

‎package/aamp/aamp.mk‎

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

7-
AAMP_VERSION = a72fea4afc3bb8e81fab9f3e6e3604e3ab6f7930
7+
AAMP_VERSION = 24a4dfa609c7c6b3c18ee595bde0874c9a5ca7c9
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 aampabr aampmetrics gst1-plugins-base wpeframework
12+
AAMP_DEPENDENCIES = libcurl libdash libxml2 cjson aampabr gst1-plugins-base wpeframework
1313

1414
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI), y)
15-
AAMP_DEPENDENCIES += wpeframework-clientlibraries
1615
AAMP_CONF_OPTS += \
17-
-DENABLE_SESSION_STATS=ON \
1816
-DCMAKE_DASH_DRM=ON \
1917
-DCMAKE_USE_OPENCDM_ADAPTER=ON \
2018
-DCMAKE_USE_THUNDER_OCDM_API_0_2=ON
2119
endif
2220

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

‎package/aampabr/Config.in‎

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

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

1212
$(eval $(cmake-package))

‎package/gstreamer1/Config.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ source "package/gstreamer1/gstreamer1/Config.in"
44
if BR2_PACKAGE_GSTREAMER1
55

66
source "package/gstreamer1/gst1-bcm/Config.in"
7+
source "package/gstreamer1/gst1-aamp/Config.in"
78
source "package/gstreamer1/gstreamer1-mm/Config.in"
89
source "package/gstreamer1/gst1-cencdecrypt/Config.in"
910
source "package/gstreamer1/gst1-plugins-base/Config.in"

‎package/gstreamer1/gst1-aamp/0001_aamp_gst_ocdm_adapter.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index ea4a424..cbcdc0a 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -96,7 +96,9 @@ add_library(gstaamp SHARED ${GSTAAMP_SOURCES})
6+
7+
if(CMAKE_DASH_DRM)
8+
target_include_directories (gstaamp PRIVATE drm/gst)
9+
- set(AAMP_COMMON_DEPENDENCIES "${AAMP_COMMON_DEPENDENCIES} -lIARMBus -lds -lsystemd")
10+
+ if(CMAKE_RDK_VIDEO_BUILD)
11+
+ set(AAMP_COMMON_DEPENDENCIES "${AAMP_COMMON_DEPENDENCIES} -lIARMBus -lds -lsystemd")
12+
+ endif()
13+
if(CMAKE_USE_OPENCDM)
14+
message("CMAKE_USE_OPENCDM set")
15+
if (DEFINED SECAPI_ENGINE_BROADCOM_SAGE)
16+
@@ -118,6 +120,9 @@ if(CMAKE_DASH_DRM)
17+
endif()
18+
find_path (STAGING_INCDIR opencdm)
19+
include_directories(${STAGING_INCDIR}/opencdm)
20+
+ elseif(CMAKE_USE_OPENCDM_ADAPTER)
21+
+ set(AAMP_COMMON_DEPENDENCIES "${AAMP_COMMON_DEPENDENCIES} -locdm")
22+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_OPENCDM")
23+
else()
24+
message("CMAKE_USE_OPENCDM not set")
25+
if (DEFINED SECAPI_ENGINE_BROADCOM_SAGE)

‎package/gstreamer1/gst1-aamp/Config.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
config BR2_PACKAGE_GST1_AAMP
2+
bool "gst-aamp"
3+
select BR2_PACKAGE_AAMP
4+
help
5+
GStreamer plug-in to use AAMP DRM functionalities.
6+

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

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

7+
78
GST1_AAMP_VERSION = 8a0d9ef607ea254aff4b897137fd1f743db74c29
89
GST1_AAMP_SITE = http://code.rdkcentral.com/r/rdk/components/generic/gst-plugins-rdk-aamp
910
GST1_AAMP_SITE_METHOD = git

0 commit comments

Comments
 (0)