Commit graph

359 commits

Author SHA1 Message Date
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
Bond_009 883575893b Change image dimentions from double to int
Rename ImageSize -> ImageDimensions
2019-01-26 13:16:47 +01:00
Mathieu Velten ae73f7b3e3 Fix transcoding bitrate 2019-01-20 22:50:17 +01:00
Mathieu Velten 060eb98cc5 Fix encoding profile handling for vaapi 2019-01-20 22:50:17 +01:00
Mathieu Velten da16de48aa Revert back to 10e57ce8d21b4516733894075001819f3cd6db6b for MediaEncoding
Remove some duplicate code that were causing warnings
2019-01-20 22:50:09 +01:00
Bond_009 fc7c211025 Remove unused font 2019-01-20 20:32:15 +01:00
Erwin de Haan 38f96af079 Reformat JustAMan review pt2 changes
Refs #575
2019-01-17 20:24:39 +01:00
Erwin de Haan e867446437 ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Erwin de Haan a36658f6f0 ReSharper Reformat: Properties to expression bodied form. 2019-01-13 21:31:14 +01:00
Erwin de Haan ba610b5094 Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
Erwin de Haan 26ca4b607b Visual Studio Reformat: MediaBrowser.Controller 2019-01-13 20:25:32 +01:00
Erwin de Haan e2751d42e8 Merge branch 'dev' into code-cleanup 2019-01-11 12:50:36 +01:00
Erwin de Haan ec1f5dc317 Mayor code cleanup
Add Argument*Exceptions now use proper nameof operators.

Added exception messages to quite a few Argument*Exceptions.

Fixed rethorwing to be proper syntax.

Added a ton of null checkes. (This is only a start, there are about 500 places that need proper null handling)

Added some TODOs to log certain exceptions.

Fix sln again.

Fixed all AssemblyInfo's and added proper copyright (where I could find them)

We live in *current year*.

Fixed the use of braces.

Fixed a ton of properties, and made a fair amount of functions static that should be and can be static.

Made more Methods that should be static static.

You can now use static to find bad functions!

Removed unused variable. And added one more proper XML comment.
2019-01-10 20:38:53 +01:00
hawken bd169e4fd4 remove trailing whitespace 2019-01-07 23:27:46 +00:00
hawken ba1794f64b Remove tabs and trailing whitespace 2019-01-07 23:24:34 +00:00
Bond_009 340a2c6512 Post GPL cleanup 2019-01-03 23:19:02 +01:00
Bond_009 c99b45dbe0 Remove some warnings 2019-01-02 02:35:40 +03:00
Bond_009 ea4c914123 Fix exception logging 2018-12-30 22:44:39 +01:00
Bond_009 0c1b9d3bff Rebase 2018-12-30 22:44:38 +01:00
Bond_009 0f8b3c6347 Use Microsoft.Extensions.Logging abstraction 2018-12-30 22:44:38 +01:00
Andrew Rabert a86b71899e Add GPL modules 2018-12-27 18:27:57 -05:00
stefan 48facb797e Update to 3.5.2 and .net core 2.1 2018-09-12 19:26:21 +02:00
Luke Pulverenti 26edcfefbb cache network data longer 2017-11-27 15:16:41 -05:00
Luke Pulverenti 9f46122d91 3.2.36.10 2017-11-15 16:33:04 -05:00
Luke Pulverenti 5cb7469028 support track selection before playback 2017-11-05 16:51:23 -05:00
Luke Pulverenti 8b7936addf removed dead code 2017-10-13 01:45:06 -04:00
Luke Pulverenti bc656edf4f update resolved video titles 2017-10-13 01:44:20 -04:00
Luke Pulverenti 851c62a940 update image magick orientation function 2017-10-11 02:24:22 -04:00
Luke Pulverenti fd621bbc52 support mpeg2 decoding with omx 2017-10-05 14:07:31 -04:00
Luke Pulverenti a452bc23b2 adjust params when burning in subtitles 2017-10-01 20:13:12 -04:00
Luke Pulverenti 4e4c145855 update hls query string 2017-09-29 16:10:13 -04:00
Luke Pulverenti 134e74414d update translations 2017-09-29 02:13:05 -04:00
Luke Pulverenti f55b138e1d update deinterlace param 2017-09-27 10:52:01 -04:00
Luke Pulverenti d43508a898 update applyconditions 2017-09-25 15:15:01 -04:00
Luke Pulverenti 978eedbcb7 improve support for compressed xmltv 2017-09-25 01:06:15 -04:00
Luke Pulverenti b4851d4789 separate deinterlacing params by video codec 2017-09-21 17:36:19 -04:00
Luke Pulverenti 467f440501 3.2.30.26 2017-09-19 16:08:34 -04:00
Luke Pulverenti 1f12ab6658 add yadif setting 2017-09-17 02:42:23 -04:00
Luke Pulverenti e0161d62db update hw filters 2017-09-17 01:24:39 -04:00
Luke Pulverenti f3096b8340 add omx decoder 2017-09-15 13:57:42 -04:00
Luke Pulverenti 3badff870b fixes #2865 - Odroid XU4 Hardware encoder support 2017-09-10 14:35:23 -04:00
Luke ab3e79e6aa Merge pull request #2781 from puenktchen/patch-2
Improve playback of RTSP streams
2017-09-06 16:51:43 -04:00
Luke Pulverenti 6bc2a79792 fix folder rip probe 2017-08-26 03:03:19 -04:00
Luke Pulverenti edfae37331 fixes #2335 - Raw image not showing in webbrowser 2017-08-26 02:18:52 -04:00
Luke Pulverenti af02f9d692 add mpdecimate option 2017-08-23 14:44:40 -04:00
Luke Pulverenti 89722aa077 resolve defect with folder rip transcoding 2017-08-22 01:41:20 -04:00
Luke Pulverenti 1ad990ad72 update live tv data transfer 2017-08-19 15:43:35 -04:00
Luke Pulverenti 0951819f00 fixes #2798, fixes #2799 2017-08-13 16:15:07 -04:00
Luke Pulverenti 9c5bfeddca expand on hardware decoding options 2017-08-13 14:05:46 -04:00
Luke Pulverenti 4ea3925626 auto fallback from gpu to cpu 2017-08-13 01:01:34 -04:00
Luke Pulverenti 6b28eee2db rework episode queries 2017-08-12 22:09:07 -04:00
Luke Pulverenti cf350f3b7e expand on hardware decoding options 2017-08-12 15:09:13 -04:00
Luke Pulverenti e7425e6205 revert servicestack.text update 2017-08-10 14:01:31 -04:00
Luke Pulverenti db315c4e32 update media source methods 2017-08-05 15:02:33 -04:00
Luke Pulverenti d8e2887071 update container value 2017-08-04 16:29:34 -04:00
Luke Pulverenti b89af7af43 fixes #2121 - background roku thumbnail generation (or maybe... any scheduled task?) should be "niced" 2017-08-01 15:43:39 -04:00
Luke Pulverenti a74dbb6481 3.2.26.10 2017-07-31 15:08:54 -04:00
pünktchen 6c9274730b Improve playback of RTSP streams
Without those little changes, rtsp live tv streams get corrupted even when stream copying, but also with transcoding.
It's already really bad for sd streams, but hd streams are just unwatchable. The whole picture consists of green blocks.

Btw. this problem isn't new. It was already discussed in many posts at the time the Argus TV plugin was still alive.
These changes have the potential to fix it there also.
2017-07-28 18:15:31 +02:00
Luke Pulverenti a46840534f 3.2.26.3 2017-07-25 14:32:03 -04:00
Luke Pulverenti 71308b5c29 fix -tp format command line 2017-06-27 16:56:47 -04:00
Luke Pulverenti a759b09577 support max audio bit depth 2017-06-26 11:10:52 -04:00
Luke Pulverenti a107ff0369 capture more transcoding info 2017-06-24 14:33:19 -04:00
Luke Pulverenti 1663b258a7 update home sections 2017-06-13 02:33:29 -04:00
Luke Pulverenti ceed0241fd fixes #2578 - [VAAPI Bug] HEVC Decoding not possible on Intel hardware without this ability 2017-06-12 02:11:19 -04:00
Luke Pulverenti 2c54390c38 enable h264_cuvid decoder 2017-06-10 14:24:53 -04:00
Luke Pulverenti 282dce7f10 normalize session object 2017-06-09 15:26:54 -04:00
Luke Pulverenti 820b4873fb move methods to base class 2017-06-04 16:28:27 -04:00
Luke Pulverenti e91f569c15 update live tv startup 2017-06-03 03:36:32 -04:00
Luke Pulverenti 33014f77aa update GetItems method 2017-05-26 02:48:54 -04:00
Luke Pulverenti f07af448fa update main projects 2017-05-24 15:12:55 -04:00
Luke Pulverenti 9cd2d793be update image encoding 2017-05-17 14:18:18 -04:00
Luke Pulverenti 6a628e8d2e update vsync 2017-05-14 15:20:31 -04:00
Luke Pulverenti f2284af82a update GenPtsInput 2017-05-14 15:17:35 -04:00
Luke Pulverenti 14533d9cc9 don't use hwaccel auto 2017-05-13 15:29:13 -04:00
Luke Pulverenti 92eeee0fc5 support additional encoding switches 2017-05-11 10:54:41 -04:00
Luke Pulverenti 53024bd149 removed dead code 2017-05-04 03:01:35 -04:00
Luke Pulverenti c197360047 fix ignore dts 2017-04-30 16:09:47 -04:00