Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Commits on Source (2)
[Sprint/JollyJellyfish](chore): Added transcoding / aws
· c9977496
Ben
authored
Sep 09, 2019
and
Brian Hatchet
committed
Sep 09, 2019
c9977496
Merge branch 'sandbox-wip-aws-creds' into 'sandbox-wip'
· fadf3c05
Brian Hatchet
authored
Sep 09, 2019
[Sprint/JollyJellyfish](chore): Added transcoding / aws See merge request
!8
fadf3c05
Hide whitespace changes
Inline
Side-by-side
minds/templates/configMap.yaml
View file @
fadf3c05
...
...
@@ -610,6 +610,45 @@ data:
'wire-multi-currency' => {{ .Values.features.wire_multi_currency }},
]);
$CONFIG->set('transcode', [
'free_threshold' => '{{ .Values.transcode.free_threshold }}',
'hd_price' => '{{ .Values.transcode.hd_price }}',
'fhd_price' => '{{ .Values.transcode.fhd_price }}',
]);
$CONFIG->set('transcoder', [
'threads' => '{{ .Values.transcoder.threads }}',
'dir' => '{{ .Values.transcoder.dir }}',
'presets' => [
[
'width' => '{{ .Values.transcoder.width }}',
'height' => '{{ .Values.transcoder.height }}',
'bitrate' => '{{ .Values.transcoder.bitrate }}',
'audio_bitrate' => '{{ .Values.transcoder.audio_bitrate }}',
'formats' => '{{ .Values.transcoder.formats | toJson }}',
'charge' => '{{ .Values.transcoder.charge }}',
],
[
'width' => '{{ .Values.transcoder.width2 }}',
'height' => '{{ .Values.transcoder.height2 }}',
'bitrate' => '{{ .Values.transcoder.bitrate2 }}'
'audio_bitrate' => '{{ .Values.transcoder.audio_bitrate2 }}',
'formats' => '{{ .Values.transcoder.formats2 | toJson }}',
'charge' => '{{ .Values.transcoder.charge2 }}',
],
[
'width' => '{{ .Values.transcoder.width3 }}',
'height' => '{{ .Values.transcoder.height3 }}',
'bitrate' => '{{ .Values.transcoder.bitrate3 }}',
'audio_bitrate' => '{{ .Values.transcoder.audio_bitrate3 }}',
'formats' => '{{ .Values.transcoder.formats3 | toJson }}',
'charge' => '{{ .Values.transcoder.charge3 }}',
],
]
]);
$CONFIG->cinemr_url = '{{ .Values.transcoder.cinemr_url }}';
$CONFIG->max_video_length = {{ .Values.max_video_length }};
$CONFIG->max_video_file_size = {{ .Values.max_video_file_size }};
$CONFIG->max_daily_boost_views = {{ .Values.max_daily_boost_views }};
...
...
@@ -806,3 +845,4 @@ data:
redirect_stderr=true
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
{{
.Files.Get "config.properties" | indent 4
}}
minds/values.yaml
View file @
fadf3c05
...
...
@@ -212,6 +212,40 @@ encryptionKeys:
private
:
public
:
transcode
:
free_threshold
:
'
2'
hd_price
:
'
1'
fhd_price
:
'
1.5'
transcoder
:
threads
:
4
dir
:
'
cinemr_dev'
width
:
640
height
:
360
bitrate
:
500
audio_bitrate
:
80
formats
:
-
'
mp4'
-
'
webm'
charge
:
false
width2
:
640
height2
:
360
bitrate2
:
500
audio_bitrate2
:
80
formats2
:
-
'
mp4'
-
'
webm'
charge2
:
false
width3
:
640
height3
:
360
bitrate3
:
500
audio_bitrate3
:
80
formats3
:
-
'
mp4'
-
'
webm'
charge3
:
false
cinemr_url
:
'
https://cinemr.s3.amazonaws.com/cinemr_dev/'
blockchain
:
testNet
:
'
true'
clientNetwork
:
'
4'
...
...