Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Software
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Environments
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
LARN
RNA
Software
Commits
bfd77c0c
Commit
bfd77c0c
authored
Dec 05, 2018
by
Marlene Böhmer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update gstreamer and video states.
parent
8b70bc6a
Changes
5
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
106 additions
and
59 deletions
+106
-59
pillar/gstreamer.sls
pillar/gstreamer.sls
+4
-0
salt/gstreamer/gst_uninstalled.sls
salt/gstreamer/gst_uninstalled.sls
+66
-0
salt/gstreamer/init.sls
salt/gstreamer/init.sls
+16
-59
salt/video/apps.sls
salt/video/apps.sls
+4
-0
salt/video/init.sls
salt/video/init.sls
+16
-0
No files found.
pillar/gstreamer.sls
View file @
bfd77c0c
gstreamer:
{%- if grains['osrelease'] == '16.04' %}
version: "1.10"
{%- elif grains['osrelease'] == '18.04' %}
version: "1.14"
{%- endif %}
salt/gstreamer/gst_uninstalled.sls
0 → 100644
View file @
bfd77c0c
{% set version = salt['pillar.get']('gstreamer:version') %}
gstreamer_uninstalled_packages:
pkg.installed:
- pkgs:
- git
- autopoint
- bison
- flex
- pkg-config
- libx264-dev
- v4l-utils
- libglib2.0-dev
- liborc-0.4-dev
gst_uninstalled_script:
file.managed:
- name: /opt/rna/create-uninstalled-setup.sh
- source: salt://gstreamer/files/create-uninstalled-setup.sh
- user: rna
- group: rna
- template: jinja
- context:
gst_version: '{{ version }}'
gst_uninstalled_create:
cmd.run:
- name: /bin/sh /opt/rna/create-uninstalled-setup.sh
- runas: rna
- unless: ls /home/rna/gst/{{version}}/gstreamer/scripts/gst-uninstalled
- require:
- pkg: gstreamer_packages
- file: gst_uninstalled_script
gst_uinstalled_symlink:
file.symlink:
- name: /home/rna/bin/gst-{{version}}
- target: /home/rna/gst/{{version}}/gstreamer/scripts/gst-uninstalled
- user: rna
- makedirs: True
gst_gstreamer_build_script:
file.managed:
- name: /home/rna/gst_build.sh
- source: salt://gstreamer/files/build.sh
- user: rna
- group: rna
- mode: 777
- template: jinja
- context:
gst_version: '{{ version }}'
gst_gstreamer_build:
cmd.run:
- name: ./bin/gst-{{version}} "./gst_build.sh"
- cwd: /home/rna/
- runas: rna
gst_plugins:
file.directory:
- name: /home/rna/gst/{{version}}/plugins
- user: rna
- group: rna
- require:
- user: user_rna
- group: group_rna
salt/gstreamer/init.sls
View file @
bfd77c0c
...
...
@@ -6,66 +6,23 @@ include:
gstreamer_packages:
pkg.installed:
- pkgs:
- git
- autopoint
- bison
- flex
- pkg-config
- libx264-dev
- v4l-utils
- libglib2.0-dev
- liborc-0.4-dev
- libgstreamer1.0-dev
- libgstreamer-plugins-base1.0-dev
gst_uninstalled_script:
file.managed:
- name: /opt/rna/create-uninstalled-setup.sh
- source: salt://gstreamer/files/create-uninstalled-setup.sh
- user: rna
- group: rna
- template: jinja
- context:
gst_version: '{{ version }}'
gst_uninstalled_create:
cmd.run:
- name: /bin/sh /opt/rna/create-uninstalled-setup.sh
- runas: rna
- unless: ls /home/rna/gst/{{version}}/gstreamer/scripts/gst-uninstalled
- require:
- pkg: gstreamer_packages
- file: gst_uninstalled_script
gst_uinstalled_symlink:
file.symlink:
- name: /home/rna/bin/gst-{{version}}
- target: /home/rna/gst/{{version}}/gstreamer/scripts/gst-uninstalled
- user: rna
- makedirs: True
gst_gstreamer_build_script:
file.managed:
- name: /home/rna/gst_build.sh
- source: salt://gstreamer/files/build.sh
- user: rna
- group: rna
- mode: 777
- template: jinja
- context:
gst_version: '{{ version }}'
gst_gstreamer_build:
cmd.run:
- name: ./bin/gst-{{version}} "./gst_build.sh"
- cwd: /home/rna/
- runas: rna
{% if pillar["video"]["role"] == "receiver" %}
include:
- gstreamer.gst_uninstalled
{% endif %}
gst_plugins:
file.directory:
- name: /home/rna/gst/{{version}}/plugins
- user: rna
- group: rna
- require:
- user: user_rna
- group: group_rna
{% if pillar["video"]["role"] == "sender" %}
system_gstreamer_packages:
pkg.installed:
- pkgs:
- libgstreamer1.0-0
- gstreamer1.0-plugins-base
- gstreamer1.0-plugins-good
- gstreamer1.0-plugins-bad
- gstreamer1.0-plugins-ugly
- gstreamer1.0-libav
- gstreamer1.0-tools
{% endif %}
salt/video/apps.sls
View file @
bfd77c0c
...
...
@@ -3,6 +3,10 @@
video_app:
cmd.run:
{% if pillar["video"]["role"] == "receiver" %}
- name: ./bin/gst-{{version}} /opt/rna/video/build.sh {{ role }}
{% elif pillar["video"]["role"] == "sender" %}
- name: /opt/rna/video/build.sh {{ role }}
{% endif %}
- runas: rna
- cwd: /home/rna
salt/video/init.sls
View file @
bfd77c0c
...
...
@@ -41,7 +41,11 @@ gst_plugin_build:
- group: rna
- mode: 770
cmd.run:
{% if pillar["video"]["role"] == "receiver" %}
- name: ./bin/gst-{{version}} ./build_prrt_plugin.sh
{% elif pillar["video"]["role"] == "sender" %}
- name: ./build_prrt_plugin.sh
{% endif %}
- cwd: /home/rna
- runas: rna
- watch:
...
...
@@ -49,6 +53,8 @@ gst_plugin_build:
- require:
- cmd: prrt_build
{% if pillar["video"]["role"] == "receiver" %}
gst_plugin_symlink:
file.symlink:
- name: /home/rna/gst/{{version}}/plugins/prrt
...
...
@@ -56,6 +62,16 @@ gst_plugin_symlink:
- user: rna
- makedirs: True
{% elif pillar["video"]["role"] == "sender" %}
gst_plugin_path:
file.append:
- name: /home/rna/.bashrc
- text: export GST_PLUGIN_PATH=/opt/rna/video/gst_plugin/plugin/
{% endif %}
video_build_app_script:
file.managed:
- name: /opt/rna/video/build.sh
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment