diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4ce38953d..361386622 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -442,12 +442,7 @@ if(${SRB2_CONFIG_HAVE_PNG} AND ${SRB2_CONFIG_HAVE_ZLIB}) set(SRB2_HAVE_PNG ON) add_definitions(-DHAVE_PNG) add_definitions(-D_LARGEFILE64_SOURCE) - set(SRB2_PNG_SOURCES apng.c) - set(SRB2_PNG_HEADERS apng.h) - prepend_sources(SRB2_PNG_SOURCES) - prepend_sources(SRB2_PNG_HEADERS) - source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS} - ${SRB2_PNG_SOURCES} ${SRB2_PNG_HEADERS}) + source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS}) else() message(WARNING "You have specified that PNG is available but it was not found. SRB2Kart may not compile correctly.") endif() diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk index 1b0bb5eca..427b5417f 100644 --- a/src/Makefile.d/features.mk +++ b/src/Makefile.d/features.mk @@ -51,8 +51,6 @@ endif ifdef LINUX opts+=-D_LARGEFILE64_SOURCE endif -opts+=-DHAVE_PNG -sources+=apng.c endif endif diff --git a/src/apng.c b/src/apng.c deleted file mode 100644 index 711024ee3..000000000 --- a/src/apng.c +++ /dev/null @@ -1,289 +0,0 @@ -/* -Copyright 2019, James R. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include -#include - -#include "apng.h" - -#define APNG_INFO_acTL 0x20000U - -#define APNG_WROTE_acTL 0x10000U - -struct apng_info_def -{ - png_uint_32 mode; - png_uint_32 valid; - - png_uint_32 num_frames; - png_uint_32 num_plays; - - long start_acTL;/* acTL is written here */ - - png_flush_ptr output_flush_fn; - apng_seek_ptr output_seek_fn; - apng_tell_ptr output_tell_fn; - - apng_set_acTL_ptr set_acTL_fn; -}; - -/* PROTOS (FUCK COMPILER) */ -void apng_seek (png_structp, apng_const_infop, size_t); -size_t apng_tell (png_structp, apng_const_infop); -#ifdef PNG_WRITE_FLUSH_SUPPORTED -void apng_flush (png_structp, apng_infop); -#ifdef PNG_STDIO_SUPPORTED -void apng_default_flush (png_structp); -#endif/* PNG_STDIO_SUPPORTED */ -#endif/* PNG_WRITE_FLUSH_SUPPORTED */ -#ifdef PNG_STDIO_SUPPORTED -void apng_default_seek (png_structp, size_t); -size_t apng_default_tell (png_structp); -#endif/* PNG_STDIO_SUPPORTED */ -void apng_write_IEND (png_structp); -void apng_write_acTL (png_structp, png_uint_32, png_uint_32); -#ifndef PNG_WRITE_APNG_SUPPORTED -png_uint_32 apng_set_acTL_dummy (png_structp, png_infop, - png_uint_32, png_uint_32); -#endif/* PNG_WRITE_APNG_SUPPORTED */ - -apng_infop -apng_create_info_struct (png_structp pngp) -{ - apng_infop ainfop; - (void)pngp; - if (( ainfop = calloc(1, sizeof (apng_info)) )) - { - apng_set_write_fn(pngp, ainfop, 0, 0, 0, 0, 0); - apng_set_set_acTL_fn(pngp, ainfop, 0); - } - return ainfop; -} - -void -apng_destroy_info_struct (png_structp pngp, apng_infopp ainfopp) -{ - (void)pngp; - if (!( pngp && ainfopp )) - return; - - free((*ainfopp)); -} - -void -apng_seek (png_structp pngp, apng_const_infop ainfop, size_t l) -{ - (*(ainfop->output_seek_fn))(pngp, l); -} - -size_t -apng_tell (png_structp pngp, apng_const_infop ainfop) -{ - return (*(ainfop->output_tell_fn))(pngp); -} - -#ifdef PNG_WRITE_FLUSH_SUPPORTED -void -apng_flush (png_structp pngp, apng_infop ainfop) -{ - if (ainfop->output_flush_fn) - (*(ainfop->output_flush_fn))(pngp); -} - -#ifdef PNG_STDIO_SUPPORTED -void -apng_default_flush (png_structp pngp) -{ - if (!( pngp )) - return; - - fflush((png_FILE_p)png_get_io_ptr); -} -#endif/* PNG_STDIO_SUPPORTED */ -#endif/* PNG_WRITE_FLUSH_SUPPORTED */ - -#ifdef PNG_STDIO_SUPPORTED -void -apng_default_seek (png_structp pngp, size_t l) -{ - if (!( pngp )) - return; - - if (fseek((png_FILE_p)png_get_io_ptr(pngp), (long)l, SEEK_SET) == -1) - png_error(pngp, "Seek Error"); -} - -size_t -apng_default_tell (png_structp pngp) -{ - long l; - - if (!( pngp )) - { - png_error(pngp, "Call to apng_default_tell with NULL pngp failed"); - } - - if (( l = ftell((png_FILE_p)png_get_io_ptr(pngp)) ) == -1) - png_error(pngp, "Tell Error"); - - return (size_t)l; -} -#endif/* PNG_STDIO_SUPPORTED */ - -void -apng_set_write_fn (png_structp pngp, apng_infop ainfop, png_voidp iop, - png_rw_ptr write_f, png_flush_ptr flush_f, - apng_seek_ptr seek_f, apng_tell_ptr tell_f) -{ - if (!( pngp && ainfop )) - return; - - png_set_write_fn(pngp, iop, write_f, flush_f); - -#ifdef PNG_WRITE_FLUSH_SUPPORTED -#ifdef PNG_STDIO_SUPPORTED - if (!flush_f) - ainfop->output_flush_fn = &apng_default_flush; - else -#endif/* PNG_STDIO_SUPPORTED */ - ainfop->output_flush_fn = flush_f; -#endif/* PNG_WRITE_FLUSH_SUPPORTED */ -#ifdef PNG_STDIO_SUPPORTED - if (!seek_f) - ainfop->output_seek_fn = &apng_default_seek; - else -#endif/* PNG_STDIO_SUPPORTED */ - ainfop->output_seek_fn = seek_f; -#ifdef PNG_STDIO_SUPPORTED - if (!seek_f) - ainfop->output_tell_fn = apng_default_tell; - else -#endif/* PNG_STDIO_SUPPORTED */ - ainfop->output_tell_fn = tell_f; -} - -void -apng_write_IEND (png_structp pngp) -{ - png_byte chunkc[] = "IEND"; - png_write_chunk(pngp, chunkc, 0, 0); -} - -void -apng_write_acTL (png_structp pngp, png_uint_32 frames, png_uint_32 plays) -{ - png_byte chunkc[] = "acTL"; - png_byte buf[8]; - png_save_uint_32(buf, frames); - png_save_uint_32(buf + 4, plays); - png_write_chunk(pngp, chunkc, buf, 8); -} - -png_uint_32 -apng_set_acTL (png_structp pngp, png_infop infop, apng_infop ainfop, - png_uint_32 frames, png_uint_32 plays) -{ - (void)pngp; - (void)infop; - if (!( pngp && infop && ainfop )) - return 0; - - ainfop->num_frames = frames; - ainfop->num_plays = plays; - - ainfop->valid |= APNG_INFO_acTL; - - return 1; -} - -void -apng_write_info_before_PLTE (png_structp pngp, png_infop infop, - apng_infop ainfop) -{ - if (!( pngp && infop && ainfop )) - return; - - png_write_info_before_PLTE(pngp, infop); - - if (( ainfop->valid & APNG_INFO_acTL )&&!( ainfop->mode & APNG_WROTE_acTL )) - { - ainfop->start_acTL = apng_tell(pngp, ainfop); - - apng_write_acTL(pngp, 0, 0); - /* modified for runtime dynamic linking */ - (*(ainfop->set_acTL_fn))(pngp, infop, PNG_UINT_31_MAX, 0); - - ainfop->mode |= APNG_WROTE_acTL; - } -} - -void -apng_write_info (png_structp pngp, png_infop infop, - apng_infop ainfop) -{ - apng_write_info_before_PLTE(pngp, infop, ainfop); - png_write_info(pngp, infop); -} - -void -apng_write_end (png_structp pngp, png_infop infop, apng_infop ainfop) -{ - (void)infop; - apng_write_IEND(pngp); - apng_seek(pngp, ainfop, ainfop->start_acTL); - apng_write_acTL(pngp, ainfop->num_frames, ainfop->num_plays); - -#ifdef PNG_WRITE_FLUSH_SUPPORTED -#ifdef PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED - apng_flush(pngp, infop); -#endif/* PNG_WRITE_FLUSH_SUPPORTED */ -#endif/* PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED */ -} - -#ifndef PNG_WRITE_APNG_SUPPORTED -png_uint_32 -apng_set_acTL_dummy (png_structp pngp, png_infop infop, - png_uint_32 frames, png_uint_32 plays) -{ - (void)pngp; - (void)infop; - (void)frames; - (void)plays; - return 0; -} -#endif/* PNG_WRITE_APNG_SUPPORTED */ - -/* Dynamic runtime linking capable! (Hopefully.) */ -void -apng_set_set_acTL_fn (png_structp pngp, apng_infop ainfop, - apng_set_acTL_ptr set_acTL_f) -{ - (void)pngp; - if (!ainfop->set_acTL_fn) -#ifndef PNG_WRITE_APNG_SUPPORTED - ainfop->set_acTL_fn = &apng_set_acTL_dummy; -#else - ainfop->set_acTL_fn = &png_set_acTL; -#endif/* PNG_WRITE_APNG_SUPPORTED */ - else - ainfop->set_acTL_fn = set_acTL_f; -} diff --git a/src/apng.h b/src/apng.h deleted file mode 100644 index 8be4708a8..000000000 --- a/src/apng.h +++ /dev/null @@ -1,78 +0,0 @@ -/* -Copyright 2019, James R. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef APNG_H -#define APNG_H - -#ifndef _LARGEFILE64_SOURCE -#define _LARGEFILE64_SOURCE -#endif - -#ifndef _LFS64_LARGEFILE -#define _LFS64_LARGEFILE -#endif - -#ifndef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 0 -#endif - -#include - -typedef struct apng_info_def apng_info; -typedef apng_info * apng_infop; -typedef const apng_info * apng_const_infop; -typedef apng_info * * apng_infopp; - -typedef void (*apng_seek_ptr)(png_structp, size_t); -typedef size_t (*apng_tell_ptr)(png_structp); - -typedef png_uint_32 (*apng_set_acTL_ptr)(png_structp, png_infop, - png_uint_32, png_uint_32); - -apng_infop apng_create_info_struct (png_structp png_ptr); - -void apng_destroy_info_struct (png_structp png_ptr, - apng_infopp info_ptr_ptr); - -/* Call the following functions in place of the libpng counterparts. */ - -png_uint_32 apng_set_acTL (png_structp png_ptr, png_infop info_ptr, - apng_infop ainfo_ptr, - png_uint_32 num_frames, png_uint_32 num_plays); - -void apng_write_info_before_PLTE (png_structp png_ptr, png_infop info_ptr, - apng_infop ainfo_ptr); -void apng_write_info (png_structp png_ptr, png_infop info_ptr, - apng_infop ainfo_ptr); - -void apng_write_end (png_structp png_ptr, png_infop info_ptr, - apng_infop ainfo_ptr); - -void apng_set_write_fn (png_structp png_ptr, apng_infop ainfo_ptr, - png_voidp io_ptr, - png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn, - apng_seek_ptr output_seek_fn, apng_tell_ptr output_tell_fn); - -void apng_set_set_acTL_fn (png_structp png_ptr, apng_infop ainfo_ptr, - apng_set_acTL_ptr set_acTL_fn); - -#endif/* APNG_H */ diff --git a/src/d_netcmd.c b/src/d_netcmd.c index de96bf150..d71e4f88a 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -850,12 +850,6 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_zlib_memory); CV_RegisterVar(&cv_zlib_strategy); CV_RegisterVar(&cv_zlib_window_bits); - // APNG variables - CV_RegisterVar(&cv_zlib_levela); - CV_RegisterVar(&cv_zlib_memorya); - CV_RegisterVar(&cv_zlib_strategya); - CV_RegisterVar(&cv_zlib_window_bitsa); - CV_RegisterVar(&cv_apng_delay); // GIF variables CV_RegisterVar(&cv_gif_optimize); CV_RegisterVar(&cv_gif_downscale); diff --git a/src/m_menudefs.c b/src/m_menudefs.c index d3d95a296..7e0dd10d8 100644 --- a/src/m_menudefs.c +++ b/src/m_menudefs.c @@ -1227,11 +1227,6 @@ static menuitem_t OP_ScreenshotOptionsMenu[] = {IT_STRING|IT_CVAR, NULL, "Region Optimizing", &cv_gif_optimize, 90}, {IT_STRING|IT_CVAR, NULL, "Downscaling", &cv_gif_downscale, 95}, - - {IT_STRING|IT_CVAR, NULL, "Memory Level", &cv_zlib_memorya, 90}, - {IT_STRING|IT_CVAR, NULL, "Compression Level", &cv_zlib_levela, 95}, - {IT_STRING|IT_CVAR, NULL, "Strategy", &cv_zlib_strategya, 100}, - {IT_STRING|IT_CVAR, NULL, "Window Size", &cv_zlib_window_bitsa, 105}, }; enum @@ -1241,11 +1236,8 @@ enum op_screenshot_capture = 10, op_screenshot_gif_start = 11, op_screenshot_gif_end = 12, - op_screenshot_apng_start = 13, - op_screenshot_apng_end = 16, }; - static menuitem_t OP_EraseDataMenu[] = { {IT_STRING | IT_CALL, NULL, "Erase Record Data", M_EraseData, 10}, @@ -2821,7 +2813,7 @@ void Screenshot_option_Onchange(void) void Moviemode_mode_Onchange(void) { INT32 i, cstart, cend; - for (i = op_screenshot_gif_start; i <= op_screenshot_apng_end; ++i) + for (i = op_screenshot_gif_start; i <= op_screenshot_gif_end; ++i) OP_ScreenshotOptionsMenu[i].status = IT_DISABLED; switch (cv_moviemode.value) @@ -2830,13 +2822,10 @@ void Moviemode_mode_Onchange(void) cstart = op_screenshot_gif_start; cend = op_screenshot_gif_end; break; - case MM_APNG: - cstart = op_screenshot_apng_start; - cend = op_screenshot_apng_end; - break; default: return; } + for (i = cstart; i <= cend; ++i) OP_ScreenshotOptionsMenu[i].status = IT_STRING|IT_CVAR; } diff --git a/src/m_misc.c b/src/m_misc.c index 9e7ec309e..9d88a1894 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -98,10 +98,6 @@ typedef off_t off64_t; #endif #ifdef PNG_WRITE_SUPPORTED #define USE_PNG // Only actually use PNG if write is supported. - #if defined (PNG_WRITE_APNG_SUPPORTED) //|| !defined(PNG_STATIC) - #include "apng.h" - #define USE_APNG - #endif // See hardware/hw_draw.c for a similar check to this one. #endif #endif @@ -110,7 +106,7 @@ static CV_PossibleValue_t screenshot_cons_t[] = {{0, "Default"}, {1, "HOME"}, {2 consvar_t cv_screenshot_option = {"screenshot_option", "Default", CV_SAVE|CV_CALL, screenshot_cons_t, Screenshot_option_Onchange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_screenshot_folder = {"screenshot_folder", "", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; -static CV_PossibleValue_t moviemode_cons_t[] = {{MM_GIF, "GIF"}, {MM_APNG, "aPNG"}, {MM_SCREENSHOT, "Screenshots"}, {0, NULL}}; +static CV_PossibleValue_t moviemode_cons_t[] = {{MM_GIF, "GIF"}, {MM_SCREENSHOT, "Screenshots"}, {0, NULL}}; consvar_t cv_moviemode = {"moviemode_mode", "GIF", CV_SAVE|CV_CALL, moviemode_cons_t, Moviemode_mode_Onchange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_movie_option = {"movie_option", "Default", CV_SAVE|CV_CALL, screenshot_cons_t, Moviemode_option_Onchange, 0, NULL, NULL, 0, 0, NULL}; @@ -147,13 +143,6 @@ static CV_PossibleValue_t zlib_window_bits_t[] = { {14, "16k"}, {15, "32k"}, {0, NULL}}; -static CV_PossibleValue_t apng_delay_t[] = { - {1, "1x"}, - {2, "1/2x"}, - {3, "1/3x"}, - {4, "1/4x"}, - {0, NULL}}; - // zlib memory usage is as follows: // (1 << (zlib_window_bits+2)) + (1 << (zlib_level+9)) consvar_t cv_zlib_memory = {"png_memory_level", "7", CV_SAVE, zlib_mem_level_t, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -161,12 +150,6 @@ consvar_t cv_zlib_level = {"png_compress_level", "(Optimal) 6", CV_SAVE, zlib_le consvar_t cv_zlib_strategy = {"png_strategy", "Normal", CV_SAVE, zlib_strategy_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_zlib_window_bits = {"png_window_size", "32k", CV_SAVE, zlib_window_bits_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_zlib_memorya = {"apng_memory_level", "(Max Memory) 9", CV_SAVE, zlib_mem_level_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_zlib_levela = {"apng_compress_level", "4", CV_SAVE, zlib_level_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_zlib_strategya = {"apng_strategy", "RLE", CV_SAVE, zlib_strategy_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_zlib_window_bitsa = {"apng_window_size", "32k", CV_SAVE, zlib_window_bits_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_apng_delay = {"apng_speed", "1/2x", CV_SAVE, apng_delay_t, NULL, 0, NULL, NULL, 0, 0, NULL}; - boolean takescreenshot = false; // Take a screenshot this tic moviemode_t moviemode = MM_OFF; @@ -201,30 +184,6 @@ INT32 M_MapNumber(char first, char second) // FILE INPUT / OUTPUT // ========================================================================== -// some libcs has no access function, make our own -#if 0 -int access(const char *path, int amode) -{ - int accesshandle = -1; - FILE *handle = NULL; - if (amode == 6) // W_OK|R_OK - handle = fopen(path, "r+"); - else if (amode == 4) // R_OK - handle = fopen(path, "r"); - else if (amode == 2) // W_OK - handle = fopen(path, "a+"); - else if (amode == 0) //F_OK - handle = fopen(path, "rb"); - if (handle) - { - accesshandle = 0; - fclose(handle); - } - return accesshandle; -} -#endif - - // // FIL_WriteFile // @@ -782,8 +741,6 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png char interfacetxt[] = #ifdef HAVE_SDL "SDL"; -#elif defined (_WINDOWS) - "DirectX"; #else "Unknown"; #endif @@ -869,265 +826,12 @@ static inline void M_PNGImage(png_structp png_ptr, png_infop png_info_ptr, PNG_C png_write_image(png_ptr, row_pointers); png_free(png_ptr, (png_voidp)row_pointers); } - -#ifdef USE_APNG -static png_structp apng_ptr = NULL; -static png_infop apng_info_ptr = NULL; -static apng_infop apng_ainfo_ptr = NULL; -static png_FILE_p apng_FILE = NULL; -static png_uint_32 apng_frames = 0; -#ifdef PNG_STATIC // Win32 build have static libpng -#define aPNG_set_acTL png_set_acTL -#define aPNG_write_frame_head png_write_frame_head -#define aPNG_write_frame_tail png_write_frame_tail -#else // outside libpng may not have apng support - -#ifndef PNG_WRITE_APNG_SUPPORTED // libpng header may not have apng patch - -#ifndef PNG_INFO_acTL -#define PNG_INFO_acTL 0x10000L -#endif -#ifndef PNG_INFO_fcTL -#define PNG_INFO_fcTL 0x20000L -#endif -#ifndef PNG_FIRST_FRAME_HIDDEN -#define PNG_FIRST_FRAME_HIDDEN 0x0001 -#endif -#ifndef PNG_DISPOSE_OP_NONE -#define PNG_DISPOSE_OP_NONE 0x00 -#endif -#ifndef PNG_DISPOSE_OP_BACKGROUND -#define PNG_DISPOSE_OP_BACKGROUND 0x01 -#endif -#ifndef PNG_DISPOSE_OP_PREVIOUS -#define PNG_DISPOSE_OP_PREVIOUS 0x02 -#endif -#ifndef PNG_BLEND_OP_SOURCE -#define PNG_BLEND_OP_SOURCE 0x00 -#endif -#ifndef PNG_BLEND_OP_OVER -#define PNG_BLEND_OP_OVER 0x01 -#endif -#ifndef PNG_HAVE_acTL -#define PNG_HAVE_acTL 0x4000 -#endif -#ifndef PNG_HAVE_fcTL -#define PNG_HAVE_fcTL 0x8000L -#endif - -#endif -typedef png_uint_32 (*P_png_set_acTL) (png_structp png_ptr, - png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays); -typedef void (*P_png_write_frame_head) (png_structp png_ptr, - png_infop info_ptr, png_bytepp row_pointers, - png_uint_32 width, png_uint_32 height, - png_uint_32 x_offset, png_uint_32 y_offset, - png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, - png_byte blend_op); - -typedef void (*P_png_write_frame_tail) (png_structp png_ptr, - png_infop info_ptr); -static P_png_set_acTL aPNG_set_acTL = NULL; -static P_png_write_frame_head aPNG_write_frame_head = NULL; -static P_png_write_frame_tail aPNG_write_frame_tail = NULL; -#endif - -static inline boolean M_PNGLib(void) -{ -#ifdef PNG_STATIC // Win32 build have static libpng - return true; -#else - static void *pnglib = NULL; - if (aPNG_set_acTL && aPNG_write_frame_head && aPNG_write_frame_tail) - return true; - if (pnglib) - return false; -#ifdef _WIN32 - pnglib = GetModuleHandleA("libpng.dll"); - if (!pnglib) - pnglib = GetModuleHandleA("libpng12.dll"); - if (!pnglib) - pnglib = GetModuleHandleA("libpng13.dll"); -#elif defined (HAVE_SDL) -#ifdef __APPLE__ - pnglib = hwOpen("libpng.dylib"); -#else - pnglib = hwOpen("libpng.so"); -#endif -#endif - if (!pnglib) - return false; -#ifdef HAVE_SDL - aPNG_set_acTL = hwSym("png_set_acTL", pnglib); - aPNG_write_frame_head = hwSym("png_write_frame_head", pnglib); - aPNG_write_frame_tail = hwSym("png_write_frame_tail", pnglib); -#endif -#ifdef _WIN32 - aPNG_set_acTL = GetProcAddress("png_set_acTL", pnglib); - aPNG_write_frame_head = GetProcAddress("png_write_frame_head", pnglib); - aPNG_write_frame_tail = GetProcAddress("png_write_frame_tail", pnglib); -#endif - return (aPNG_set_acTL && aPNG_write_frame_head && aPNG_write_frame_tail); -#endif -} - -static void M_PNGFrame(png_structp png_ptr, png_infop png_info_ptr, png_bytep png_buf) -{ - png_uint_32 pitch = png_get_rowbytes(png_ptr, png_info_ptr); - PNG_CONST png_uint_32 height = vid.height; - png_bytepp row_pointers = png_malloc(png_ptr, height* sizeof (png_bytep)); - png_uint_32 y; - png_uint_16 framedelay = (png_uint_16)cv_apng_delay.value; - - apng_frames++; - - for (y = 0; y < height; y++) - { - row_pointers[y] = png_buf; - png_buf += pitch; - } - -#ifndef PNG_STATIC - if (aPNG_write_frame_head) -#endif - aPNG_write_frame_head(apng_ptr, apng_info_ptr, row_pointers, - vid.width, /* width */ - height, /* height */ - 0, /* x offset */ - 0, /* y offset */ - framedelay, TICRATE,/* delay numerator and denominator */ - PNG_DISPOSE_OP_BACKGROUND, /* dispose */ - PNG_BLEND_OP_SOURCE /* blend */ - ); - - png_write_image(png_ptr, row_pointers); - -#ifndef PNG_STATIC - if (aPNG_write_frame_tail) -#endif - aPNG_write_frame_tail(apng_ptr, apng_info_ptr); - - png_free(png_ptr, (png_voidp)row_pointers); -} - -static void M_PNGfix_acTL(png_structp png_ptr, png_infop png_info_ptr, - apng_infop png_ainfo_ptr) -{ - apng_set_acTL(png_ptr, png_info_ptr, png_ainfo_ptr, apng_frames, 0); - -#ifndef NO_PNG_DEBUG - png_debug(1, "in png_write_acTL\n"); -#endif -} - -static boolean M_SetupaPNG(png_const_charp filename, png_bytep pal) -{ - apng_FILE = fopen(filename,"wb+"); // + mode for reading - if (!apng_FILE) - { - CONS_Debug(DBG_RENDER, "M_StartMovie: Error on opening %s for write\n", filename); - return false; - } - - apng_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, - PNG_error, PNG_warn); - if (!apng_ptr) - { - CONS_Debug(DBG_RENDER, "M_StartMovie: Error on initialize libpng\n"); - fclose(apng_FILE); - remove(filename); - return false; - } - - apng_info_ptr = png_create_info_struct(apng_ptr); - if (!apng_info_ptr) - { - CONS_Debug(DBG_RENDER, "M_StartMovie: Error on allocate for libpng\n"); - png_destroy_write_struct(&apng_ptr, NULL); - fclose(apng_FILE); - remove(filename); - return false; - } - - apng_ainfo_ptr = apng_create_info_struct(apng_ptr); - if (!apng_ainfo_ptr) - { - CONS_Debug(DBG_RENDER, "M_StartMovie: Error on allocate for apng\n"); - png_destroy_write_struct(&apng_ptr, &apng_info_ptr); - fclose(apng_FILE); - remove(filename); - return false; - } - - png_init_io(apng_ptr, apng_FILE); - -#ifdef PNG_SET_USER_LIMITS_SUPPORTED - png_set_user_limits(apng_ptr, MAXVIDWIDTH, MAXVIDHEIGHT); -#endif - - //png_set_filter(apng_ptr, 0, PNG_ALL_FILTERS); - - png_set_compression_level(apng_ptr, cv_zlib_levela.value); - png_set_compression_mem_level(apng_ptr, cv_zlib_memorya.value); - png_set_compression_strategy(apng_ptr, cv_zlib_strategya.value); - png_set_compression_window_bits(apng_ptr, cv_zlib_window_bitsa.value); - - M_PNGhdr(apng_ptr, apng_info_ptr, vid.width, vid.height, pal); - - M_PNGText(apng_ptr, apng_info_ptr, true); - - apng_set_set_acTL_fn(apng_ptr, apng_ainfo_ptr, aPNG_set_acTL); - - apng_set_acTL(apng_ptr, apng_info_ptr, apng_ainfo_ptr, PNG_UINT_31_MAX, 0); - - apng_write_info(apng_ptr, apng_info_ptr, apng_ainfo_ptr); - - apng_frames = 0; - - return true; -} -#endif #endif // ========================================================================== // MOVIE MODE // ========================================================================== #if NUMSCREENS > 2 -static inline moviemode_t M_StartMovieAPNG(const char *pathname) -{ -#ifdef USE_APNG - UINT8 *palette; - const char *freename = NULL; - boolean ret = false; - - if (!M_PNGLib()) - { - CONS_Alert(CONS_ERROR, "Couldn't create aPNG: libpng not found\n"); - return MM_OFF; - } - - if (!(freename = Newsnapshotfile(pathname,"png"))) - { - CONS_Alert(CONS_ERROR, "Couldn't create aPNG: no slots open in %s\n", pathname); - return MM_OFF; - } - - if (rendermode == render_soft) M_CreateScreenShotPalette(); - ret = M_SetupaPNG(va(pandf,pathname,freename), (palette = screenshot_palette)); - - if (!ret) - { - CONS_Alert(CONS_ERROR, "Couldn't create aPNG: error creating %s in %s\n", freename, pathname); - return MM_OFF; - } - return MM_APNG; -#else - // no APNG support exists - (void)pathname; - CONS_Alert(CONS_ERROR, "Couldn't create aPNG: this build lacks aPNG support\n"); - return MM_OFF; -#endif -} static inline moviemode_t M_StartMovieGIF(const char *pathname) { @@ -1186,9 +890,6 @@ void M_StartMovie(void) case MM_GIF: moviemode = M_StartMovieGIF(pathname); break; - case MM_APNG: - moviemode = M_StartMovieAPNG(pathname); - break; case MM_SCREENSHOT: moviemode = MM_SCREENSHOT; break; @@ -1196,14 +897,10 @@ void M_StartMovie(void) return; } - if (moviemode == MM_APNG) - CONS_Printf(M_GetText("Movie mode enabled (%s).\n"), "aPNG"); - else if (moviemode == MM_GIF) + if (moviemode == MM_GIF) CONS_Printf(M_GetText("Movie mode enabled (%s).\n"), "GIF"); else if (moviemode == MM_SCREENSHOT) CONS_Printf(M_GetText("Movie mode enabled (%s).\n"), "screenshots"); - - //singletics = (moviemode != MM_OFF); #endif } @@ -1226,44 +923,6 @@ void M_SaveFrame(void) case MM_GIF: GIF_frame(); return; - case MM_APNG: -#ifdef USE_APNG - { - UINT8 *linear = NULL; - if (!apng_FILE) // should not happen!! - { - moviemode = MM_OFF; - return; - } - - if (rendermode == render_soft) - { - // munge planar buffer to linear - linear = vid.screens[2]; - I_ReadScreen(linear, 1); - } -#ifdef HWRENDER - else if (rendermode == render_opengl) - { - linear = HWR_GetScreenshot(1); - } -#endif - M_PNGFrame(apng_ptr, apng_info_ptr, (png_bytep)linear); -#ifdef HWRENDER - if (rendermode != render_soft && linear) - free(linear); -#endif - - if (apng_frames == PNG_UINT_31_MAX) - { - CONS_Alert(CONS_NOTICE, M_GetText("Max movie size reached\n")); - M_StopMovie(); - } - } -#else - moviemode = MM_OFF; -#endif - return; default: return; } @@ -1279,27 +938,6 @@ void M_StopMovie(void) if (!GIF_close()) return; break; - case MM_APNG: -#ifdef USE_APNG - if (!apng_FILE) - return; - - if (apng_frames) - { - M_PNGfix_acTL(apng_ptr, apng_info_ptr, apng_ainfo_ptr); - apng_write_end(apng_ptr, apng_info_ptr, apng_ainfo_ptr); - } - - png_destroy_write_struct(&apng_ptr, &apng_info_ptr); - - fclose(apng_FILE); - apng_FILE = NULL; - CONS_Printf("aPNG closed; wrote %u frames\n", (UINT32)apng_frames); - apng_frames = 0; - break; -#else - return; -#endif case MM_SCREENSHOT: break; default: diff --git a/src/m_misc.h b/src/m_misc.h index 2cdad977a..ab7c8986f 100644 --- a/src/m_misc.h +++ b/src/m_misc.h @@ -27,7 +27,6 @@ extern "C" { typedef enum { MM_OFF = 0, - MM_APNG, MM_GIF, MM_SCREENSHOT } moviemode_t; @@ -36,8 +35,6 @@ extern moviemode_t moviemode; extern consvar_t cv_screenshot_option, cv_screenshot_folder; extern consvar_t cv_moviemode, cv_movie_folder, cv_movie_option; extern consvar_t cv_zlib_memory, cv_zlib_level, cv_zlib_strategy, cv_zlib_window_bits; -extern consvar_t cv_zlib_memorya, cv_zlib_levela, cv_zlib_strategya, cv_zlib_window_bitsa; -extern consvar_t cv_apng_delay; void M_StartMovie(void); void M_SaveFrame(void); diff --git a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj index bbdbff9ed..a8b67f1b2 100644 --- a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj +++ b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj @@ -40,7 +40,6 @@ 1E44AF0D0B67CDE900BAD059 /* m_fixed.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AEFE0B67CDE900BAD059 /* m_fixed.c */; }; 1E44AF0F0B67CDE900BAD059 /* m_menu.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AF000B67CDE900BAD059 /* m_menu.c */; }; 1E44AF110B67CDE900BAD059 /* m_misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AF020B67CDE900BAD059 /* m_misc.c */; }; - 1E44AF110B67CDE900BAD059 /* apng.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AF020B67CDE900BAD059 /* apng.c */; }; 1E44AF130B67CDE900BAD059 /* m_random.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AF040B67CDE900BAD059 /* m_random.c */; }; 1E44AF1A0B67CE2A00BAD059 /* info.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AF180B67CE2A00BAD059 /* info.c */; }; 1E44AF1E0B67CE3600BAD059 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AF1C0B67CE3600BAD059 /* md5.c */; }; @@ -242,9 +241,7 @@ 1E44AF000B67CDE900BAD059 /* m_menu.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = m_menu.c; path = ../../m_menu.c; sourceTree = SOURCE_ROOT; }; 1E44AF010B67CDE900BAD059 /* m_menu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = m_menu.h; path = ../../m_menu.h; sourceTree = SOURCE_ROOT; }; 1E44AF020B67CDE900BAD059 /* m_misc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = m_misc.c; path = ../../m_misc.c; sourceTree = SOURCE_ROOT; }; - 1E44AF020B67CDE900BAD059 /* apng.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = apng.c; path = ../../m_misc.c; sourceTree = SOURCE_ROOT; }; 1E44AF030B67CDE900BAD059 /* m_misc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = m_misc.h; path = ../../m_misc.h; sourceTree = SOURCE_ROOT; }; - 1E44AF020B67CDE900BAD059 /* apng.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = apng.h; path = ../../m_misc.c; sourceTree = SOURCE_ROOT; }; 1E44AF040B67CDE900BAD059 /* m_random.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = m_random.c; path = ../../m_random.c; sourceTree = SOURCE_ROOT; }; 1E44AF050B67CDE900BAD059 /* m_random.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = m_random.h; path = ../../m_random.h; sourceTree = SOURCE_ROOT; }; 1E44AF060B67CDE900BAD059 /* m_swap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = m_swap.h; path = ../../m_swap.h; sourceTree = SOURCE_ROOT; }; @@ -661,8 +658,6 @@ 1E44AEFF0B67CDE900BAD059 /* m_fixed.h */, 1E44AF020B67CDE900BAD059 /* m_misc.c */, 1E44AF030B67CDE900BAD059 /* m_misc.h */, - 1E44AF020B67CDE900BAD059 /* apng.c */, - 1E44AF030B67CDE900BAD059 /* apng.h */, 676BB51C0E0DE06100C95963 /* m_queue.c */, 676BB51D0E0DE06100C95963 /* m_queue.h */, 1E44AF040B67CDE900BAD059 /* m_random.c */,