1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 00:02:13 +00:00
mpv/video/out/vo_image.c
wm4 4b91861b67 video: fix bogus uses of mp_image.w/width
mp_image has this confusing distinction between the w/h and width/height
fields. w/h are the actual width and height, while width/height have a
very special meaning inside the video filter code: it's the actually
allocated width, which is also used for stride padding.

Screenshot related code abused the w/h fields to store the aspect
corrected size. Some code confused the role of w/h and width/height.

Fix these issues. For aspect corrected size, display_w/h are used, while
width/height should never be used outside vf.c internals and related
code.

This also fixes an actual bug when taking screenshots of anamorphic
video with vf_screenshot, as well as using vo_image with such videos.
2012-11-21 19:58:51 +01:00

197 lines
4.9 KiB
C

/*
* This file is part of mplayer.
*
* mplayer is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* mplayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with mplayer. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include <stdbool.h>
#include <sys/stat.h>
#include <libswscale/swscale.h>
#include "config.h"
#include "core/bstr.h"
#include "osdep/io.h"
#include "core/path.h"
#include "talloc.h"
#include "core/mp_msg.h"
#include "video/out/vo.h"
#include "video/csputils.h"
#include "video/vfcap.h"
#include "video/mp_image.h"
#include "video/fmt-conversion.h"
#include "video/image_writer.h"
#include "core/m_option.h"
struct priv {
struct image_writer_opts *opts;
char *outdir;
int frame;
uint32_t d_width;
uint32_t d_height;
struct mp_csp_details colorspace;
};
static bool checked_mkdir(const char *buf)
{
mp_msg(MSGT_VO, MSGL_INFO, "[vo_image] Creating output directory '%s'...\n",
buf);
if (mkdir(buf, 0755) < 0) {
char *errstr = strerror(errno);
if (errno == EEXIST) {
struct stat stat_p;
if (mp_stat(buf, &stat_p ) == 0 && S_ISDIR(stat_p.st_mode))
return true;
}
mp_msg(MSGT_VO, MSGL_ERR, "[vo_image] Error creating output directory"
": %s\n", errstr);
return false;
}
return true;
}
static int config(struct vo *vo, uint32_t width, uint32_t height,
uint32_t d_width, uint32_t d_height, uint32_t flags,
uint32_t format)
{
struct priv *p = vo->priv;
p->d_width = d_width;
p->d_height = d_height;
if (p->outdir && vo->config_count < 1)
if (!checked_mkdir(p->outdir))
return -1;
return 0;
}
static void check_events(struct vo *vo)
{
}
static void draw_osd(struct vo *vo, struct osd_state *osd)
{
}
static void flip_page(struct vo *vo)
{
}
static uint32_t draw_image(struct vo *vo, mp_image_t *mpi)
{
struct priv *p = vo->priv;
mp_image_t img = *mpi;
img.display_w = p->d_width;
img.display_h = p->d_height;
mp_image_set_colorspace_details(&img, &p->colorspace);
void *t = talloc_new(NULL);
char *filename = talloc_asprintf(t, "%08d.%s", p->frame,
image_writer_file_ext(p->opts));
if (p->outdir && strlen(p->outdir))
filename = mp_path_join(t, bstr0(p->outdir), bstr0(filename));
mp_msg(MSGT_VO, MSGL_STATUS, "\nSaving %s\n", filename);
write_image(&img, p->opts, filename);
talloc_free(t);
(p->frame)++;
return VO_TRUE;
}
static int query_format(struct vo *vo, uint32_t fmt)
{
enum PixelFormat av_format = imgfmt2pixfmt(fmt);
// NOTE: accept everything that can be converted by swscale. screenshot.c
// always wants RGB (at least for now), but it probably doesn't matter
// whether we or screenshot.c do the conversion.
if (av_format != PIX_FMT_NONE && sws_isSupportedInput(av_format))
return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
return 0;
}
static void uninit(struct vo *vo)
{
}
static int preinit(struct vo *vo, const char *arg)
{
return 0;
}
static int control(struct vo *vo, uint32_t request, void *data)
{
struct priv *p = vo->priv;
switch (request) {
case VOCTRL_QUERY_FORMAT:
return query_format(vo, *(uint32_t *)data);
case VOCTRL_DRAW_IMAGE:
return draw_image(vo, data);
case VOCTRL_SET_YUV_COLORSPACE:
p->colorspace = *(struct mp_csp_details *)data;
return true;
case VOCTRL_GET_YUV_COLORSPACE:
*(struct mp_csp_details *)data = p->colorspace;
return true;
// prevent random frame stepping by frontend
case VOCTRL_REDRAW_FRAME:
return true;
}
return VO_NOTIMPL;
}
#undef OPT_BASE_STRUCT
#define OPT_BASE_STRUCT struct priv
const struct vo_driver video_out_image =
{
.is_new = true,
.info = &(const vo_info_t) {
"Write video frames to image files",
"image",
"wm4",
""
},
.priv_size = sizeof(struct priv),
.priv_defaults = &(const struct priv) {
.colorspace = MP_CSP_DETAILS_DEFAULTS,
},
.options = (const struct m_option[]) {
OPT_SUBSTRUCT(opts, image_writer_conf, M_OPT_MERGE),
OPT_STRING("outdir", outdir, 0),
{0},
},
.preinit = preinit,
.config = config,
.control = control,
.draw_osd = draw_osd,
.flip_page = flip_page,
.check_events = check_events,
.uninit = uninit,
};