michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
24,647 Commits 2 Branches 79 Tags 73 MiB
0b31997b2f
Commit Graph

499 Commits

Author SHA1 Message Date
cvium
c658a883a2 Merge branch 'master' into keyframe_extraction_v1 
# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
 2022-01-07 10:23:22 +01:00
Cody Robibero
7bfc6b5679 Remove more warnings 2021-12-27 07:38:06 -07:00
nyanmisaka
7db753d247 reduce tonemap cpu usage, add deint and AR support in thumbnails 
Co-authored-by: Orry Verducci <orry@orryverducci.co.uk>
 2021-12-24 17:03:57 +08:00
nyanmisaka
b2d85a02c2 Apply suggestions from code review 
Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
Co-authored-by: Bond_009 <bond.009@outlook.com>
 2021-12-24 17:03:57 +08:00
nyanmisaka
4b9c84c52e EncodingHelper hwaccel pipelines refactor 
separate the HW pipeline according to HWA method for maintainability.
 2021-12-24 17:03:57 +08:00
Joe Rogers
f73a7a6ed8
Use ImageFormat instead of string for extension 2021-11-12 16:22:11 +01:00
Bond_009
1d19a5be61 Fix some warnings 
down to 580
 2021-11-09 22:29:33 +01:00
Bond-009
ca217270b7
Merge pull request #6544 from cvium/fix_ffmpeg_path_updating 2021-10-24 01:09:44 +02:00
Claus Vium
768ec60e11
Merge pull request #6689 from 1337joe/expand-image-extraction 2021-10-21 23:05:32 +02:00
Joe Rogers
31baea072a
Address review comments 
Clean up style
Fix references in class summaries
Combine Where+FirstOrDefault queries
Break up large method, long lines
Add validation on file extension
Apply test naming conventions
Extract mock of Movie class, comment on why not mocking interface

Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-10-20 14:10:16 +02:00
Joe Rogers
e3eee10d05
Add image provider tests and clean up 2021-10-11 14:09:02 +02:00
Joe Rogers
8d70cc2dde
Add support for non-jpg image extractions 2021-10-11 14:09:02 +02:00
Dmitry Lyzo
c26e6d89b4 Move FfmpegException to MediaBrowser.Common 2021-10-10 19:48:11 +03:00
Cody Robibero
9234e5bf80 Remove all instances of en-US culture 2021-09-26 09:11:25 -06:00
cvium
9c15f96e12 Add first draft of keyframe extraction for Matroska 2021-09-23 15:29:12 +02:00
Claus Vium
a353081ea3
Update MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs 2021-09-21 22:54:11 +02:00
cvium
95f344722c Don't set ffmpeg path from null to its Display value + add 404 2021-09-21 18:51:15 +00:00
Bond_009
52585a865e Validate ffmpeg path 2021-09-21 13:28:34 +02:00
Bond-009
855f9c4a8e
Merge pull request #6425 from boolemancer/boolemancer/fix_image_extractor 
Fix explicit stream selection in MediaEncoder.ExtractImageInternal
 2021-09-01 18:24:29 +02:00
Claus Vium
ae031fdd28
Merge branch 'master' into tonemap-overlay 2021-08-30 20:02:31 +02:00
Bond_009
963ab2dab6 Simplify the way we choose our ffmpeg 
* no longer search $PATH
* no longer require a full path
* don't fall back
 2021-08-30 15:40:52 +02:00
boolemancer
2345646ff1 Fix explicit stream selection in MediaEncoder.ExtractImageInternal 2021-08-14 02:55:51 -07:00
nyanmisaka
3beda02d92 add support for cuda tonemap and overlay 2021-07-25 00:52:16 +08:00
Bond_009
6f8ccab788 Move non-jellyfin extensions to separate project 2021-06-19 18:04:46 +02:00
Stan
adf406b182
Fix playback of complex BluRay ISOs (#6166) 2021-06-10 20:07:28 +02:00
Bond_009
26d7fc8280 Enable nullable reference types for MediaBrowser.MediaEncoding.Subtitles 2021-05-20 22:10:19 +02:00
Bond_009
499bac5185 EncodingHelper: Fix circular dependency 2021-04-20 23:03:36 +02:00
BaronGreenback
bc1cc2d04a Remove unused using directives 2021-04-17 11:37:55 +01:00
MrTimscampi
ef9eba8bc9 Ignore format for ISO files 2021-03-25 12:23:29 +01:00
Bond_009
a8ed753f6c FxCop -> Net Analyzers (part 2) 2021-03-13 22:33:28 +01:00
Bond_009
9ed7f429c0 FxCop -> Net Analyzers (part 1) 2021-03-09 03:04:47 +01:00
Claus Vium
e5f99762e2
Merge pull request #5073 from BaronGreenback/ffmpeg 
Fix for 4933: Alternative ffmpeg fix
 2021-02-27 19:55:52 +01:00
Bond_009
b1fe28d0a6 Use GetEncodingOptions where possible 2021-02-21 02:58:30 +01:00
nyanmisaka
b0e0e19468 add cuda format converter 2021-02-06 13:21:40 +08:00
BaronGreenback
df402df908 fix return 2021-01-21 12:48:43 +00:00
Nyanmisaka
060f6c194f
Apply suggestions from code review 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2020-12-09 16:37:15 +08:00
nyanmisaka
ebd9ab3ccc use larger batch size on mpegts to avoid corrupted thumbnails 2020-12-09 14:39:41 +08:00
crobibero
ca5c20c988 Remove IIsoMounter and IsoMounter 2020-12-03 07:34:15 -07:00
Claus Vium
3b4f86579b
Merge pull request #4610 from nyanmisaka/hdr-extract 
Extract tone mapped thumbnails for HDR videos
 2020-12-02 09:50:54 +01:00
Joshua M. Boniface
a6199f821b
Merge pull request #4169 from stanionascu/bdiso-playback 
Playback (direct-stream/transcode) of BDISO/BDAV containers
 2020-12-01 22:36:04 -05:00
Nyanmisaka
7b5285feac
Apply suggestions from code review 
Co-authored-by: BaronGreenback <jimcartlidge@yahoo.co.uk>
 2020-12-02 08:22:07 +08:00
nyanmisaka
3e9cf98c30 add hdr tone mapping to image extraction 2020-11-29 13:22:42 +08:00
nyanmisaka
c2c06ae15b fix image extraction 2020-11-29 13:20:55 +08:00
nyanmisaka
bb16174936 increase the default image extraction timeout 2020-11-29 13:12:41 +08:00
Nyanmisaka
0c6efe6317
Apply suggestions from code review 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2020-11-28 22:32:54 +08:00
Nyanmisaka
d72f3498bf
fix ci 2020-11-28 21:27:55 +08:00
Nyanmisaka
53c91c2c14
Apply suggestions from code review 
Co-authored-by: BaronGreenback <jimcartlidge@yahoo.co.uk>
 2020-11-28 21:14:55 +08:00
nyanmisaka
d19edefbcd fix image extraction 2020-11-28 20:55:56 +08:00
Fernando Fernández
e21e00cad5 Merge remote-tracking branch 'upstream/master' into no-scaling 2020-11-19 23:18:25 +01:00
Greenback
9a323f6df0 More spelling corrections. 2020-11-18 13:46:14 +00:00
Fernando Fernández
38c3b6fcd3 Fix build and thread detection logic 2020-11-18 10:20:59 +01:00
Fernando Fernández
94cae4f145 Specify threads to ffmpeg properly 2020-11-17 16:44:04 +01:00
Fernando Fernández
a6ad36b57a Don't scale images extracted by ffmpeg 2020-11-17 14:20:18 +01:00
Stéphane Senart
28ee4f0a7f [AudioTranscoding] Add FLAC as supported target audio format and be able to define the corresponding target sample rate 2020-10-22 11:09:59 +02:00
Stanislav Ionascu
cd4641dca0 Remove PlayableStreamFileNames as unused 
Since ffmpeg can play and transcode ISO files and BDMV folders directly,
there's no use of that property.
 2020-10-01 22:20:34 +02:00
Stanislav Ionascu
3ad6232973 Add probe / direct-stream / transcoding support for BluRays 
This commit (and ffmpeg built with libbluray support), adds support
for playback of bluray images (bd-iso) and bluray folders.
 2020-10-01 21:59:57 +02:00
BaronGreenback
5464eaed4a
Update EncoderValidator.cs 2020-09-19 16:40:39 +01:00
crobibero
8b96881aa1 Clean up json Converters 2020-08-26 08:22:48 -06:00
Bond_009
119f64f5e7 Make some methods async 2020-08-21 22:01:19 +02:00
Anthony Lavado
72115c91e0
Merge pull request #3943 from Bond-009/ffmpeg 
Simplify FFmpeg detection code
 2020-08-21 15:04:58 -04:00
Bond-009
6292a9e4e9
Merge branch 'master' into warn24 2020-08-20 18:50:15 +02:00
Bond_009
301e029d42 Add unsupported ffmpeg version to tests 2020-08-20 17:45:40 +02:00
Bond_009
cb5cb075a9 Simplify FFmpeg detection code 2020-08-20 17:16:09 +02:00
Bond-009
5160e627f1
Merge branch 'master' into feature/ffmpeg-version-check 2020-08-20 16:40:03 +02:00
Bond_009
ab2147751f Make MediaBrowser.MediaEncoding warnings free 2020-08-20 12:16:24 +02:00
Bond_009
2b400c99ef Fix warnings 2020-08-19 17:50:50 +02:00
Bond-009
d9f6953416 Minor fixes 2020-08-04 17:14:07 +02:00
Bond-009
53f99d5d4b Add some analyzers to MediaBrowser.MediaEncoding 2020-08-04 17:08:09 +02:00
Bond-009
18efa25a6f Enable TreatWarningsAsErrors for MediaBrowser.MediaEncoding 2020-08-04 16:20:52 +02:00
Bond_009
e98351b912 Replace \d with [0-9] in ffmpeg detection and scan code 2020-07-20 14:14:15 +02:00
dkanada
87d7c4a62e
Merge pull request #3500 from nyanmisaka/vpp-qsv 
Add FFmpeg 4.3 detection and solve the green line on QSV HWA
 2020-07-14 20:31:13 +09:00
nyanmisaka
f5c5352861 add FFmpeg 4.3 detection and tests 2020-07-04 19:14:49 +08:00
Max Git
3588ee5229 Merge branch 'master' into feature/ffmpeg-version-check 2020-07-02 23:50:13 +02:00
Neil Burrows
6b532b3da5
User string.Empty instead of "" 
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
 2020-06-29 20:52:20 +01:00
Neil Burrows
4389773508 Respect FFMpeg path passed via Environment Variable 2020-06-29 17:17:28 +01:00
Max Git
c35c401d65 Merge branch 'master' into feature/ffmpeg-version-check 2020-06-23 09:20:50 +02:00
telans
8de6452967
fix some documentation periods 2020-06-20 18:13:11 +12:00
Max Git
33f78df051 Merge branch 'master' into feature/ffmpeg-version-check 2020-06-17 02:52:38 +02:00
Bond-009
9af6eda0b4
Merge pull request #3343 from telans/comment-stops 
Add full stop at end of comments (SA1629)
 2020-06-16 11:54:58 +02:00
telans
247f9c61e6
fix SA1513/SA1516 2020-06-16 16:11:30 +12:00
Max Git
e6c197b969 Cleanup 2020-06-16 01:09:41 +02:00
telans
9018f8d8be
Add full stop at end of comments (SA1629) 2020-06-16 10:37:52 +12:00
Max Git
ef3200e178 Remove redundant cast 2020-06-15 19:50:09 +02:00
Max Git
11f3a0dc58 Use Version instead of double. Use correct version number for libavdevice. 2020-06-15 15:10:59 +02:00
dkanada
dabb869a6b
Merge branch 'master' into hwaccel 2020-06-15 20:21:25 +09:00
Max Git
37e737e012 Merge from master & fix conflict 2020-06-15 12:12:03 +02:00
telans
3d9049ef08
fix SA1508 2020-06-15 10:45:55 +12:00
telans
acd4389653
fix SA1005 2020-06-15 10:41:00 +12:00
artiume
0476acf5d5 Update EncoderValidator.cs 2020-06-08 14:45:26 +03:00
crobibero
44957c5a9a Use typed logger where possible 2020-06-05 18:15:56 -06:00
rotvel
480fd0a66a
Update MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-06-01 16:00:58 +02:00
Max Git
e103d087d3 Try harder at detecting FFmpeg version and enable the validation 2020-06-01 07:10:15 +02:00
Vasily
aa17a53e83 Skip only line saying "Hardware acceleration methods:" instead of some random one 2020-05-26 19:05:44 +03:00
Vasily
628734931c Fix missing commas and merge defects 2020-05-26 18:49:15 +03:00
artiume
3c82379759 Update EncoderValidator.cs 2020-05-26 18:29:58 +03:00
artiume
407de0209e Update MediaEncoder.cs 2020-05-26 18:29:58 +03:00
artiume
1ff95289ef Update EncoderValidator.cs 2020-05-26 18:29:58 +03:00
nyanmisaka
b4b93995f7 add more separate hw decoding toggles 2020-05-26 18:06:49 +03:00
Max Git
cee587d6e3 Try harder to find ffmpeg in app directory. While here do some cleanup 2020-04-27 03:25:57 +02:00
Mark Monteiro
8f02fb9a4f Remove unused usings 
This addresses the new issues identified in SonarCloud analysis
 2020-04-22 13:09:59 -04:00