aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-02-11 10:51:33 +0100
committerChocobozzz <chocobozzz@cpy.re>2022-02-28 10:42:19 +0100
commitc729caf6cc34630877a0e5a1bda1719384cd0c8a (patch)
tree1d2e13722e518c73d2c9e6f0969615e29d51cf8c /server/models
parenta24bf4dc659cebb65d887862bf21d7a35e9ec791 (diff)
downloadPeerTube-c729caf6cc34630877a0e5a1bda1719384cd0c8a.tar.gz
PeerTube-c729caf6cc34630877a0e5a1bda1719384cd0c8a.tar.zst
PeerTube-c729caf6cc34630877a0e5a1bda1719384cd0c8a.zip
Add basic video editor support
Diffstat (limited to 'server/models')
-rw-r--r--server/models/video/video.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 5536334eb..a4093ce3b 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -61,7 +61,7 @@ import {
61 isVideoStateValid, 61 isVideoStateValid,
62 isVideoSupportValid 62 isVideoSupportValid
63} from '../../helpers/custom-validators/videos' 63} from '../../helpers/custom-validators/videos'
64import { getVideoFileResolution } from '../../helpers/ffprobe-utils' 64import { getVideoStreamDimensionsInfo } from '../../helpers/ffmpeg'
65import { logger } from '../../helpers/logger' 65import { logger } from '../../helpers/logger'
66import { CONFIG } from '../../initializers/config' 66import { CONFIG } from '../../initializers/config'
67import { ACTIVITY_PUB, API_VERSION, CONSTRAINTS_FIELDS, LAZY_STATIC_PATHS, STATIC_PATHS, WEBSERVER } from '../../initializers/constants' 67import { ACTIVITY_PUB, API_VERSION, CONSTRAINTS_FIELDS, LAZY_STATIC_PATHS, STATIC_PATHS, WEBSERVER } from '../../initializers/constants'
@@ -1683,7 +1683,7 @@ export class VideoModel extends Model<Partial<AttributesOnly<VideoModel>>> {
1683 return peertubeTruncate(this.description, { length: maxLength }) 1683 return peertubeTruncate(this.description, { length: maxLength })
1684 } 1684 }
1685 1685
1686 getMaxQualityFileInfo () { 1686 probeMaxQualityFile () {
1687 const file = this.getMaxQualityFile() 1687 const file = this.getMaxQualityFile()
1688 const videoOrPlaylist = file.getVideoOrStreamingPlaylist() 1688 const videoOrPlaylist = file.getVideoOrStreamingPlaylist()
1689 1689
@@ -1695,7 +1695,7 @@ export class VideoModel extends Model<Partial<AttributesOnly<VideoModel>>> {
1695 return { 1695 return {
1696 audioStream, 1696 audioStream,
1697 1697
1698 ...await getVideoFileResolution(originalFilePath, probe) 1698 ...await getVideoStreamDimensionsInfo(originalFilePath, probe)
1699 } 1699 }
1700 }) 1700 })
1701 } 1701 }