diff options
Diffstat (limited to 'client/src/app/+videos/+video-edit/video-add-components')
4 files changed, 6 insertions, 8 deletions
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html index 17c37d42b..fddb08e0b 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html +++ b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html | |||
@@ -36,7 +36,7 @@ | |||
36 | <form [hidden]="!isInUpdateForm" novalidate [formGroup]="form"> | 36 | <form [hidden]="!isInUpdateForm" novalidate [formGroup]="form"> |
37 | <my-video-edit | 37 | <my-video-edit |
38 | [form]="form" [formErrors]="formErrors" [videoCaptions]="videoCaptions" | 38 | [form]="form" [formErrors]="formErrors" [videoCaptions]="videoCaptions" |
39 | [schedulePublicationPossible]="false" [waitTranscodingEnabled]="false" | 39 | [schedulePublicationPossible]="false" [waitTranscodingEnabled]="isWaitTranscodingEnabled()" |
40 | [validationMessages]="validationMessages" [userVideoChannels]="userVideoChannels" [liveVideo]="liveVideo" | 40 | [validationMessages]="validationMessages" [userVideoChannels]="userVideoChannels" [liveVideo]="liveVideo" |
41 | type="go-live" | 41 | type="go-live" |
42 | ></my-video-edit> | 42 | ></my-video-edit> |
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts index 67d055f06..8780ca567 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts +++ b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts | |||
@@ -137,6 +137,10 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, CanCompon | |||
137 | return this.serverConfig.live.maxDuration / 1000 | 137 | return this.serverConfig.live.maxDuration / 1000 |
138 | } | 138 | } |
139 | 139 | ||
140 | isWaitTranscodingEnabled () { | ||
141 | return this.form.value['saveReplay'] === true | ||
142 | } | ||
143 | |||
140 | private fetchVideoLive () { | 144 | private fetchVideoLive () { |
141 | this.liveVideoService.getVideoLive(this.videoId) | 145 | this.liveVideoService.getVideoLive(this.videoId) |
142 | .subscribe( | 146 | .subscribe( |
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html index deea3daf9..4c0b09894 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html +++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html | |||
@@ -84,7 +84,7 @@ | |||
84 | <my-video-edit | 84 | <my-video-edit |
85 | [form]="form" [formErrors]="formErrors" [videoCaptions]="videoCaptions" | 85 | [form]="form" [formErrors]="formErrors" [videoCaptions]="videoCaptions" |
86 | [validationMessages]="validationMessages" [userVideoChannels]="userVideoChannels" | 86 | [validationMessages]="validationMessages" [userVideoChannels]="userVideoChannels" |
87 | [waitTranscodingEnabled]="waitTranscodingEnabled" | 87 | [waitTranscodingEnabled]="true" |
88 | type="upload" | 88 | type="upload" |
89 | ></my-video-edit> | 89 | ></my-video-edit> |
90 | 90 | ||
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts index cafb030b9..ca21b61cd 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts +++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts | |||
@@ -44,7 +44,6 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy | |||
44 | } | 44 | } |
45 | formData: FormData | 45 | formData: FormData |
46 | 46 | ||
47 | waitTranscodingEnabled = true | ||
48 | previewfileUpload: File | 47 | previewfileUpload: File |
49 | 48 | ||
50 | error: string | 49 | error: string |
@@ -163,11 +162,6 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy | |||
163 | if (nameWithoutExtension.length < 3) name = videofile.name | 162 | if (nameWithoutExtension.length < 3) name = videofile.name |
164 | else name = nameWithoutExtension | 163 | else name = nameWithoutExtension |
165 | 164 | ||
166 | // Force user to wait transcoding for unsupported video types in web browsers | ||
167 | if (!videofile.name.endsWith('.mp4') && !videofile.name.endsWith('.webm') && !videofile.name.endsWith('.ogv')) { | ||
168 | this.waitTranscodingEnabled = false | ||
169 | } | ||
170 | |||
171 | const nsfw = this.serverConfig.instance.isNSFW | 165 | const nsfw = this.serverConfig.instance.isNSFW |
172 | const waitTranscoding = true | 166 | const waitTranscoding = true |
173 | const commentsEnabled = true | 167 | const commentsEnabled = true |