summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyong <jiyong.min@samsung.com>2024-03-05 08:22:53 +0900
committerJiyong Min <jiyong.min@samsung.com>2024-03-06 01:18:17 +0000
commit193e897b703567cf80a8273524dae951ab664428 (patch)
treec857b218a2d567b290ae41d1dbd7ddbde7c32d39
parente1d32c12c986a9545640233f9afd968365b78788 (diff)
downloadbuilding-blocks-accepted/tizen/unified/20240306.094141.tar.gz
building-blocks-accepted/tizen/unified/20240306.094141.tar.bz2
building-blocks-accepted/tizen/unified/20240306.094141.zip
Change-Id: I68d801dd8bb2e8707a21dd08e987e642f8d24cfb
-rw-r--r--build_test_img/test_set/TC0021_artik530_bb_list.txt3
-rw-r--r--mapping-bb-rs.xml4
-rw-r--r--mapping-bb-tct.xml7
-rw-r--r--packaging/domain-apis-multimedia.inc29
-rw-r--r--packaging/platform-preset-boards-common.inc3
-rw-r--r--packaging/platform-preset-boards-emul.inc3
-rw-r--r--packaging/platform-preset-iot.inc1
7 files changed, 1 insertions, 49 deletions
diff --git a/build_test_img/test_set/TC0021_artik530_bb_list.txt b/build_test_img/test_set/TC0021_artik530_bb_list.txt
index 69ce3d4..bd95da1 100644
--- a/build_test_img/test_set/TC0021_artik530_bb_list.txt
+++ b/build_test_img/test_set/TC0021_artik530_bb_list.txt
@@ -15,8 +15,7 @@ building-blocks-sub2-domain_API-AppFramework-Native_EFL_UI_app_model
building-blocks-sub1-domain_Feature-BootAni
building-blocks-sub1-domain_Feature-Starter
-# Streamer & screen-mirroring
-building-blocks-sub2-domain_API-Multimedia-Media_Streamer
+# screen-mirroring
building-blocks-sub2-domain_API-Multimedia-Screen_Mirroring
building-blocks-sub2-Preset_boards-ARTIK530-Audio_Recording
diff --git a/mapping-bb-rs.xml b/mapping-bb-rs.xml
index b2de14e..708eabd 100644
--- a/mapping-bb-rs.xml
+++ b/mapping-bb-rs.xml
@@ -201,10 +201,6 @@
<rs_info>capi-media-tool-rs.xml</rs_info>
<rs_info>libtbm-rs.xml</rs_info>
</buildingblock>
- <buildingblock name="building-blocks-sub2-domain_API-Multimedia-Media_Streamer" abb_id="48">
- <rs_info>capi-media-streamer-rs.xml</rs_info>
- <rs_info>capi-media-tool-rs.xml</rs_info>
- </buildingblock>
<buildingblock name="building-blocks-sub2-domain_API-Multimedia-Media_Tool" abb_id="49">
<rs_info>capi-media-tool-rs.xml</rs_info>
</buildingblock>
diff --git a/mapping-bb-tct.xml b/mapping-bb-tct.xml
index ce56068..f0fa64b 100644
--- a/mapping-bb-tct.xml
+++ b/mapping-bb-tct.xml
@@ -286,10 +286,6 @@
<tct_info>tct-capi-mediamuxer-native-itc</tct_info>
<tct_info>tct-mediamuxer-native-utc</tct_info>
</bb_info>
- <bb_info name="building-blocks-sub2-domain_API-Multimedia-Media_Streamer">
- <tct_info>tct-capi-media-streamer-native-itc</tct_info>
- <tct_info>tct-capi-media-streamer-native-utc</tct_info>
- </bb_info>
<bb_info name="building-blocks-sub2-domain_API-Multimedia-Screen_Mirroring">
<tct_info>tct-screen-mirroring-native-itc</tct_info>
<tct_info>tct-screen-mirroring-native-utc</tct_info>
@@ -745,15 +741,12 @@
<bb_info>building-blocks-sub2-domain_API-Multimedia-Media_Muxer</bb_info>
</imageid>
<imageid name="TC0021">
- <tct_info>tct-capi-media-streamer-native-itc</tct_info>
- <tct_info>tct-capi-media-streamer-native-utc</tct_info>
<tct_info>tct-screen-mirroring-native-itc</tct_info>
<tct_info>tct-screen-mirroring-native-utc</tct_info>
<tct_info>tct-webrtc-native-itc</tct_info>
<tct_info>tct-webrtc-native-utc</tct_info>
<tct_info>tct-mediaeditor-native-itc</tct_info>
<tct_info>tct-mediaeditor-native-utc</tct_info>
- <bb_info>building-blocks-sub2-domain_API-Multimedia-Media_Streamer</bb_info>
<bb_info>building-blocks-sub2-domain_API-Multimedia-Screen_Mirroring</bb_info>
<bb_info>building-blocks-sub2-domain_API-Multimedia-Webrtc</bb_info>
<bb_info>building-blocks-sub2-domain_API-Multimedia-Media_Editor</bb_info>
diff --git a/packaging/domain-apis-multimedia.inc b/packaging/domain-apis-multimedia.inc
index 4a89a07..cd04b0e 100644
--- a/packaging/domain-apis-multimedia.inc
+++ b/packaging/domain-apis-multimedia.inc
@@ -14,7 +14,6 @@ Suggests: %{name}-sub2-domain_API-Multimedia-Media_Codec
Suggests: %{name}-sub2-domain_API-Multimedia-Media_Controller
Suggests: %{name}-sub2-domain_API-Multimedia-Media_Demuxer
Suggests: %{name}-sub2-domain_API-Multimedia-Media_Muxer
-Suggests: %{name}-sub2-domain_API-Multimedia-Media_Streamer
Suggests: %{name}-sub2-domain_API-Multimedia-Media_Tool
Suggests: %{name}-sub2-domain_API-Multimedia-Media_Vision_Barcode
Suggests: %{name}-sub2-domain_API-Multimedia-Media_Vision_Face
@@ -131,34 +130,6 @@ Enabling Media Muxer and it is possible to use Media Muxer API <br>
Media Muxer API provides functions for muxing media data <br>
%files sub2-domain_API-Multimedia-Media_Muxer
-%package sub2-domain_API-Multimedia-Media_Streamer
-Summary: Media_Streamer
-Requires: capi-media-streamer
-Requires: gst-plugins-good
-Requires: gst-plugins-bad
-Requires: gst-plugins-ugly
-Requires: gst-plugins-tizen
-Requires: gst-libav
-Requires: libmm-utility
-Requires: %{name}-sub2-domain_API-Multimedia-AudioCore
-Requires: %{name}-sub2-domain_API-Multimedia-Configuration
-
-# required building block for video rendering
-Requires: %{name}-sub2-domain_API-System-Storage
-Requires: %{name}-sub2-domain_API-UI-TBM_Surface
-Requires: %{name}-sub2-domain_API-UI-EFL_NativeUIToolkit
-Requires: %{name}-sub2-domain_API-Network-WiFi_Manager
-
-%description sub2-domain_API-Multimedia-Media_Streamer
-This block supports constructing the custom player and it gives the ability to controlling playback attributes.<br>
-About OPTIONAL selection:<br>
-You should choose packages depends on target and hardware.<br>
-First, Select the config file 'media-config-target-{DEVICE_WHAT_YOU_WANT}'(e.g media-config-target-rpi3).<br>
-Second, Select the audio HAL depends on target. <br>
-Third, Select the camera plugin depends on target. <br>
-
-%files sub2-domain_API-Multimedia-Media_Streamer
-
%package sub2-domain_API-Multimedia-Media_Tool
Summary: Media_Tool
diff --git a/packaging/platform-preset-boards-common.inc b/packaging/platform-preset-boards-common.inc
index bc449da..6e8913f 100644
--- a/packaging/platform-preset-boards-common.inc
+++ b/packaging/platform-preset-boards-common.inc
@@ -67,7 +67,6 @@ Suggests: %{name}-sub2-domain_API-Multimedia-Player
Suggests: %{name}-sub2-domain_API-Multimedia-WAV_Player
Suggests: %{name}-sub2-domain_API-Multimedia-Tone_Player
Suggests: %{name}-sub2-domain_API-Multimedia-OpenAL
-Suggests: %{name}-sub2-domain_API-Multimedia-Media_Streamer
Suggests: %{name}-sub2-domain_API-Multimedia-Sound_Pool
Suggests: %{name}-sub2-domain_API-Multimedia-Webrtc
@@ -83,7 +82,6 @@ Requires: gst-plugins-tizen-camera
Requires: %{name}-sub2-Preset_boards-COMMON-Audio
Suggests: %{name}-sub2-domain_API-Multimedia-Recorder
Suggests: %{name}-sub2-domain_API-Multimedia-Audio_IO
-Suggests: %{name}-sub2-domain_API-Multimedia-Media_Streamer
Suggests: %{name}-sub2-domain_API-Multimedia-Webrtc
%description sub2-Preset_boards-COMMON-Audio_Recording
@@ -111,7 +109,6 @@ Requires: gst-omx
%endif
Suggests: %{name}-sub2-domain_API-Multimedia-Player
-Suggests: %{name}-sub2-domain_API-Multimedia-Media_Streamer
Suggests: %{name}-sub2-domain_API-Multimedia-Media_Codec
Suggests: %{name}-sub2-domain_API-Multimedia-Camera
Suggests: %{name}-sub2-domain_API-Multimedia-Recorder
diff --git a/packaging/platform-preset-boards-emul.inc b/packaging/platform-preset-boards-emul.inc
index 102f3e0..040504e 100644
--- a/packaging/platform-preset-boards-emul.inc
+++ b/packaging/platform-preset-boards-emul.inc
@@ -186,7 +186,6 @@ Suggests: %{name}-sub2-domain_API-Multimedia-Player
Suggests: %{name}-sub2-domain_API-Multimedia-WAV_Player
Suggests: %{name}-sub2-domain_API-Multimedia-Tone_Player
Suggests: %{name}-sub2-domain_API-Multimedia-OpenAL
-Suggests: %{name}-sub2-domain_API-Multimedia-Media_Streamer
Suggests: %{name}-sub2-domain_API-Multimedia-Sound_Pool
Suggests: %{name}-sub2-domain_API-Multimedia-Webrtc
@@ -202,7 +201,6 @@ Requires: %{name}-sub2-Preset_boards-EMUL-Audio
Suggests: %{name}-sub2-domain_API-Multimedia-Recorder
Suggests: %{name}-sub2-domain_API-Multimedia-Audio_IO
-Suggests: %{name}-sub2-domain_API-Multimedia-Media_Streamer
Suggests: %{name}-sub2-domain_API-Multimedia-Webrtc
%description sub2-Preset_boards-EMUL-Audio_Recording
@@ -232,7 +230,6 @@ Requires: gst-plugins-emulator
Requires: media-config-simulator
Suggests: %{name}-sub2-domain_API-Multimedia-Player
-Suggests: %{name}-sub2-domain_API-Multimedia-Media_Streamer
Suggests: %{name}-sub2-domain_API-Multimedia-Media_Codec
Suggests: %{name}-sub2-domain_API-Multimedia-Camera
Suggests: %{name}-sub2-domain_API-Multimedia-Recorder
diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index 0149575..e022b37 100644
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -129,7 +129,6 @@ Requires: %{name}-sub2-domain_API-Multimedia-Media_Codec
Requires: %{name}-sub2-domain_API-Multimedia-Media_Controller
Requires: %{name}-sub2-domain_API-Multimedia-Media_Demuxer
Requires: %{name}-sub2-domain_API-Multimedia-Media_Muxer
-Requires: %{name}-sub2-domain_API-Multimedia-Media_Streamer
Requires: %{name}-sub2-domain_API-Multimedia-Media_Tool
Requires: %{name}-sub2-domain_API-Multimedia-Media_Vision_Barcode
Requires: %{name}-sub2-domain_API-Multimedia-Media_Vision_Face