RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-16 20:27:23 +00:00
Code Issues Releases Wiki Activity

screenshot: fix libav API use (pix_fmt and some other things)

Browse Source 
Libavcodec started checking that avctx->pix_fmt is set when opening
an encoder. The existing code (originally from vf_screenshot.c) only
set it afterwards, which now made screenshots fail. Fix the code to
set parameters before calling avcodec_open2().

Also fix some minor things, which seems to make it work for other
encoders. This could be used to add more libavcodec based image
writers. Fix memory leak (missing av_free(avctx)).
This commit is contained in:
wm4 2012-02-16 17:30:22 +01:00 committed by Uoti Urpala
parent da52c9400d
commit e796c7495c
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
screenshot.c
View File

@ -75,6 +75,13 @@ static int write_png(screenshot_ctx *ctx, struct mp_image *image)
avctx = avcodec_alloc_context3(png_codec); avctx = avcodec_alloc_context3(png_codec);
if (!avctx) if (!avctx)
goto print_open_fail; goto print_open_fail;
avctx->time_base = AV_TIME_BASE_Q;
avctx->width = image->width;
avctx->height = image->height;
avctx->pix_fmt = PIX_FMT_RGB24;
avctx->compression_level = 0;
if (avcodec_open2(avctx, png_codec, NULL) < 0) { if (avcodec_open2(avctx, png_codec, NULL) < 0) {
print_open_fail: print_open_fail:
mp_msg(MSGT_CPLAYER, MSGL_INFO, "Could not open libavcodec PNG encoder" mp_msg(MSGT_CPLAYER, MSGL_INFO, "Could not open libavcodec PNG encoder"
@ -82,26 +89,23 @@ static int write_png(screenshot_ctx *ctx, struct mp_image *image)
goto error_exit; goto error_exit;
} }
avctx->width = image->width;
avctx->height = image->height;
avctx->pix_fmt = PIX_FMT_RGB24;
avctx->compression_level = 0;
size_t outbuffer_size = image->width * image->height * 3 * 2; size_t outbuffer_size = image->width * image->height * 3 * 2;
outbuffer = malloc(outbuffer_size); outbuffer = malloc(outbuffer_size);
if (!outbuffer) if (!outbuffer)
goto error_exit; goto error_exit;
AVFrame pic; AVFrame pic;
pic.data[0] = image->planes[0]; avcodec_get_frame_defaults(&pic);
pic.linesize[0] = image->stride[0]; for (int n = 0; n < 4; n++) {
pic.data[n] = image->planes[n];
pic.linesize[n] = image->stride[n];
}
int size = avcodec_encode_video(avctx, outbuffer, outbuffer_size, &pic); int size = avcodec_encode_video(avctx, outbuffer, outbuffer_size, &pic);
if (size < 1) if (size < 1)
goto error_exit; goto error_exit;
fp = fopen(fname, "wb"); fp = fopen(fname, "wb");
if (fp == NULL) { if (fp == NULL) {
avcodec_close(avctx);
mp_msg(MSGT_CPLAYER, MSGL_ERR, "\nPNG Error opening %s for writing!\n", mp_msg(MSGT_CPLAYER, MSGL_ERR, "\nPNG Error opening %s for writing!\n",
fname); fname);
goto error_exit; goto error_exit;
@ -117,6 +121,7 @@ static int write_png(screenshot_ctx *ctx, struct mp_image *image)
error_exit: error_exit:
if (avctx) if (avctx)
avcodec_close(avctx); avcodec_close(avctx);
av_free(avctx);
if (fp) if (fp)
fclose(fp); fclose(fp);
free(outbuffer); free(outbuffer);