diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index b54e54e6df32174e86cd579c012c822481ed7523..0acbec928ad524f5d47708390c8972fba0384b86 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -666,6 +666,7 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_zlib_strategya);
CV_RegisterVar(&cv_zlib_window_bitsa);
CV_RegisterVar(&cv_apng_delay);
+ CV_RegisterVar(&cv_apng_downscale);
// GIF variables
CV_RegisterVar(&cv_gif_optimize);
CV_RegisterVar(&cv_gif_downscale);
diff --git a/src/m_menu.c b/src/m_menu.c
index 25a0c5e94424a9a1e477e9aee17940d2263003e1..1de5bc4bb5e7426fed541f548fb33bc65c7dfc8d 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1549,18 +1549,19 @@ static menuitem_t OP_ScreenshotOptionsMenu[] =
{IT_STRING|IT_CVAR, NULL, "Window Size", &cv_zlib_window_bits, 57},
{IT_HEADER, NULL, "Movie Mode (F9)", NULL, 64},
- {IT_STRING|IT_CVAR, NULL, "Storage Location", &cv_movie_option, 70},
- {IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Custom Folder", &cv_movie_folder, 75},
- {IT_STRING|IT_CVAR, NULL, "Capture Mode", &cv_moviemode, 90},
+ {IT_STRING|IT_CVAR, NULL, "Storage Location", &cv_movie_option, 70},
+ {IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Custom Folder", &cv_movie_folder, 75},
+ {IT_STRING|IT_CVAR, NULL, "Capture Mode", &cv_moviemode, 90},
- {IT_STRING|IT_CVAR, NULL, "Region Optimizing", &cv_gif_optimize, 95},
- {IT_STRING|IT_CVAR, NULL, "Downscaling", &cv_gif_downscale, 100},
+ {IT_STRING|IT_CVAR, NULL, "Downscaling", &cv_gif_downscale, 95},
+ {IT_STRING|IT_CVAR, NULL, "Region Optimizing", &cv_gif_optimize, 100},
{IT_STRING|IT_CVAR, NULL, "Local Color Table", &cv_gif_localcolortable, 105},
- {IT_STRING|IT_CVAR, NULL, "Memory Level", &cv_zlib_memorya, 95},
- {IT_STRING|IT_CVAR, NULL, "Compression Level", &cv_zlib_levela, 100},
- {IT_STRING|IT_CVAR, NULL, "Strategy", &cv_zlib_strategya, 105},
- {IT_STRING|IT_CVAR, NULL, "Window Size", &cv_zlib_window_bitsa, 110},
+ {IT_STRING|IT_CVAR, NULL, "Downscaling", &cv_apng_downscale, 95},
+ {IT_STRING|IT_CVAR, NULL, "Memory Level", &cv_zlib_memorya, 100},
+ {IT_STRING|IT_CVAR, NULL, "Compression Level", &cv_zlib_levela, 105},
+ {IT_STRING|IT_CVAR, NULL, "Strategy", &cv_zlib_strategya, 110},
+ {IT_STRING|IT_CVAR, NULL, "Window Size", &cv_zlib_window_bitsa, 115},
};
enum
@@ -1573,7 +1574,7 @@ enum
op_screenshot_gif_start = 13,
op_screenshot_gif_end = 15,
op_screenshot_apng_start = 16,
- op_screenshot_apng_end = 19,
+ op_screenshot_apng_end = 20,
};
static menuitem_t OP_EraseDataMenu[] =
diff --git a/src/m_misc.c b/src/m_misc.c
index d97d8f94be36972a82880f79316ac8d2f7149131..ad2d133ab1dd8e6f743c4c2bab8adecd35d699e7 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -163,6 +163,9 @@ consvar_t cv_zlib_levela = CVAR_INIT ("apng_compress_level", "4", CV_SAVE, zlib_
consvar_t cv_zlib_strategya = CVAR_INIT ("apng_strategy", "RLE", CV_SAVE, zlib_strategy_t, NULL);
consvar_t cv_zlib_window_bitsa = CVAR_INIT ("apng_window_size", "32k", CV_SAVE, zlib_window_bits_t, NULL);
consvar_t cv_apng_delay = CVAR_INIT ("apng_speed", "1x", CV_SAVE, apng_delay_t, NULL);
+consvar_t cv_apng_downscale = CVAR_INIT ("apng_downscale", "On", CV_SAVE, CV_OnOff, NULL);
+
+static boolean apng_downscale = false; // So nobody can do something dumb like changing cvars mid output
boolean takescreenshot = false; // Take a screenshot this tic
@@ -981,25 +984,38 @@ static inline boolean M_PNGLib(void)
static void M_PNGFrame(png_structp png_ptr, png_infop png_info_ptr, png_bytep png_buf)
{
+ png_uint_16 downscale = apng_downscale ? vid.dupx : 1;
+
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_CONST png_uint_32 width = vid.width / downscale;
+ PNG_CONST png_uint_32 height = vid.height / downscale;
+ png_bytepp row_pointers = png_malloc(png_ptr, height * sizeof (png_bytep));
+ png_uint_32 x, 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;
+ row_pointers[y] = malloc(pitch * sizeof(png_byte));
+ for (x = 0; x < width; x++)
+ row_pointers[y][x] = png_buf[x * downscale];
+ png_buf += pitch * (downscale * downscale);
}
+ //for (x = 0; x < width; x++)
+ //{
+ // printf("%d", x);
+ // row_pointers[y][x] = 0;
+ //}
+ /* row_pointers[y] = calloc(1, sizeof(png_bytep));
+ png_buf += pitch * 2;
+ }*/
#ifndef PNG_STATIC
if (aPNG_write_frame_head)
#endif
aPNG_write_frame_head(apng_ptr, apng_info_ptr, row_pointers,
- vid.width, /* width */
+ width, /* width */
height, /* height */
0, /* x offset */
0, /* y offset */
@@ -1030,6 +1046,12 @@ static void M_PNGfix_acTL(png_structp png_ptr, png_infop png_info_ptr,
static boolean M_SetupaPNG(png_const_charp filename, png_bytep pal)
{
+ png_uint_16 downscale;
+
+ apng_downscale = (!!cv_apng_downscale.value);
+
+ downscale = apng_downscale ? vid.dupx : 1;
+
apng_FILE = fopen(filename,"wb+"); // + mode for reading
if (!apng_FILE)
{
@@ -1080,7 +1102,7 @@ static boolean M_SetupaPNG(png_const_charp filename, png_bytep pal)
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_PNGhdr(apng_ptr, apng_info_ptr, vid.width / downscale, vid.height / downscale, pal);
M_PNGText(apng_ptr, apng_info_ptr, true);
diff --git a/src/m_misc.h b/src/m_misc.h
index dbded37d0a47fdc81c0488098e5bf7ac8e677143..c5ef9f9f2548e339ef76e96ae02f835b82dec23c 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -33,7 +33,7 @@ extern consvar_t cv_screenshot_option, cv_screenshot_folder, cv_screenshot_color
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;
+extern consvar_t cv_apng_delay, cv_apng_downscale;
void M_StartMovie(void);
void M_SaveFrame(void);