Nick 
							
						 
					 
					
						
						
						
						
							
						
						
							cd662506a1 
							
						 
					 
					
						
						
							
							Merge branch 'master' into trickplay  
						
						
						
						
					 
					
						2023-10-18 19:27:05 -07:00 
						 
				 
			
				
					
						
							
							
								lonebyte 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							74f61fbd79 
							
						 
					 
					
						
						
							
							Fix HLS playback of m4a files with mjpeg stream ( #10069 )  
						
						
						
						
					 
					
						2023-10-10 22:48:52 +02:00 
						 
				 
			
				
					
						
							
							
								Bond-009 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d5695efad9 
							
						 
					 
					
						
						
							
							Merge pull request  #10067  from lonebyte/flac-hls-fixes  
						
						
						
						
					 
					
						2023-10-09 18:28:49 +02:00 
						 
				 
			
				
					
						
							
							
								Nyanmisaka 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							aa073748c0 
							
						 
					 
					
						
						
							
							Drop experimental status of flac-in-MP4 for FFmpeg 6+  
						
						... 
						
						
						
						Signed-off-by: nyanmisaka <nst799610810@gmail.com> 
						
						
					 
					
						2023-10-09 23:12:41 +08:00 
						 
				 
			
				
					
						
							
							
								Bond_009 
							
						 
					 
					
						
						
						
						
							
						
						
							b176beb88e 
							
						 
					 
					
						
						
							
							Reduce string allocations  
						
						... 
						
						
						
						Some simple changes to reduce the number of allocated strings 
						
						
					 
					
						2023-10-06 01:04:25 +02:00 
						 
				 
			
				
					
						
							
							
								Jan Müller 
							
						 
					 
					
						
						
						
						
							
						
						
							fd022ee685 
							
						 
					 
					
						
						
							
							Merge branch 'master' into flac-hls-fixes  
						
						... 
						
						
						
						# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs 
						
						
					 
					
						2023-09-16 12:40:05 +02:00 
						 
				 
			
				
					
						
							
							
								nyanmisaka 
							
						 
					 
					
						
						
						
						
							
						
						
							b2dcc7c90e 
							
						 
					 
					
						
						
							
							Fix AV1 playback in LiveTV  
						
						... 
						
						
						
						AV1 in fMP4 requires global_header data for parsing.
Only disable global_header in TS since it has no global_header.
Signed-off-by: nyanmisaka <nst799610810@gmail.com> 
						
						
					 
					
						2023-09-02 00:25:40 +08:00 
						 
				 
			
				
					
						
							
							
								Nyanmisaka 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c74d3e62d0 
							
						 
					 
					
						
						
							
							Fix the issue that audio bsf only takes effect for remuxing ( #10172 )  
						
						... 
						
						
						
						Signed-off-by: nyanmisaka <nst799610810@gmail.com> 
						
						
					 
					
						2023-08-30 17:18:18 -06:00 
						 
				 
			
				
					
						
							
							
								Jan Müller 
							
						 
					 
					
						
						
						
						
							
						
						
							79cff704ff 
							
						 
					 
					
						
						
							
							Allow flac inside mp4 for all HLS audio streams  
						
						... 
						
						
						
						The -strict -2 setting was only added if the encoder was set to 'copy'.
If 'flac' is explicitly requested, we also need to set it, so that
ffmpeg doesn't abort the conversion.
Fixes : #10066  
						
						
					 
					
						2023-08-01 19:12:52 +02:00 
						 
				 
			
				
					
						
							
							
								Nick 
							
						 
					 
					
						
						
						
						
							
						
						
							6d9e43cfe0 
							
						 
					 
					
						
						
							
							Merge branch 'master' into trickplay  
						
						
						
						
					 
					
						2023-06-28 21:43:23 -07:00 
						 
				 
			
				
					
						
							
							
								Bond-009 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4ac07f6c76 
							
						 
					 
					
						
						
							
							Merge pull request  #9890  from Shadowghost/videorange-rework  
						
						
						
						
					 
					
						2023-06-28 17:30:26 +02:00 
						 
				 
			
				
					
						
							
							
								Shadowghost 
							
						 
					 
					
						
						
						
						
							
						
						
							20a4509991 
							
						 
					 
					
						
						
							
							Migrate VideoRange and VideoRangeType to Enum  
						
						
						
						
					 
					
						2023-06-28 12:02:20 +02:00 
						 
				 
			
				
					
						
							
							
								nicknsy 
							
						 
					 
					
						
						
						
						
							
						
						
							b18d6bd356 
							
						 
					 
					
						
						
							
							Trickplay playlist and image controller  
						
						
						
						
					 
					
						2023-06-22 16:19:59 -07:00 
						 
				 
			
				
					
						
							
							
								nicknsy 
							
						 
					 
					
						
						
						
						
							
						
						
							515ee90fb9 
							
						 
					 
					
						
						
							
							Hls playlist  
						
						
						
						
					 
					
						2023-06-22 16:19:59 -07:00 
						 
				 
			
				
					
						
							
							
								Dominik 
							
						 
					 
					
						
						
						
						
							
						
						
							0dffe64489 
							
						 
					 
					
						
						
							
							Add baseUrlParam back in and fix indentation  
						
						
						
						
					 
					
						2023-06-15 19:55:11 +02:00 
						 
				 
			
				
					
						
							
							
								Dominik 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							17f1e8d19b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into segment-deletion  
						
						
						
						
					 
					
						2023-06-15 19:38:42 +02:00 
						 
				 
			
				
					
						
							
							
								Stepan Goremykin 
							
						 
					 
					
						
						
						
						
							
						
						
							e74630a613 
							
						 
					 
					
						
						
							
							Use MinBy and MaxBy  
						
						
						
						
					 
					
						2023-04-01 23:00:51 +02:00 
						 
				 
			
				
					
						
							
							
								knackebrot 
							
						 
					 
					
						
						
						
						
							
						
						
							e0a7e9baa0 
							
						 
					 
					
						
						
							
							Fix audio VBR calculation  
						
						... 
						
						
						
						Pass encoder, not codec 
						
						
					 
					
						2023-03-21 15:01:32 +01:00 
						 
				 
			
				
					
						
							
							
								Bond-009 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2ce08eb184 
							
						 
					 
					
						
						
							
							Merge pull request  #9388  from Shadowghost/output-bitrate-channels-master  
						
						
						
						
					 
					
						2023-03-20 17:46:11 +01:00 
						 
				 
			
				
					
						
							
							
								nyanmisaka 
							
						 
					 
					
						
						
						
						
							
						
						
							f21ab50a81 
							
						 
					 
					
						
						
							
							Backport pull request  #9422  from jellyfin/release-10.8.z  
						
						... 
						
						
						
						Fix stream map when using filter_complex with unlabeled output
Original-merge: 6821a2ab358761282a0030c42c837b39bad089e1
Merged-by: Bond-009 <bond.009@outlook.com>
Backported-by: crobibero <cody@robibe.ro> 
						
						
					 
					
						2023-03-09 19:38:15 -05:00 
						 
				 
			
				
					
						
							
							
								Róbert Örn Ketilsson 
							
						 
					 
					
						
						
						
						
							
						
						
							ef3868ff50 
							
						 
					 
					
						
						
							
							Backport pull request  #9178  from jellyfin/release-10.8.z  
						
						... 
						
						
						
						Escape the path to pass as a command line argument
Original-merge: 09f1c7f535653e99dbc22ace7cd166ce4c457a83
Merged-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>
Backported-by: crobibero <cody@robibe.ro> 
						
						
					 
					
						2023-03-09 19:29:39 -05:00 
						 
				 
			
				
					
						
							
							
								Shadowghost 
							
						 
					 
					
						
						
						
						
							
						
						
							1f15724398 
							
						 
					 
					
						
						
							
							Use source audio bitrate if requested codec is lossless  
						
						
						
						
					 
					
						2023-03-02 20:57:59 +01:00 
						 
				 
			
				
					
						
							
							
								Shadowghost 
							
						 
					 
					
						
						
						
						
							
						
						
							16f2cca882 
							
						 
					 
					
						
						
							
							Apply review suggestions  
						
						
						
						
					 
					
						2023-02-28 15:12:43 +01:00 
						 
				 
			
				
					
						
							
							
								knackebrot 
							
						 
					 
					
						
						
						
						
							
						
						
							aa99aaebc4 
							
						 
					 
					
						
						
							
							Add audio vbr calculation  
						
						
						
						
					 
					
						2023-02-26 22:37:01 +01:00 
						 
				 
			
				
					
						
							
							
								cvium 
							
						 
					 
					
						
						
						
						
							
						
						
							209edd38a4 
							
						 
					 
					
						
						
							
							refactor: simplify authz  
						
						
						
						
					 
					
						2023-02-09 13:51:37 +01:00 
						 
				 
			
				
					
						
							
							
								Shadowghost 
							
						 
					 
					
						
						
						
						
							
						
						
							f5f890e685 
							
						 
					 
					
						
						
							
							Migrate to file-scoped namespaces  
						
						
						
						
					 
					
						2023-02-02 18:50:33 +01:00 
						 
				 
			
				
					
						
							
							
								Shadowghost 
							
						 
					 
					
						
						
						
						
							
						
						
							ab96d1b7ad 
							
						 
					 
					
						
						
							
							Backport pull request  #9049  from jellyfin/release-10.8.z  
						
						... 
						
						
						
						Add more codecs requiring ffmpeg strict -2
Original-merge: 2a6e292153fa84f82400079030fef0a289719a21
Merged-by: Cody Robibero <cody@robibe.ro>
Backported-by: Joshua M. Boniface <joshua@boniface.me> 
						
						
					 
					
						2023-01-22 14:03:54 -05:00 
						 
				 
			
				
					
						
							
							
								Bond-009 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3a7a781ed9 
							
						 
					 
					
						
						
							
							Merge pull request  #9001  from Shadowghost/stereo-downmix  
						
						... 
						
						
						
						Fixes https://github.com/jellyfin/jellyfin/issues/1986  
						
						
					 
					
						2023-01-12 09:49:29 +01:00 
						 
				 
			
				
					
						
							
							
								Shadowghost 
							
						 
					 
					
						
						
						
						
							
						
						
							407c716f82 
							
						 
					 
					
						
						
							
							Add stereo downmix algorithm selection.  
						
						
						
						
					 
					
						2023-01-10 15:29:39 +01:00 
						 
				 
			
				
					
						
							
							
								David Fairbrother 
							
						 
					 
					
						
						
						
						
							
						
						
							4eeb522144 
							
						 
					 
					
						
						
							
							Add dts to list of audio codecs which require strict -2  
						
						... 
						
						
						
						Adds dts to the list of audio codecs where ffmpeg will throw asking us
to opt into experimental support. This is seen when the original content
is based on dts and we don't acopy using ffmpeg. 
						
						
					 
					
						2023-01-07 19:37:32 +00:00 
						 
				 
			
				
					
						
							
							
								Bond_009 
							
						 
					 
					
						
						
						
						
							
						
						
							52194f56b5 
							
						 
					 
					
						
						
							
							Replace != null with is not null  
						
						
						
						
					 
					
						2022-12-05 15:01:13 +01:00 
						 
				 
			
				
					
						
							
							
								Bond_009 
							
						 
					 
					
						
						
						
						
							
						
						
							c7d50d640e 
							
						 
					 
					
						
						
							
							Replace == null with is null  
						
						
						
						
					 
					
						2022-12-05 15:00:20 +01:00 
						 
				 
			
				
					
						
							
							
								Dominik 
							
						 
					 
					
						
						
						
						
							
						
						
							e8ae7e5c38 
							
						 
					 
					
						
						
							
							Do not delete segments when seeking  
						
						
						
						
					 
					
						2022-11-15 17:14:18 +01:00 
						 
				 
			
				
					
						
							
							
								Dominik 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							abcf9c4819 
							
						 
					 
					
						
						
							
							Simplify HLS file deletion  
						
						... 
						
						
						
						Co-authored-by: Claus Vium <cvium@users.noreply.github.com> 
						
						
					 
					
						2022-11-14 14:45:42 +01:00 
						 
				 
			
				
					
						
							
							
								Dominik 
							
						 
					 
					
						
						
						
						
							
						
						
							9f4f76b0ab 
							
						 
					 
					
						
						
							
							Remove segment wrapping  
						
						
						
						
					 
					
						2022-11-14 14:39:08 +01:00 
						 
				 
			
				
					
						
							
							
								Dominik 
							
						 
					 
					
						
						
						
						
							
						
						
							c2c182d099 
							
						 
					 
					
						
						
							
							Add support for ffmpeg's segment deletion and segment wrapping  
						
						
						
						
					 
					
						2022-11-14 10:13:17 +01:00 
						 
				 
			
				
					
						
							
							
								cvium 
							
						 
					 
					
						
						
						
						
							
						
						
							5dc30c6a6d 
							
						 
					 
					
						
						
							
							fix: use HttpContext and ClaimsPrincipal instead of IAuthorizationContext  
						
						
						
						
					 
					
						2022-10-06 13:57:47 +02:00 
						 
				 
			
				
					
						
							
							
								luz paz 
							
						 
					 
					
						
						
						
						
							
						
						
							9ec2870b10 
							
						 
					 
					
						
						
							
							Fix various typos  
						
						... 
						
						
						
						Found via `codespell -q 3 -S ./Emby.Server.Implementations/Localization -L allready,doesnt,inh,receivedfrom,whoknows` 
						
						
					 
					
						2022-08-15 06:48:34 -04:00 
						 
				 
			
				
					
						
							
							
								Joshua Boniface 
							
						 
					 
					
						
						
						
						
							
						
						
							d5ea136dc5 
							
						 
					 
					
						
						
							
							Backport pull request  #8174  from jellyfin/release-10.8.z  
						
						... 
						
						
						
						Disable auto inserted SW scaler for HW decoders
Authored-by: nyanmisaka <nst799610810@gmail.com>
Merged-by: Bond-009 <bond.009@outlook.com>
Original-merge: 7297431f23a0fa1ab5aa15df93d91096a09c4f21 
						
						
					 
					
						2022-08-01 14:25:45 -04:00 
						 
				 
			
				
					
						
							
							
								Joshua M. Boniface 
							
						 
					 
					
						
						
						
						
							
						
						
							9c97c533ef 
							
						 
					 
					
						
						
							
							Merge pull request  #7994  from nyanmisaka/fix-throttler  
						
						... 
						
						
						
						(cherry picked from commit a7d45b5d3aa5b16b0aeeece690396f91fb7b7e3e)
Signed-off-by: Joshua Boniface <joshua@boniface.me> 
						
						
					 
					
						2022-06-29 01:26:38 -04:00 
						 
				 
			
				
					
						
							
							
								Cody Robibero 
							
						 
					 
					
						
						
						
						
							
						
						
							b6a0fe3378 
							
						 
					 
					
						
						
							
							Merge pull request  #7911  from cvium/fix_keyframe_transcode  
						
						... 
						
						
						
						(cherry picked from commit 07b39655ebe2e96388ffbbecebeebb5284c26baf)
Signed-off-by: crobibero <cody@robibe.ro> 
						
						
					 
					
						2022-06-14 19:32:09 -04:00 
						 
				 
			
				
					
						
							
							
								Bond-009 
							
						 
					 
					
						
						
						
						
							
						
						
							c19c787273 
							
						 
					 
					
						
						
							
							Merge pull request  #7828  from nyanmisaka/fix-dovi-tonemap  
						
						... 
						
						
						
						Fix Dolby Vision profile 5 and 8 to SDR HW tone-mapping
(cherry picked from commit 8595a979a872c05d0d06f9b87ed1b56c693c267d)
Signed-off-by: crobibero <cody@robibe.ro> 
						
						
					 
					
						2022-06-10 23:43:17 -04:00 
						 
				 
			
				
					
						
							
							
								Bond-009 
							
						 
					 
					
						
						
						
						
							
						
						
							b1b83d8111 
							
						 
					 
					
						
						
							
							Merge pull request  #7718  from jellyfin/dovi-hevc-remux  
						
						... 
						
						
						
						(cherry picked from commit f7ef7d9eda71d42dce46c91f1398eccc0b4b1b6c)
Signed-off-by: crobibero <cody@robibe.ro> 
						
						
					 
					
						2022-05-20 18:30:57 -04:00 
						 
				 
			
				
					
						
							
							
								nyanmisaka 
							
						 
					 
					
						
						
						
						
							
						
						
							b2c58338f2 
							
						 
					 
					
						
						
							
							Fix the fMP4 HLS audio sync issue on Safari  
						
						
						
						
					 
					
						2022-03-09 21:28:58 +08:00 
						 
				 
			
				
					
						
							
							
								Bond-009 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2579b2db56 
							
						 
					 
					
						
						
							
							Merge pull request  #7137  from SenorSmartyPants/master  
						
						
						
						
					 
					
						2022-03-05 20:54:36 +01:00 
						 
				 
			
				
					
						
							
							
								Cody Robibero 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							34ee6d82fb 
							
						 
					 
					
						
						
							
							Merge pull request  #6600  from cvium/keyframe_extraction_v1  
						
						
						
						
					 
					
						2022-01-20 08:54:40 -07:00 
						 
				 
			
				
					
						
							
							
								Dmitry Lyzo 
							
						 
					 
					
						
						
						
						
							
						
						
							000b7ba62b 
							
						 
					 
					
						
						
							
							Fix maximum video resolution for dynamic HLS controller  
						
						
						
						
					 
					
						2022-01-16 21:42:04 +03:00 
						 
				 
			
				
					
						
							
							
								cvium 
							
						 
					 
					
						
						
						
						
							
						
						
							6ffa9539bb 
							
						 
					 
					
						
						
							
							Refactor and add scheduled task  
						
						
						
						
					 
					
						2022-01-11 23:30:30 +01:00 
						 
				 
			
				
					
						
							
							
								SenorSmartyPants 
							
						 
					 
					
						
						
						
						
							
						
						
							d5e7e75421 
							
						 
					 
					
						
						
							
							Remove unused httpContext parameter  
						
						
						
						
					 
					
						2022-01-08 19:53:53 -06:00 
						 
				 
			
				
					
						
							
							
								SenorSmartyPants 
							
						 
					 
					
						
						
						
						
							
						
						
							3ea54a8009 
							
						 
					 
					
						
						
							
							Remove isHeadRequest from GetStaticFile method signatures  
						
						
						
						
					 
					
						2022-01-07 18:21:48 -06:00