Add support for encoding with libx265 and hevc_nvenc #1433

fhriley · 2019-06-01T22:49:33Z

Changes

This implements encoding support for h265 using libx265 or hevc_nvenc. Note that I did not implement it for other hardware encoders because I don't know enough about them, and I do not have that hardware. Also note that this will require changes in clients to actually request h265.

Issues

Fix #1432.

EraYaN · 2019-06-02T20:10:53Z

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

-                    {"mediacodec",   "h264_mediacodec"},
-                    {"vaapi",        "h264_vaapi"}
+                    {"qsv",                  hwEncoder + "_qsv"},
+                    {hwEncoder + "_qsv",     hwEncoder + "_qsv"},


Why are there these _qsv maps doubled? Can we remove those? And that _v4l2m2m one also maps to itself. Should probably be a default value or something.

Why are there these _qsv maps doubled? Can we remove those?

I'm assuming the original author wanted both those values to map to the correct hw encoder. I think a refactor and using enums would answer/solve these questions (see my response in your other discussion).

And that _v4l2m2m one also maps to itself. Should probably be a default value or something.

I'm not sure I understand as I don't see a problem here. Presumably the mapping to itself is the correct action so that we don't have to do any special casing in the code below that uses the map.

EraYaN · 2019-06-02T20:12:21Z

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -119,6 +127,11 @@ public string GetVideoEncoder(EncodingJobInfo state, EncodingOptions encodingOpt

            if (!string.IsNullOrEmpty(codec))
            {
+                if (string.Equals(codec, "h265", StringComparison.OrdinalIgnoreCase) ||


All these strings, h265, hevc, 265 and all the others used through out the code, should probably be enums or something.

Absolutely agree. I've never seen so many string comparisons in a chunk of code in my life. I initially went down the road of creating enums, but I quickly realized how much code this was going to touch so I changed my mind. I believe that change should go in its own Issue and PR.

I'm gonna give you a little tip... enums are a bad idea... Take it or leave it.

Can you elaborate? It seems like codecs for example internally in ffmpeg are already essentially an enumeration, besides they do not change all that often. And for serialization you can specify the string values if you do not want to deal with numbers (codec IDs for example) in your JSON bodies.

DrPandemic · 2019-06-13T01:30:20Z

What would be the easiest way of testing this PR?

fhriley · 2019-06-14T03:23:48Z

What would be the easiest way of testing this PR?

I tested it by doing the following:

Open the developer tools in Chrome
Play a file on the jellyfin web interface that will require transcoding
Grab the URL of the video stream
Change all the h264 options to h265
Use VLC and "open network" with the above URL.
Verify it plays and also that the media information is hevc
At the same time, use nvidia-smi to verify it is transcoding on the GPU

An example URL that I tested:

https://jellyfin.<redacted>.com/emby/videos/06890f52-7dbe-c2a7-60fe-4dd88a8ab6fa/hls1/main/0.ts?DeviceId=TW96aWxsYS81LjAgKE1hY2ludG9zaDsgSW50ZWwgTWFjIE9TIFggMTBfMTRfNCkgQXBwbGVXZWJLaXQvNTM3LjM2IChLSFRNTCwgbGlrZSBHZWNrbykgQ2hyb21lLzc0LjAuMzcyOS4xMzEgU2FmYXJpLzUzNy4zNnwxNTU4Nzk2Njc1NTg0&MediaSourceId=06890f527dbec2a760fe4dd88a8ab6fa&VideoCodec=h265&AudioCodec=mp3,aac&AudioStreamIndex=1&VideoBitrate=2000000&AudioBitrate=384000&PlaySessionId=dedb51012aa44ef1b1385dbd0bbc48cc&api_key=<redacted>&TranscodingMaxAudioChannels=2&RequireAvc=false&Tag=870288a2ba397d0faa3c305e9a9a7e26&SegmentContainer=ts&MinSegments=2&BreakOnNonKeyFrames=True&h265-profile=main&h265-level=51

This results in the following ffmpeg command:

/usr/local/bin/ffmpeg -c:v hevc_cuvid -resize 720x404 -i file:"/media/movies/Captain Marvel (2019)/Captain Marvel (2019) [Remux-2160p HEVC TrueHD Atmos 7.1 HDR].mkv" -map_metadata -1 -map_chapters -1 -threads 0 -map 0:0 -map 0:1 -map -0:s -codec:v:0 hevc_nvenc -pix_fmt yuv420p -preset default -b:v 2000000 -maxrate 2000000 -bufsize 4000000 -profile:v main -force_key_frames "expr:gte(t,n_forced*3)" -copyts -vsync -1 -codec:a:0 libmp3lame -ac 2 -ab 384000 -f segment -max_delay 5000000 -avoid_negative_ts disabled -start_at_zero -segment_time 3 -individual_header_trailer 0 -segment_format mpegts -segment_list_type m3u8 -segment_start_number 0 -segment_list "/cache/transcoding-temp/b304c64eae0b6b9f32cdb0d1b73675f2.m3u8" -y "/cache/transcoding-temp/b304c64eae0b6b9f32cdb0d1b73675f2%d.ts"

Note that to test libx265 you need a fairly powerful CPU and to test hevc_nvenc you need a ~~turing~~ GPU that supports HEVC.

EraYaN · 2019-06-19T14:50:17Z

NVENC for h265 will work on much older GPUs than a Turing. 10-bit support came with Pascal, but even some Maxwell cards will do 4K, and GM206 even 4:4:4.

Reference Table: https://developer.nvidia.com/nvidia-video-codec-sdk#NVENCFeatures

fhriley · 2019-06-19T14:58:23Z

NVENC for h265 will work on much older GPUs than a Turing. 10-bit support came with Pascal, but even some Maxwell cards will do 4K, and GM206 even 4:4:4.

Reference Table: https://developer.nvidia.com/nvidia-video-codec-sdk#NVENCFeatures

I was thinking of HEVC with B frame support.

cvium · 2019-07-29T05:02:28Z

@fhriley I'm sorry this PR has gotten stale (this is our fault). Can you fix the merge conflicts?

joshuaboniface · 2019-08-11T01:47:30Z

@fhriley I'm sorry this PR has gotten stale (this is our fault). Can you fix the merge conflicts?

@fhriley Just a ping on this one, are you able to quickly review and correct that merge conflict?

<<<<<<< h265
        protected virtual bool EnableOutputInSubFolder => false;

        protected readonly CultureInfo UsCulture = new CultureInfo("en-US");

        protected virtual string GetDefaultEncoderPreset()
        {
            return "superfast";
        }
=======
        protected virtual string GetDefaultH264Preset() => "superfast";
>>>>>>> master

The Contributors one should just have your name at the bottom of the existing list since it's been updated since.

joshuaboniface

This looks good to me, but review from @jellyfin/backend members would be appreciated.

Spamm00r · 2020-04-24T23:53:26Z

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

+        }
+
+        private string GetH264OrH265Encoder(string defaultEncoder, string hwEncoder, EncodingJobInfo state, EncodingOptions encodingOptions)
+        {
            // Only use alternative encoders for video files.
            // When using concat with folder rips, if the mfx session fails to initialize, ffmpeg will be stuck retrying and will not exit gracefully
            // Since transcoding of folder rips is expiremental anyway, it's not worth adding additional variables such as this.


jellyfin fails to user Hardware accleration when trying to stream a BluRay Folder. THis needs to be fixed here.

Spamm00r · 2020-04-24T23:55:18Z

Hi,

thanks for adding hevc support to jellyfin. That is really an helpful feature for me and many others with limited upload speeds.

I can confirm that the method works as described by @fhriley grabbing the URL and using vlc.

Unfortunately there is no setting in Jellyfin to avoid to having to use external programs to make Jellyfin stream in HEVC.

Also trying to change the h264 setting in that url on the fly with an browser addon for example fails in jellyfin with the Error: #2803

In that case the error is probably valid because the browser may not support HEVC decoding.

Please add a solution to tell jellyfin to stream using HEVC. Maybe using an external player like vlc, so that we don't have to use the hack method to force Jellyfin to play HEVC.

Also I might add, that Jellyfin fails to use Hardware acceleration when trying to stream a Bluray FOlder.

Thanks for adding this feature.

Fix #1432. Add support for encoding with libx265 and hevc_nvenc.

3ba709f

EraYaN reviewed Jun 2, 2019

View reviewed changes

anthonylavado requested a review from a team June 4, 2019 15:46

joshuaboniface added the merge conflict Merge conflicts should be resolved before a merge label Aug 11, 2019

joshuaboniface changed the title ~~Fix #1432. Add support for encoding with libx265 and hevc_nvenc.~~ Add support for encoding with libx265 and hevc_nvenc Aug 11, 2019

joshuaboniface approved these changes Aug 11, 2019

View reviewed changes

Merge branch 'master' into h265

d95c047

joshuaboniface added Breaks Plugin API and removed merge conflict Merge conflicts should be resolved before a merge labels Aug 19, 2019

cvium removed the Breaks Plugin API label Aug 19, 2019

cvium approved these changes Aug 19, 2019

View reviewed changes

joshuaboniface merged commit 1bce9a8 into jellyfin:master Aug 19, 2019

anthonylavado added this to Done in Release 10.4.0 Sep 2, 2019

Spamm00r reviewed Apr 24, 2020

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for encoding with libx265 and hevc_nvenc #1433

Add support for encoding with libx265 and hevc_nvenc #1433

fhriley commented Jun 1, 2019 •

edited

EraYaN Jun 2, 2019 •

edited

fhriley Jun 3, 2019

EraYaN Jun 2, 2019

fhriley Jun 3, 2019

ebr11 Aug 25, 2019

EraYaN Aug 25, 2019

DrPandemic commented Jun 13, 2019

fhriley commented Jun 14, 2019 •

edited

EraYaN commented Jun 19, 2019

fhriley commented Jun 19, 2019

cvium commented Jul 29, 2019

joshuaboniface commented Aug 11, 2019

joshuaboniface left a comment

Spamm00r Apr 24, 2020

Spamm00r commented Apr 24, 2020

Add support for encoding with libx265 and hevc_nvenc #1433

Add support for encoding with libx265 and hevc_nvenc #1433

Conversation

fhriley commented Jun 1, 2019 • edited

EraYaN Jun 2, 2019 • edited

Choose a reason for hiding this comment

fhriley Jun 3, 2019

Choose a reason for hiding this comment

EraYaN Jun 2, 2019

Choose a reason for hiding this comment

fhriley Jun 3, 2019

Choose a reason for hiding this comment

ebr11 Aug 25, 2019

Choose a reason for hiding this comment

EraYaN Aug 25, 2019

Choose a reason for hiding this comment

DrPandemic commented Jun 13, 2019

fhriley commented Jun 14, 2019 • edited

EraYaN commented Jun 19, 2019

fhriley commented Jun 19, 2019

cvium commented Jul 29, 2019

joshuaboniface commented Aug 11, 2019

joshuaboniface left a comment

Choose a reason for hiding this comment

Spamm00r Apr 24, 2020

Choose a reason for hiding this comment

Spamm00r commented Apr 24, 2020

fhriley commented Jun 1, 2019 •

edited

EraYaN Jun 2, 2019 •

edited

fhriley commented Jun 14, 2019 •

edited