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

335 Commits

Author SHA1 Message Date
Nyanmisaka
a5249730d7 mpeg4 profile 15 is not supported by vaapi device 2020-04-07 00:20:36 +08:00
Mark Monteiro
7b31b0e322 Inject logger correctly into ActivityManager and ActivityRepository 2020-04-04 15:33:23 -04:00
Bond-009
f31efce52d
Merge branch 'master' into usings 2020-04-01 22:42:43 +02:00
Bond_009
3ab50f5a3f Address comments 2020-04-01 19:05:41 +02:00
Bond_009
787049f35f Merge branch 'master' into minor 2020-04-01 18:53:22 +02:00
Bond-009
ddd5d3aaec
Merge branch 'master' into usings 2020-04-01 18:51:44 +02:00
Nyanmisaka
d9b78a1dc5
update as per suggestion 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-02 00:48:43 +08:00
Nyanmisaka
ebb7590350
update as per suggestion 
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
 2020-04-01 07:48:29 +08:00
Vasily
9aefb41512
Merge pull request #2503 from nyanmisaka/vaapi 
Fix various bugs in HWA subtitle burn-in
 2020-03-31 23:19:44 +03:00
Nyanmisaka
cf98a1fbc7
update as per suggestion 
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
 2020-04-01 00:22:10 +08:00
nyanmisaka
95c5c08610 minor improvements 2020-03-31 04:04:55 +08:00
nyanmisaka
db23660660 prefer to use libfdk_aac for better audio quality 2020-03-30 15:53:49 +08:00
Nyanmisaka
0c6ac38454 fix graphical subtitle scaling for NVDEC 2020-03-30 14:48:44 +08:00
Nyanmisaka
111095c2b0 fix QSV HWA failed when burning text subtitles 
ffmpeg 4.3+ is required for better transcoding speed(more than twice increase).
Using qsv on Linux also requires a fix in ffmpeg 4.3+.
See 74007dd86a
 2020-03-30 14:47:55 +08:00
nyanmisaka
fac6831653 fix various bugs in VAAPI hardware acceleration 2020-03-30 14:47:55 +08:00
Bond_009
e9d1eabd53 Remove unused usings 2020-03-24 16:12:06 +01:00
Peter Maar
adbf375efe
Merge pull request #1 from jellyfin/master 
Pull latest to my fork
 2020-03-19 22:02:08 -04:00
Peter Maar
818695a01e Improve controls for deinterlace method; matches with jellyfin-web changes 2020-02-23 21:40:53 -05:00
Bond_009
a07ee65365 Minor improvements 2020-02-23 10:53:51 +01:00
Peter Maar
7716deddf0 Add encoding option bobandweave, change back the EncodingHelper logic 2020-02-22 17:01:56 -05:00
Bond-009
a2490a7ae5
Merge branch 'master' into images 2020-02-12 17:41:46 +01:00
Peter Maar
8531ed646d Temporary fix/change forcing yadif to "send_field" 2020-02-09 12:13:31 -05:00
dkanada
b7a9900556
Merge pull request #2357 from Bond-009/warn13 
Fix warnings
 2020-02-03 17:15:03 +09:00
dkanada
c1ecd886d9
Merge pull request #2368 from nyanmisaka/master 
Fix framerate info not showing when mediasource is in H264 format.
 2020-02-03 15:58:26 +09:00
Nyanmisaka
c149fcb3ee
Update MediaBrowser.Controller/MediaEncoding/JobLogger.cs 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-02-03 00:02:24 +08:00
Nyanmisaka
2c3b1bb8cb
Update JobLogger.cs 2020-02-02 16:46:56 +08:00
Nyanmisaka
7472ae5ca9
fix fps info issue when the video is h264. 
Fixed an issue that when the media source is in H264 format and the frame rate info is not displayed due to missing space characters in ffmpeg log.
 2020-02-02 16:27:02 +08:00
Nyanmisaka
8eced835c0
Update JobLogger.cs 2020-02-02 15:58:29 +08:00
Bond_009
87d2479b78 Fix warnings 2020-01-31 22:26:53 +01:00
ThreeFive-O
4f3bfd9146 Add Transcoding framerate info 2020-01-24 23:33:32 +01:00
Bond-009
c8409d2ea1 Remove FileSystem.GetStream 2020-01-22 22:20:35 +01:00
Bond_009
ddf9b38799 Simplify image processing by removing image enhancers 2020-01-21 20:26:30 +01:00
dkanada
d4de78693f
Merge pull request #2184 from WiiPlayer2/bug/global-header-flag-support 
Add check if output container supports "global_header" flag
 2020-01-21 19:24:35 +09:00
Waldemar Tomme
ef487441d1 Remove configuration of global_header flag 2020-01-21 06:48:25 +01:00
Nyanmisaka
8868ff2ffa
remove useless comment 2020-01-15 18:40:58 +08:00
Nyanmisaka
08c4d3797f
add support for AMF hardware encoding on Linux. 
1) h264_amf is now supported on linux with 'amdgpu-pro' installed and '--enable-amf' when compiling ffmpeg.
2) Using vaapi decode and h264_amf encode on linux platform can avoid some weird transcoding errors in h264_vaapi with amd gpu.
 2020-01-12 21:38:28 +08:00
Bond_009
a253fa616d Fix build and address comments 2020-01-08 01:23:57 +09:00
dkanada
aca31457c0 merge branch master into media-attachments 2020-01-08 01:21:09 +09:00
Waldemar Tomme
57aec873d0 Add check if output container supports "global_header" flag 2019-12-22 13:01:18 +01:00
dkanada
bc7cbfb21a
Merge pull request #1941 from Bond-009/mediaencoding 
Make probesize and analyzeduration configurable and simplify circular dependencies
 2019-12-18 08:54:40 +09:00
cryptobank
d063300af4
Add space 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-12-15 20:35:52 +10:30
cryptobank
bafcadbe58 Use case insensitive contains (4) 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-12-14 11:27:43 +10:30
cryptobank
d0febd6c37 Use case insensitive contains (3) 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-12-14 11:27:43 +10:30
cryptobank
802a66a9e6 Use case insensitive contains (2) 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-12-14 11:27:43 +10:30
cryptobank
867b61025d Use case insensitive contains (1) 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-12-14 11:27:43 +10:30
Bond-009
6464bca791 Use extension methods 2019-12-12 17:02:42 +01:00
Bond_009
0bf8bfbb0c Merge branch 'master' into mediaencoding 2019-12-10 23:00:59 +01:00
cryptobank
408cf017a4
Remove newline 
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
 2019-12-07 06:48:44 +10:30
cryptobank
68edb9734d
Add space between if statement and boolean expression 
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
 2019-12-07 06:46:24 +10:30
Petr Janda
3f43aef997 Add back code removed during testing/debugging 2019-12-06 16:04:29 +10:30
Petr Janda
535390bb64 QSV can hardware deinterlace too now 2019-12-06 06:30:09 +10:30
Petr Janda
a9766992b7 Do not force original aspect ratio to decrease, it causes bitmap subtitles to be off-centre 2019-12-06 06:08:45 +10:30
Petr Janda
9ee0804407 Move scaling filters and definitions before deinterlacing 2019-12-06 05:52:40 +10:30
Petr Janda
7d2bfabb32 Force original aspect ratio can be used for QSV subtitle scaling 2019-12-06 05:12:16 +10:30
Petr Janda
8368815788 Remove trailing spaces 2019-12-06 05:03:46 +10:30
Petr Janda
70530e1f14 Fix formatting (2) 2019-12-05 19:20:47 +10:30
Petr Janda
3d8f3da5d6 Add comments 2019-12-05 18:39:09 +10:30
Petr Janda
78a161138f Fix formatting stuffed up by previous commit 2019-12-05 18:07:46 +10:30
Petr Janda
89605d4fb1 Fix VAAPI encoding on 10-bit hevc. Update QSV encoding and scaling to take advantage of scale_qsv and overlay_qsv 2019-12-05 17:39:36 +10:30
ferferga
94ef239de0 Add full Raspberry Pi hardware decoding support 2019-11-25 23:09:23 +01:00
Bond_009
cc5acf37f7 Make probesize and analyzeduration configurable and simplify circular 
dependencies

Makes the probesize and analyzeduration configurable with env args.
(`JELLYFIN_FFmpeg_probesize` and `FFmpeg_analyzeduration`)
 2019-11-25 12:07:59 +01:00
Bond-009
d4b438791f Don't append transcodes to transcoding temp path 2019-11-21 16:57:49 +01:00
Andrew Mahone
1600d5b53f Merge remote-tracking branch 'origin/master' into media-attachments-clean 2019-11-04 10:03:18 -05:00
Joshua M. Boniface
a460814182
Merge pull request #1904 from JustAMan/hls-move-2 
Switch ffmpeg to hls muxer (from segment) to fix premature stop on non-patched ffmpeg
 2019-11-03 14:36:34 -05:00
Andrew Mahone
12f752d8b1 FFMPEG extractor for attachments. 2019-10-22 11:50:07 -04:00
Vasily
3743137c31 Address Bond-009 review comments 2019-10-21 12:05:49 +03:00
KerryJ
ef3df7baaf Fix System.NullReferenceException when playing Dvds copied to HDD 2019-10-17 11:31:11 +02:00
Vasily
1bd12083c3 Respect non-inversed setting of "enable break on non-keyframes" 2019-10-14 13:22:53 +03:00
Joshua M. Boniface
dcc8c7b92a
Merge pull request #1808 from joshuaboniface/fix-amf-win 
Change Win32 AMF flag to d3d11va
 2019-09-29 17:19:23 -04:00
Joshua Boniface
7fd75bf071 Change Win32 AMF flag to d3d11va for Windows 8+ 2019-09-29 12:39:52 -04:00
Joshua M. Boniface
d64005df40
Merge pull request #1812 from dkanada/settings 
Avoid editing preferences without user interaction
 2019-09-29 11:43:03 -04:00
dkanada
7a88e7fa34 avoid editing preferences without user interaction 2019-09-29 16:21:32 +09:00
Bond_009
c9820d30ed Fix multiple mistakes and warnings 2019-09-23 20:32:44 +02:00
Bond_009
675754bc5c Possible fix for MrMC 2019-09-08 21:07:29 +02:00
Bond_009
1616f24cee Fix more warnings 2019-09-01 18:39:23 +02:00
Samantha Collard
627bde4b72 Fix VAAPI 8-bit HW to SW transcoding for some media 2019-09-01 13:20:18 +10:00
Samantha Collard
a321ca5b39 Enable VAAPI decoding without hardware encoding 
Enable VAAPI command arguments to ffmpeg if VAAPI is selected, and
add the "hwdownload" filter if transcoding from VAAPI to software.
Also support transforming 10 bit colourspace to 8-bit, consistent
with other hardware encoding options, at least until client pixel
formats are configurable.
 2019-08-31 12:04:31 +10:00
Joshua M. Boniface
d95c04787c
Merge branch 'master' into h265 2019-08-19 14:57:48 -04:00
Bond_009
e6ef6088ff Fix #1388 and #1472 2019-07-29 00:43:57 +02:00
dkanada
dbc2cda9d4
Merge pull request #1369 from teacupx/master 
Enable Exynos MFC encoder and fix transcoding bitrate control
 2019-06-20 16:55:09 -07:00
dkanada
65fa61a636 add comment explaining GetMinBitrate 2019-06-20 16:44:27 -07:00
Frank
3ba709fcc3 Fix #1432. Add support for encoding with libx265 and hevc_nvenc. 2019-06-01 15:46:41 -07:00
JMCC
012e4a3e63 Fix transcode bitrate control 2019-05-11 17:19:20 +02:00
Bond_009
b647959ec4 Add EnableOutputInSubFolder back 2019-03-27 16:26:33 +01:00
Bond_009
93e535d3a1 Trying to make sense of the streaming code 
Mostly small changes as I was looking through the code.

* async void -> async Task
* Properly implemented dispose methods
* Pass the logstream directly to the JobLogger
* Style fixes
 2019-03-26 23:00:14 +01:00
Bond_009
d5f080fefb Check before flushing ffmpeg log 
The stream could have been diposed while writing.
 2019-03-15 17:58:34 +01:00
Bond_009
37ea50a572 Reduce the amount of exceptions thrown 2019-03-07 21:42:56 +01:00
PloughPuff
2617a49b78 Renamed Init() to SetFFmpegPath() 2019-03-05 21:29:15 +00:00
PloughPuff
ed69e690b8 Review comments 
Address review comments from JustAMan, Bond-009 and cvium.
 2019-03-05 21:29:15 +00:00
Joshua M. Boniface
9651a78b0c
Merge pull request #977 from Lynxy/genpts 
Always set ffmpeg flag +genpts when video stream is being copied
 2019-02-27 00:52:51 -05:00
Claus Vium
547d0ecf58 Move the check further down 2019-02-24 22:04:30 +01:00
Claus Vium
96b3d37caf Check that ffmpeg log target isn't disposed before writing to it 2019-02-24 21:25:24 +01:00
The Lynxy
67f399dccf
Leave +genpts untouched in GetProgressiveVideoArguments() 2019-02-23 10:01:41 -05:00
Lynxy
9b39404b9a Always set ffmpeg flag +genpts when video stream is being copied 2019-02-21 19:50:57 -05:00
Bond_009
1cdcace061 Remove dead code 2019-02-02 15:58:39 +01:00
Bond_009
66eabcdd39 Minor changes to encoding code 
* Don't wait in intervals of 100ms for the file to exist
 2019-02-02 15:56:54 +01:00
Bond-009
1ea219bf3f
Merge branch 'master' into culture 2019-01-30 16:57:15 +01:00
Erwin de Haan
581a7fe078 Unwrapped MoveDirectory, DirectoryExists, FileExists & removed MoveFile 2019-01-28 22:10:00 +01:00
Bond_009
a709cbdc64 Fix more analyzer warnings 2019-01-27 12:12:44 +01:00
Luca Beltrame
ee89236fe8 [VA-API] Fix filter order (#714) 
ffmpeg is very picky about the filters to be used when using VA-API,
because most of them are incompatible. This is particularly evident when
burning-in subtitles.
 2019-01-27 09:44:56 +01:00