Skip to content

Commit 02f80dd

Browse files
Merge pull request #336 from WebPlatformForEmbedded/development/streamer-recipe
Streamer: package files integrated
2 parents 8972deb + 69c01a4 commit 02f80dd

17 files changed

+1018
-0
lines changed

package/Config.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ 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"
1315
source "package/alsa-utils/Config.in"
1416
source "package/atest/Config.in"
1517
source "package/amazon-backend/Config.in"
@@ -1594,6 +1596,7 @@ menu "Multimedia"
15941596
source "package/libass/Config.in"
15951597
source "package/libbdplus/Config.in"
15961598
source "package/libbluray/Config.in"
1599+
source "package/libdash/Config.in"
15971600
source "package/libcamera/Config.in"
15981601
source "package/libdcadec/Config.in"
15991602
source "package/libdvbcsa/Config.in"
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
}
8+
9+
- if (0 == aamp_GetSourceID())
10+
+/* if (0 == aamp_GetSourceID())
11+
{
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: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
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_GST1_PLUGINS_BASE
10+
help
11+
RDK AAMP

package/aamp/aamp.mk

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
################################################################################
2+
#
3+
# aamp
4+
#
5+
################################################################################
6+
7+
AAMP_VERSION = 24a4dfa609c7c6b3c18ee595bde0874c9a5ca7c9
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 cjson aampabr gst1-plugins-base wpeframework
13+
14+
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI), y)
15+
AAMP_CONF_OPTS += \
16+
-DCMAKE_DASH_DRM=ON \
17+
-DCMAKE_USE_OPENCDM_ADAPTER=ON \
18+
-DCMAKE_USE_THUNDER_OCDM_API_0_2=ON
19+
endif
20+
21+
$(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: 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 = baf59ee4fa697809ed9a11552c02e36a02e28fd7
8+
AAMPABR_SITE_METHOD = git
9+
AAMPABR_SITE = https://code.rdkcentral.com/r/rdk/components/generic/aampabr
10+
AAMPABR_INSTALL_STAGING = YES
11+
12+
$(eval $(cmake-package))

package/gstreamer1/Config.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
source "package/gstreamer1/gstreamer1/Config.in"
33

44
if BR2_PACKAGE_GSTREAMER1
5+
source "package/gstreamer1/gst1-aamp/Config.in"
56
source "package/gstreamer1/gstreamer1-mm/Config.in"
67
source "package/gstreamer1/gst1-plugins-base/Config.in"
78
source "package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in"
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)
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+
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
################################################################################
2+
#
3+
# gst-aamp
4+
#
5+
################################################################################
6+
7+
GST1_AAMP_VERSION = c9d03d4df04e0a09a0b8cd45c122c6add12b0501
8+
GST1_AAMP_SITE = http://code.rdkcentral.com/r/rdk/components/generic/gst-plugins-rdk-aamp
9+
GST1_AAMP_SITE_METHOD = git
10+
11+
GST1_AAMP_DEPENDENCIES = aamp
12+
13+
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI), y)
14+
GST1_AAMP_CONF_OPTS += \
15+
-DCMAKE_DASH_DRM=ON \
16+
-DCMAKE_USE_OPENCDM_ADAPTER=ON
17+
endif
18+
19+
$(eval $(cmake-package))

0 commit comments

Comments
 (0)