Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(server): transcode bitrate and thread settings #2488

Merged
merged 19 commits into from
May 22, 2023
Merged

feat(server): transcode bitrate and thread settings #2488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
999411c
support for two-pass transcoding
mertalev May 19, 2023
fbd212c
added max bitrate and thread to transcode api
mertalev May 19, 2023
8b81595
admin page setting desc+bitrate and thread options
mertalev May 20, 2023
a6273fa
Update web/src/lib/components/admin-page/settings/setting-input-field…
mertalev May 20, 2023
0d59bec
Update web/src/lib/components/admin-page/settings/setting-input-field…
mertalev May 20, 2023
f8ca8e3
two-pass slider, `crf` and `threads` as numbers
mertalev May 21, 2023
3a1e29e
Merge branch 'immich-app:main' into feat/transcode-settings
mertalev May 21, 2023
8ba67a1
updated and added transcode tests
mertalev May 21, 2023
85c15f6
refactored `getFfmpegOptions`
mertalev May 21, 2023
1e96680
default `threads`, `maxBitrate` now 0, more tests
mertalev May 21, 2023
3a016dd
Merge branch 'immich-app:main' into feat/transcode-settings
mertalev May 21, 2023
dee4f3a
Merge branch 'immich-app:main' into feat/transcode-settings
mertalev May 21, 2023
cd7d4cc
vp9 constant quality mode
mertalev May 21, 2023
6cc28f3
fixed nullable `crf` and `threads`
mertalev May 21, 2023
ef2d23d
fixed two-pass slider, added apiproperty
mertalev May 21, 2023
600452d
optional `desc` for `SettingSelect`
mertalev May 22, 2023
817a7d2
disable two-pass if settings are incompatible
mertalev May 22, 2023
ed39695
fixed test
mertalev May 22, 2023
269cbca
transcode interface
mertalev May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion mobile/openapi/doc/SystemConfigFFmpegDto.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 27 additions & 3 deletions mobile/openapi/lib/model/system_config_f_fmpeg_dto.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion mobile/openapi/test/system_config_f_fmpeg_dto_test.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion server/immich-openapi-specs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5344,7 +5344,10 @@
"type": "object",
"properties": {
"crf": {
"type": "string"
"type": "integer"
},
"threads": {
"type": "integer"
},
"preset": {
"type": "string"
Expand All @@ -5358,6 +5361,12 @@
"targetResolution": {
"type": "string"
},
"maxBitrate": {
"type": "string"
},
"twoPass": {
"type": "boolean"
},
"transcode": {
"type": "string",
"enum": [
Expand All @@ -5370,10 +5379,13 @@
},
"required": [
"crf",
"threads",
"preset",
"targetVideoCodec",
"targetAudioCodec",
"targetResolution",
"maxBitrate",
"twoPass",
"transcode"
]
},
Expand Down
7 changes: 6 additions & 1 deletion server/libs/domain/src/media/media.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ export interface CropOptions {
height: number;
}

export interface TranscodeOptions {
outputOptions: string[];
twoPass: boolean;
}

export interface IMediaRepository {
// image
extractThumbnailFromExif(input: string, output: string): Promise<void>;
Expand All @@ -47,5 +52,5 @@ export interface IMediaRepository {
// video
extractVideoThumbnail(input: string, output: string, size: number): Promise<void>;
probe(input: string): Promise<VideoInfo>;
transcode(input: string, output: string, options: any): Promise<void>;
transcode(input: string, output: string, options: TranscodeOptions): Promise<void>;
}