6 files changed, 52 insertions, 3 deletions

diff --git a/shared/models/videos/editor/index.ts b/shared/models/videos/editor/index.ts
new file mode 100644
index 000000000..3436f2c3f
--- /dev/null
+++ b/shared/models/videos/editor/index.ts
@@ -0,0 +1 @@
+export * from './video-editor-create-edit.model'
diff --git a/shared/models/videos/editor/video-editor-create-edit.model.ts b/shared/models/videos/editor/video-editor-create-edit.model.ts
new file mode 100644
index 000000000..36b7c8d55
--- /dev/null
+++ b/shared/models/videos/editor/video-editor-create-edit.model.ts
@@ -0,0 +1,42 @@
+export interface VideoEditorCreateEdition {
+  tasks: VideoEditorTask[]
+}
+
+export type VideoEditorTask =
+  VideoEditorTaskCut |
+  VideoEditorTaskIntro |
+  VideoEditorTaskOutro |
+  VideoEditorTaskWatermark
+
+export interface VideoEditorTaskCut {
+  name: 'cut'
+
+  options: {
+    start?: number
+    end?: number
+  }
+}
+
+export interface VideoEditorTaskIntro {
+  name: 'add-intro'
+
+  options: {
+    file: Blob | string
+  }
+}
+
+export interface VideoEditorTaskOutro {
+  name: 'add-outro'
+
+  options: {
+    file: Blob | string
+  }
+}
+
+export interface VideoEditorTaskWatermark {
+  name: 'add-watermark'
+
+  options: {
+    file: Blob | string
+  }
+}
diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts
index 67614efc9..e8eb227ab 100644
--- a/shared/models/videos/index.ts
+++ b/shared/models/videos/index.ts
@@ -3,6 +3,7 @@ export * from './caption'
 export * from './change-ownership'
 export * from './channel'
 export * from './comment'
+export * from './editor'
 export * from './live'
 export * from './file'
 export * from './import'
diff --git a/shared/models/videos/transcoding/video-transcoding-fps.model.ts b/shared/models/videos/transcoding/video-transcoding-fps.model.ts
index 25fc1c2da..9a330ac94 100644
--- a/shared/models/videos/transcoding/video-transcoding-fps.model.ts
+++ b/shared/models/videos/transcoding/video-transcoding-fps.model.ts
@@ -2,6 +2,7 @@ export type VideoTranscodingFPS = {
   MIN: number
   STANDARD: number[]
   HD_STANDARD: number[]
+  AUDIO_MERGE: number
   AVERAGE: number
   MAX: number
   KEEP_ORIGIN_FPS_RESOLUTION_MIN: number
diff --git a/shared/models/videos/transcoding/video-transcoding.model.ts b/shared/models/videos/transcoding/video-transcoding.model.ts
index 3a7fb6472..91eacf8dc 100644
--- a/shared/models/videos/transcoding/video-transcoding.model.ts
+++ b/shared/models/videos/transcoding/video-transcoding.model.ts
@@ -7,8 +7,11 @@ export type EncoderOptionsBuilderParams = {
 
   resolution: VideoResolution
 
-  // Could be null for "merge audio" transcoding
-  fps?: number
+  // If PeerTube applies a filter, transcoding profile must not copy input stream
+  canCopyAudio: boolean
+  canCopyVideo: boolean
+
+  fps: number
 
   // Could be undefined if we could not get input bitrate (some RTMP streams for example)
   inputBitrate: number
diff --git a/shared/models/videos/video-state.enum.ts b/shared/models/videos/video-state.enum.ts
index 09268d2ff..e45e4adc2 100644
--- a/shared/models/videos/video-state.enum.ts
+++ b/shared/models/videos/video-state.enum.ts
@@ -6,5 +6,6 @@ export const enum VideoState {
   LIVE_ENDED = 5,
   TO_MOVE_TO_EXTERNAL_STORAGE = 6,
   TRANSCODING_FAILED = 7,
-  TO_MOVE_TO_EXTERNAL_STORAGE_FAILED = 8
+  TO_MOVE_TO_EXTERNAL_STORAGE_FAILED = 8,
+  TO_EDIT = 9
 }