diff options
author | Uoti Urpala <uau@mplayer2.org> | 2011-11-25 23:59:23 +0200 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2011-11-25 23:59:23 +0200 |
commit | 8d6fc26bb982c5ecb7dbe4c20d51dec47f82abbf (patch) | |
tree | 60e7fca2028093bf454f0d62bd96b40c3e4ab7a4 /libmpcodecs | |
parent | 9fae75b81ce2eb475db7652083b388e704833a72 (diff) | |
parent | 3215ec05fe27b1e07c863aadf4402c5bd6dbec33 (diff) | |
download | mpv-8d6fc26bb982c5ecb7dbe4c20d51dec47f82abbf.tar.bz2 mpv-8d6fc26bb982c5ecb7dbe4c20d51dec47f82abbf.tar.xz |
Merge branch 'screenshot' (early part)
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/mp_image.c | 34 | ||||
-rw-r--r-- | libmpcodecs/vf.h | 8 | ||||
-rw-r--r-- | libmpcodecs/vf_screenshot.c | 181 |
3 files changed, 75 insertions, 148 deletions
diff --git a/libmpcodecs/mp_image.c b/libmpcodecs/mp_image.c index 88702dde60..4683f41174 100644 --- a/libmpcodecs/mp_image.c +++ b/libmpcodecs/mp_image.c @@ -22,9 +22,7 @@ #include <stdlib.h> #include <string.h> -#if HAVE_MALLOC_H -#include <malloc.h> -#endif +#include "talloc.h" #include "libmpcodecs/img_format.h" #include "libmpcodecs/mp_image.h" @@ -39,6 +37,8 @@ void mp_image_alloc_planes(mp_image_t *mpi) { mpi->chroma_width*mpi->chroma_height); } else mpi->planes[0]=av_malloc(mpi->bpp*mpi->width*(mpi->height+2)/8); + if (!mpi->planes[0]) + abort(); //out of memory if (mpi->flags&MP_IMGFLAG_PLANAR) { int bpp = IMGFMT_IS_YUVP16(mpi->imgfmt)? 2 : 1; // YV12/I420/YVU9/IF09. feel free to add other planar formats here... @@ -188,23 +188,29 @@ void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){ mpi->bpp=0; } +static int mp_image_destructor(void *ptr) +{ + mp_image_t *mpi = ptr; + + if(mpi->flags&MP_IMGFLAG_ALLOCATED){ + /* because we allocate the whole image at once */ + av_free(mpi->planes[0]); + if (mpi->flags & MP_IMGFLAG_RGB_PALETTE) + av_free(mpi->planes[1]); + } + + return 0; +} + mp_image_t* new_mp_image(int w,int h){ - mp_image_t* mpi = malloc(sizeof(mp_image_t)); - if(!mpi) return NULL; // error! - memset(mpi,0,sizeof(mp_image_t)); + mp_image_t* mpi = talloc_zero(NULL, mp_image_t); + talloc_set_destructor(mpi, mp_image_destructor); mpi->width=mpi->w=w; mpi->height=mpi->h=h; return mpi; } void free_mp_image(mp_image_t* mpi){ - if(!mpi) return; - if(mpi->flags&MP_IMGFLAG_ALLOCATED){ - /* becouse we allocate the whole image in once */ - av_free(mpi->planes[0]); - if (mpi->flags & MP_IMGFLAG_RGB_PALETTE) - av_free(mpi->planes[1]); - } - free(mpi); + talloc_free(mpi); } diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h index fa58445e1e..0dac19c9f6 100644 --- a/libmpcodecs/vf.h +++ b/libmpcodecs/vf.h @@ -89,6 +89,12 @@ typedef struct vf_seteq { int value; } vf_equalizer_t; +struct vf_ctrl_screenshot { + // When the screenshot is complete, pass it to this callback. + void (*image_callback)(void *, mp_image_t *); + void *image_callback_ctx; +}; + #define VFCTRL_QUERY_MAX_PP_LEVEL 4 // query max postprocessing level (if any) #define VFCTRL_SET_PP_LEVEL 5 // set postprocessing level #define VFCTRL_SET_EQUALIZER 6 // set color options (brightness,contrast etc) @@ -98,7 +104,7 @@ typedef struct vf_seteq { #define VFCTRL_DUPLICATE_FRAME 11 // For encoding - encode zero-change frame #define VFCTRL_SKIP_NEXT_FRAME 12 // For encoding - drop the next frame that passes thru #define VFCTRL_FLUSH_FRAMES 13 // For encoding - flush delayed frames -#define VFCTRL_SCREENSHOT 14 // Make a screenshot +#define VFCTRL_SCREENSHOT 14 // Take screenshot, arg is vf_ctrl_screenshot #define VFCTRL_INIT_EOSD 15 // Select EOSD renderer #define VFCTRL_DRAW_EOSD 16 // Render EOSD */ #define VFCTRL_SET_DEINTERLACE 18 // Set deinterlacing status diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c index 04f0d6e5d9..7f9a45c879 100644 --- a/libmpcodecs/vf_screenshot.c +++ b/libmpcodecs/vf_screenshot.c @@ -23,35 +23,21 @@ #include <string.h> #include <inttypes.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> - -#include <libswscale/swscale.h> -#include <libavcodec/avcodec.h> - #include "mp_msg.h" #include "img_format.h" #include "mp_image.h" #include "vf.h" #include "vf_scale.h" #include "fmt-conversion.h" +#include "libvo/fastmemcpy.h" +#include <libswscale/swscale.h> struct vf_priv_s { - int frameno; - char fname[102]; - /// shot stores current screenshot mode: - /// 0: don't take screenshots - /// 1: take single screenshot, reset to 0 afterwards - /// 2: take screenshots of each frame + mp_image_t *image; + void (*image_callback)(void *, mp_image_t *); + void *image_callback_ctx; int shot, store_slices; - int dw, dh, stride; - uint8_t *buffer; - struct SwsContext *ctx; - AVCodecContext *avctx; - uint8_t *outbuffer; - int outbuffer_size; }; //===========================================================================// @@ -60,102 +46,51 @@ static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { - vf->priv->ctx=sws_getContextFromCmdLine(width, height, outfmt, - d_width, d_height, IMGFMT_RGB24); - - vf->priv->outbuffer_size = d_width * d_height * 3 * 2; - vf->priv->outbuffer = realloc(vf->priv->outbuffer, vf->priv->outbuffer_size); - vf->priv->avctx->width = d_width; - vf->priv->avctx->height = d_height; - vf->priv->avctx->pix_fmt = PIX_FMT_RGB24; - vf->priv->avctx->compression_level = 0; - vf->priv->dw = d_width; - vf->priv->dh = d_height; - vf->priv->stride = (3*vf->priv->dw+15)&~15; - - free(vf->priv->buffer); // probably reconfigured - vf->priv->buffer = NULL; - + free_mp_image(vf->priv->image); + vf->priv->image = new_mp_image(width, height); + mp_image_setfmt(vf->priv->image, outfmt); + vf->priv->image->w = d_width; + vf->priv->image->h = d_height; return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static void write_png(struct vf_priv_s *priv) -{ - char *fname = priv->fname; - FILE * fp; - AVFrame pic; - int size; - - fp = fopen (fname, "wb"); - if (fp == NULL) { - mp_msg(MSGT_VFILTER,MSGL_ERR,"\nPNG Error opening %s for writing!\n", fname); - return; - } - - pic.data[0] = priv->buffer; - pic.linesize[0] = priv->stride; - size = avcodec_encode_video(priv->avctx, priv->outbuffer, priv->outbuffer_size, &pic); - if (size > 0) - fwrite(priv->outbuffer, size, 1, fp); - - fclose (fp); -} - -static int fexists(char *fname) -{ - struct stat dummy; - if (stat(fname, &dummy) == 0) return 1; - else return 0; -} - -static void gen_fname(struct vf_priv_s* priv) -{ - do { - snprintf (priv->fname, 100, "shot%04d.png", ++priv->frameno); - } while (fexists(priv->fname) && priv->frameno < 100000); - if (fexists(priv->fname)) { - priv->fname[0] = '\0'; - return; - } - - mp_msg(MSGT_VFILTER,MSGL_INFO,"*** screenshot '%s' ***\n",priv->fname); - -} - -static void scale_image(struct vf_priv_s* priv, mp_image_t *mpi) -{ - uint8_t *dst[MP_MAX_PLANES] = {NULL}; - int dst_stride[MP_MAX_PLANES] = {0}; - - dst_stride[0] = priv->stride; - if (!priv->buffer) - priv->buffer = av_malloc(dst_stride[0]*priv->dh); - - dst[0] = priv->buffer; - sws_scale(priv->ctx, (const uint8_t **)mpi->planes, mpi->stride, 0, priv->dh, dst, dst_stride); -} - static void start_slice(struct vf_instance *vf, mp_image_t *mpi) { vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, mpi->type, mpi->flags, mpi->width, mpi->height); if (vf->priv->shot) { vf->priv->store_slices = 1; - if (!vf->priv->buffer) - vf->priv->buffer = av_malloc(vf->priv->stride*vf->priv->dh); + if (!(vf->priv->image->flags & MP_IMGFLAG_ALLOCATED)) + mp_image_alloc_planes(vf->priv->image); } } +static void memcpy_pic_slice(unsigned char *dst, unsigned char *src, + int bytesPerLine, int y, int h, + int dstStride, int srcStride) +{ + memcpy_pic(dst + h * dstStride, src + h * srcStride, bytesPerLine, + h, dstStride, srcStride); +} + static void draw_slice(struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y) { if (vf->priv->store_slices) { - uint8_t *dst[MP_MAX_PLANES] = {NULL}; - int dst_stride[MP_MAX_PLANES] = {0}; - dst_stride[0] = vf->priv->stride; - dst[0] = vf->priv->buffer; - sws_scale(vf->priv->ctx, (const uint8_t **)src, stride, y, h, dst, dst_stride); + mp_image_t *dst = vf->priv->image; + int bp = (dst->bpp + 7) / 8; + + if (dst->flags & MP_IMGFLAG_PLANAR) { + int bytes_per_line[3] = { w * bp, dst->chroma_width, dst->chroma_width }; + for (int n = 0; n < 3; n++) { + memcpy_pic_slice(dst->planes[n], src[n], bytes_per_line[n], + y, h, dst->stride[n], stride[n]); + } + } else { + memcpy_pic_slice(dst->planes[0], src[0], dst->w*bp, y, dst->h, + dst->stride[0], stride[0]); + } } vf_next_draw_slice(vf,src,stride,w,h,x,y); } @@ -200,14 +135,15 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) } if(vf->priv->shot) { - if (vf->priv->shot==1) - vf->priv->shot=0; - gen_fname(vf->priv); - if (vf->priv->fname[0]) { - if (!vf->priv->store_slices) - scale_image(vf->priv, dmpi); - write_png(vf->priv); - } + vf->priv->shot=0; + mp_image_t image; + if (!vf->priv->store_slices) + image = *dmpi; + else + image = *vf->priv->image; + image.w = vf->priv->image->w; + image.h = vf->priv->image->h; + vf->priv->image_callback(vf->priv->image_callback_ctx, &image); vf->priv->store_slices = 0; } @@ -216,20 +152,11 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) static int control (vf_instance_t *vf, int request, void *data) { - /** data contains an integer argument - * 0: take screenshot with the next frame - * 1: take screenshots with each frame until the same command is given once again - **/ if(request==VFCTRL_SCREENSHOT) { - if (data && *(int*)data) { // repeated screenshot mode - if (vf->priv->shot==2) - vf->priv->shot=0; - else - vf->priv->shot=2; - } else { // single screenshot - if (!vf->priv->shot) - vf->priv->shot=1; - } + struct vf_ctrl_screenshot *cmd = (struct vf_ctrl_screenshot *)data; + vf->priv->image_callback = cmd->image_callback; + vf->priv->image_callback_ctx = cmd->image_callback_ctx; + vf->priv->shot=1; return CONTROL_TRUE; } return vf_next_control (vf, request, data); @@ -249,11 +176,7 @@ static int query_format(struct vf_instance *vf, unsigned int fmt) static void uninit(vf_instance_t *vf) { - avcodec_close(vf->priv->avctx); - av_freep(&vf->priv->avctx); - if(vf->priv->ctx) sws_freeContext(vf->priv->ctx); - av_free(vf->priv->buffer); - free(vf->priv->outbuffer); + free_mp_image(vf->priv->image); free(vf->priv); } @@ -268,17 +191,9 @@ static int vf_open(vf_instance_t *vf, char *args) vf->get_image=get_image; vf->uninit=uninit; vf->priv=malloc(sizeof(struct vf_priv_s)); - vf->priv->frameno=0; vf->priv->shot=0; vf->priv->store_slices=0; - vf->priv->buffer=0; - vf->priv->outbuffer=0; - vf->priv->ctx=0; - vf->priv->avctx = avcodec_alloc_context(); - if (avcodec_open(vf->priv->avctx, avcodec_find_encoder(CODEC_ID_PNG))) { - mp_msg(MSGT_VFILTER, MSGL_FATAL, "Could not open libavcodec PNG encoder\n"); - return 0; - } + vf->priv->image=NULL; return 1; } |