14575 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Logan Aerl Arias	30140e42cc	add ffmpeg-libavformat, ffmpeg-libswscale, and ffmpeg-dev packages to Apline build	2024-01-06 19:59:44 +00:00
LJ Sonic	59b2764758	Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into movie ... # Conflicts: # .gitlab-ci.yml # src/Makefile.d/win32.mk # src/Sourcefile # src/lua_maplib.c # src/r_main.c	2024-01-04 16:25:17 +01:00
LJ Sonic	f0a6ec00ef	Fix movie audio stuttering during pauses and lagspikes	2023-11-29 18:31:33 +01:00
LJ Sonic	654c07f3f0	Use audio samples instead of PTS	2023-11-28 20:22:44 +01:00
LJ Sonic	6fd27005c3	Fix non-44100Hz movie audio	2023-11-28 20:20:58 +01:00
LJ Sonic	a7ea2e6ddb	Refactor GetAudioFrameEndPTS	2023-11-25 18:14:58 +01:00
LJ Sonic	7337fe94c8	Fix bruh moment	2023-11-25 12:41:48 +01:00
LJ Sonic	e3861886c2	Sanitise Lua movie API	2023-11-22 17:23:15 +01:00
LJ Sonic	975b996580	Use milliseconds instead of tics for the movie API	2023-11-22 17:22:35 +01:00
LJ Sonic	a52e139f28	Replace magic numbers with constants	2023-11-21 17:37:47 +01:00
LJ Sonic	63a0a2006d	Make seeking more reliable	2023-11-21 17:00:35 +01:00
LJ Sonic	83e15a47ca	Split seeking API into two functions	2023-11-18 12:18:42 +01:00
LJ Sonic	65427ca9ad	Use TICRATE instead of 35	2023-11-17 20:49:06 +01:00
LJ Sonic	3ae01e3c19	Resize movie middle textures in OpenGL	2023-11-17 20:42:48 +01:00
LJ Sonic	74adbb5510	Only stop music after stopping movie if it was movie music	2023-11-17 00:00:03 +01:00
LJ Sonic	8a45dfb201	Make movie volume more granular	2023-11-16 21:52:42 +01:00
LJ Sonic	39d2941020	Expose movie.dimensions() to Lua	2023-11-16 19:51:15 +01:00
LJ Sonic	ad70fe5da1	Reorganise movie playback functions	2023-11-16 19:29:08 +01:00
LJ Sonic	29cb3a12ff	Uninitialise decoding worker in a function	2023-11-16 18:34:08 +01:00
LJ Sonic	91f5741c21	Initialise decoding worker in a function	2023-11-16 17:54:14 +01:00
LJ Sonic	6927e98871	Add DequeueWholeBufferIntoBuffer	2023-11-16 17:28:36 +01:00
LJ Sonic	e747803c02	Fix next frame ID not being protected	2023-11-16 17:15:48 +01:00
LJ Sonic	a01ed01c3d	Remove useless comments	2023-11-16 16:35:07 +01:00
LJ Sonic	d2d78d923b	Lock mutex during movie frame clearing	2023-11-16 16:27:45 +01:00
LJ Sonic	00f8cadc2d	Fix movie sometimes breaking after renderer change	2023-11-16 16:13:12 +01:00
LJ Sonic	6e73c76f13	Isolate decoding worker into a separate struct	2023-11-16 16:08:48 +01:00
LJ Sonic	bc6c0d3774	Remove unused field	2023-11-16 00:23:35 +01:00
LJ Sonic	b2d22f708e	Do not lock mutex during colorspace conversion and resampling	2023-11-16 00:19:23 +01:00
LJ Sonic	785af8d56f	Cleanup	2023-11-16 00:00:46 +01:00
LJ Sonic	ea273676bf	Fix potential stray frame after flushing buffer	2023-11-15 23:52:21 +01:00
LJ Sonic	c16627037c	Account for movie sprites in R_CheckSpriteVisible	2023-11-15 21:07:24 +01:00
LJ Sonic	6af5d5fa3e	Handle renderer switching when a movie is playing	2023-11-15 20:47:37 +01:00
LJ Sonic	81e55bcdea	Refactor movie decoding	2023-11-15 20:18:57 +01:00
LJ Sonic	5a1540808f	Implement movie rendering in software sprites	2023-11-15 16:20:58 +01:00
LJ Sonic	8ce4429689	Fix crash when freeing movie in software renderer	2023-11-15 16:18:39 +01:00
LJ Sonic	556d4b5b4e	Only allocate image data used by the current renderer	2023-11-14 23:33:31 +01:00
LJ Sonic	1f41020781	Use union for frame image types	2023-11-14 20:53:54 +01:00
LJ Sonic	df56769714	Rename Movie_GetBytesPerPatchColumn	2023-11-14 20:44:43 +01:00
LJ Sonic	105eaf6156	Cleanup MovieDecode_Update	2023-11-14 20:02:26 +01:00
LJ Sonic	49aa12b262	Add comment	2023-11-14 19:13:35 +01:00
LJ Sonic	e0fb405d6f	Add restrict keyword for movie patch conversion	2023-11-14 19:10:54 +01:00
LJ Sonic	68a7bb0285	Implement software rendering for movie playback	2023-11-14 19:03:46 +01:00
LJ Sonic	3e52739830	Fix typo	2023-11-14 16:50:01 +01:00
LJ Sonic	263011bae3	Rename node_t to bspnode_t	2023-11-14 16:48:50 +01:00
Alam Ed Arias	9a0dd2359d	Libs: rename FFmpeg Win32 lib to lib32	2023-11-09 14:08:25 -05:00
Alam Ed Arias	88fd5ca790	Makefile: fix Win32.mk to have the right vars for the 5 FFmpeg libraries	2023-11-09 13:38:38 -05:00
Alam Ed Arias	c284094305	Makefile: versions.mk ... Do not error on using deprecated declarations	2023-11-09 11:56:18 -05:00
Alam Ed Arias	467a29a8e5	Debain doesn't package a ffmpeg.pc, use new pkg-config files	2023-11-09 11:54:44 -05:00
Alam Ed Arias	4ff5dc7684	GitLab CI: also need libswscale-dev for FFmpeg support	2023-11-09 09:38:30 -05:00
Alam Ed Arias	96ff675efc	Merge branch 'master' into movie	2023-11-09 09:29:42 -05:00