January 2014 - MPlayer-cvslog - lists.mplayerhq.hu

r36615 - trunk/libvo/vo_sdl.c
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sun Jan 19 00:08:29 2014 New Revision: 36615 Log: vo_sdl: simplify by using memcpy_pic. Modified: trunk/libvo/vo_sdl.c Modified: trunk/libvo/vo_sdl.c ============================================================================== --- trunk/libvo/vo_sdl.c Sun Jan 19 00:08:28 2014 (r36614) +++ trunk/libvo/vo_sdl.c Sun Jan 19 00:08:29 2014 (r36615) @@ -826,8 +826,8 @@ static int draw_frame(uint8_t *src[]) { struct sdl_priv_s *priv = &sdl_priv; uint8_t *dst; - int i; uint8_t *mysrc = src[0]; + int srcstride = priv->stridePlaneRGB; switch(priv->format){ case IMGFMT_YUY2: @@ -835,15 +835,13 @@ static int draw_frame(uint8_t *src[]) case IMGFMT_YVYU: SDL_OVR_LOCK(-1) dst = (uint8_t *) *(priv->overlay->pixels) + priv->overlay->pitches[0]*priv->y; - if(priv->flip) { - mysrc+=priv->framePlaneYUY; - for(i = 0; i < priv->height; i++) { - mysrc-=priv->stridePlaneYUY; - fast_memcpy (dst, mysrc, priv->stridePlaneYUY); - dst+=priv->overlay->pitches[0]; - } - } - else fast_memcpy (dst, src[0], priv->framePlaneYUY); + srcstride = priv->stridePlaneYUY; + if (priv->flip) { + mysrc += (priv->height - 1) * srcstride; + srcstride = -srcstride; + } + memcpy_pic(dst, mysrc, priv->stridePlaneYUY, priv->height, + priv->overlay->pitches[0], srcstride); SDL_OVR_UNLOCK break; @@ -858,28 +856,22 @@ static int draw_frame(uint8_t *src[]) if(priv->dblit) { SDL_SRF_LOCK(priv->surface, -1) dst = (uint8_t *) priv->surface->pixels + priv->y*priv->surface->pitch; - if(priv->flip) { - mysrc+=priv->framePlaneRGB; - for(i = 0; i < priv->height; i++) { - mysrc-=priv->stridePlaneRGB; - fast_memcpy (dst, mysrc, priv->stridePlaneRGB); - dst += priv->surface->pitch; - } + if (priv->flip) { + mysrc += (priv->height - 1) * srcstride; + srcstride = -srcstride; } - else fast_memcpy (dst, src[0], priv->framePlaneRGB); + memcpy_pic(dst, mysrc, priv->stridePlaneRGB, priv->height, + priv->surface->pitch, srcstride); SDL_SRF_UNLOCK(priv->surface) } else { SDL_SRF_LOCK(priv->rgbsurface, -1) dst = (uint8_t *) priv->rgbsurface->pixels + priv->y*priv->rgbsurface->pitch; - if(priv->flip) { - mysrc+=priv->framePlaneRGB; - for(i = 0; i < priv->height; i++) { - mysrc-=priv->stridePlaneRGB; - fast_memcpy (dst, mysrc, priv->stridePlaneRGB); - dst += priv->rgbsurface->pitch; - } + if (priv->flip) { + mysrc += (priv->height - 1) * srcstride; + srcstride = -srcstride; } - else fast_memcpy (dst, src[0], priv->framePlaneRGB); + memcpy_pic(dst, mysrc, priv->stridePlaneRGB, priv->height, + priv->rgbsurface->pitch, srcstride); SDL_SRF_UNLOCK(priv->rgbsurface) } break;

1 0

r36614 - trunk/libvo/vo_sdl.c
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sun Jan 19 00:08:28 2014 New Revision: 36614 Log: vo_sdl: set VFCAP_FLIP correctly. For interleaved YUV formats there is special flipping code. Modified: trunk/libvo/vo_sdl.c Modified: trunk/libvo/vo_sdl.c ============================================================================== --- trunk/libvo/vo_sdl.c Sat Jan 18 22:39:07 2014 (r36613) +++ trunk/libvo/vo_sdl.c Sun Jan 19 00:08:28 2014 (r36614) @@ -1231,11 +1231,13 @@ query_format(uint32_t format) // it seems buggy (not hw accelerated), so just use YV12 instead! // case IMGFMT_I420: // case IMGFMT_IYUV: + return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | + VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; case IMGFMT_YUY2: case IMGFMT_UYVY: case IMGFMT_YVYU: return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | - VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; + VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_FLIP; case IMGFMT_RGB15: case IMGFMT_BGR15: case IMGFMT_RGB16:

1 0

r36613 - in trunk/libvo: mga_template.c vo_caca.c vo_cvidix.c vo_dfbmga.c vo_dga.c vo_direct3d.c vo_directfb2.c vo_dxr2.c vo_dxr3.c vo_fbdev.c vo_fbdev2.c vo_gif89a.c vo_gl.c vo_ivtv.c vo_jpeg.c vo...
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sat Jan 18 22:39:07 2014 New Revision: 36613 Log: Remove empty draw_slice and draw_frame stubs. Long term, draw_frame should be removed completely. Modified: trunk/libvo/mga_template.c trunk/libvo/vo_caca.c trunk/libvo/vo_cvidix.c trunk/libvo/vo_dfbmga.c trunk/libvo/vo_dga.c trunk/libvo/vo_direct3d.c trunk/libvo/vo_directfb2.c trunk/libvo/vo_dxr2.c trunk/libvo/vo_dxr3.c trunk/libvo/vo_fbdev.c trunk/libvo/vo_fbdev2.c trunk/libvo/vo_gif89a.c trunk/libvo/vo_gl.c trunk/libvo/vo_ivtv.c trunk/libvo/vo_jpeg.c trunk/libvo/vo_kva.c trunk/libvo/vo_matrixview.c trunk/libvo/vo_md5sum.c trunk/libvo/vo_mga.c trunk/libvo/vo_mng.c trunk/libvo/vo_mpegpes.c trunk/libvo/vo_null.c trunk/libvo/vo_png.c trunk/libvo/vo_pnm.c trunk/libvo/vo_s3fb.c trunk/libvo/vo_svga.c trunk/libvo/vo_tga.c trunk/libvo/vo_v4l2.c trunk/libvo/vo_vdpau.c trunk/libvo/vo_wii.c trunk/libvo/vo_winvidix.c trunk/libvo/vo_x11.c trunk/libvo/vo_xmga.c trunk/libvo/vo_xv.c trunk/libvo/vo_xvidix.c trunk/libvo/vo_xvmc.c trunk/libvo/vo_xvr100.c trunk/libvo/vo_yuv4mpeg.c trunk/libvo/vo_zr2.c trunk/libvo/vosub_vidix.c Modified: trunk/libvo/mga_template.c ============================================================================== --- trunk/libvo/mga_template.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/mga_template.c Sat Jan 18 22:39:07 2014 (r36613) @@ -140,13 +140,6 @@ vo_mga_flip_page(void) } -static int -draw_frame(uint8_t *src[]) -{ - mp_msg(MSGT_VO,MSGL_WARN,"!!! mga::draw_frame() called !!!\n"); - return 0; -} - static uint32_t get_image(mp_image_t *mpi){ uint32_t bespitch = FFALIGN(mga_vid_config.src_width, 32); uint32_t bespitch2 = bespitch/2; Modified: trunk/libvo/vo_caca.c ============================================================================== --- trunk/libvo/vo_caca.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_caca.c Sat Jan 18 22:39:07 2014 (r36613) @@ -35,6 +35,7 @@ #include "config.h" #include "video_out.h" +#define NO_DRAW_SLICE #include "video_out_internal.h" #include "sub/sub.h" @@ -178,11 +179,6 @@ static int draw_frame(uint8_t *src[]) return 0; } -static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) -{ - return 0; -} - static void flip_page(void) { if (showosdmessage) { Modified: trunk/libvo/vo_cvidix.c ============================================================================== --- trunk/libvo/vo_cvidix.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_cvidix.c Sat Jan 18 22:39:07 2014 (r36613) @@ -30,6 +30,7 @@ #include "config.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "aspect.h" #include "geometry.h" @@ -121,7 +122,7 @@ static int config(uint32_t width, uint32 static void check_events(void){ } -/* draw_osd, flip_page, draw_slice, draw_frame should be +/* draw_osd, flip_page, draw_slice should be overwritten with vidix functions (vosub_vidix.c) */ static void draw_osd(void){ mp_msg(MSGT_VO, MSGL_FATAL, "vo_cvidix: error: didn't use vidix draw_osd!\n"); @@ -138,11 +139,6 @@ static int draw_slice(uint8_t *src[], in return -1; } -static int draw_frame(uint8_t *src[]){ - mp_msg(MSGT_VO, MSGL_FATAL, "vo_cvidix: error: didn't use vidix draw_frame!\n"); - return -1; -} - static int query_format(uint32_t format){ return vidix_query_fourcc(format); } Modified: trunk/libvo/vo_dfbmga.c ============================================================================== --- trunk/libvo/vo_dfbmga.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_dfbmga.c Sat Jan 18 22:39:07 2014 (r36613) @@ -30,6 +30,7 @@ #include "config.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "libmpcodecs/vf.h" #include "fastmemcpy.h" @@ -1047,12 +1048,6 @@ draw_alpha( int x0, int y0, } static int -draw_frame( uint8_t * src[] ) -{ - return -1; -} - -static int draw_slice( uint8_t * src[], int stride[], int w, int h, int x, int y ) { uint8_t *dst; Modified: trunk/libvo/vo_dga.c ============================================================================== --- trunk/libvo/vo_dga.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_dga.c Sat Jan 18 22:39:07 2014 (r36613) @@ -28,6 +28,7 @@ #include "config.h" #include "video_out.h" +#define NO_DRAW_SLICE #include "video_out_internal.h" #include "aspect.h" #include "x11_common.h" @@ -346,14 +347,6 @@ static void flip_page(void) //--------------------------------------------------------- -static int draw_slice(uint8_t * src[], int stride[], - int w, int h, int x, int y) -{ - return 0; -}; - -//--------------------------------------------------------- - static int query_format(uint32_t format) { Modified: trunk/libvo/vo_direct3d.c ============================================================================== --- trunk/libvo/vo_direct3d.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_direct3d.c Sat Jan 18 22:39:07 2014 (r36613) @@ -24,6 +24,7 @@ #include <d3d9.h> #include "config.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "fastmemcpy.h" #include "mp_msg.h" @@ -972,14 +973,6 @@ static int draw_slice(uint8_t *src[], in return 0; /* Success */ } -/** @brief libvo Callback: Unused function - */ -static int draw_frame(uint8_t *src[]) -{ - mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>draw_frame called.\n"); - return VO_FALSE; -} - /** @brief Maps MPlayer alpha to D3D * 0x0 -> transparent and discarded by alpha test * 0x1 -> 0xFF to become opaque Modified: trunk/libvo/vo_directfb2.c ============================================================================== --- trunk/libvo/vo_directfb2.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_directfb2.c Sat Jan 18 22:39:07 2014 (r36613) @@ -31,6 +31,7 @@ #include "config.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "libmpcodecs/vf.h" #include "fastmemcpy.h" @@ -1395,15 +1396,6 @@ static int control(uint32_t request, voi return VO_NOTIMPL; } -// unused function - -static int draw_frame(uint8_t *src[]) -{ - return -1; -} - -// hopefully will be removed soon - static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride) { Modified: trunk/libvo/vo_dxr2.c ============================================================================== --- trunk/libvo/vo_dxr2.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_dxr2.c Sat Jan 18 22:39:07 2014 (r36613) @@ -33,6 +33,7 @@ #include "config.h" #include "aspect.h" #include "video_out.h" +#define NO_DRAW_SLICE #include "video_out_internal.h" #include "mp_msg.h" #include "m_option.h" @@ -761,11 +762,6 @@ static void flip_page (void) sub_vo->flip_page(); } -static int draw_slice( uint8_t *srcimg[], int stride[], int w, int h, int x0, int y0 ) -{ - return 0; -} - static int query_format(uint32_t format) { Modified: trunk/libvo/vo_dxr3.c ============================================================================== --- trunk/libvo/vo_dxr3.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_dxr3.c Sat Jan 18 22:39:07 2014 (r36613) @@ -41,6 +41,7 @@ #include "fastmemcpy.h" #include "video_out.h" +#define NO_DRAW_SLICE #include "video_out_internal.h" #include "libmpcodecs/vf.h" #include "aspect.h" @@ -675,11 +676,6 @@ static void flip_page(void) } } -static int draw_slice(uint8_t *srcimg[], int stride[], int w, int h, int x0, int y0) -{ - return -1; -} - static void uninit(void) { mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_Uninitializing); Modified: trunk/libvo/vo_fbdev.c ============================================================================== --- trunk/libvo/vo_fbdev.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_fbdev.c Sat Jan 18 22:39:07 2014 (r36613) @@ -41,6 +41,7 @@ #include "config.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "fastmemcpy.h" #include "sub/sub.h" @@ -1054,11 +1055,6 @@ static void draw_alpha(int x0, int y0, i (*draw_alpha_p)(w, h, src, srca, stride, dst, fb_line_len); } -static int draw_frame(uint8_t *src[]) -{ - return 1; -} - static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) { uint8_t *d; Modified: trunk/libvo/vo_fbdev2.c ============================================================================== --- trunk/libvo/vo_fbdev2.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_fbdev2.c Sat Jan 18 22:39:07 2014 (r36613) @@ -32,6 +32,7 @@ #include "config.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "fastmemcpy.h" #include "sub/sub.h" @@ -371,9 +372,6 @@ static void draw_osd(void) vo_draw_text(in_width, in_height, draw_alpha); } -// all csp support stride -static int draw_frame(uint8_t *src[]) { return 1; } - static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) { uint8_t *in = src[0]; Modified: trunk/libvo/vo_gif89a.c ============================================================================== --- trunk/libvo/vo_gif89a.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_gif89a.c Sat Jan 18 22:39:07 2014 (r36613) @@ -54,6 +54,7 @@ #include "config.h" #include "subopt-helper.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "mp_msg.h" @@ -322,11 +323,6 @@ static void flip_page(void) EGifPutLine(new_gif, reduce_data, img_width * img_height); } -static int draw_frame(uint8_t *src[]) -{ - return 1; -} - static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) { uint8_t *dst, *frm; Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_gl.c Sat Jan 18 22:39:07 2014 (r36613) @@ -31,6 +31,7 @@ #include "mp_msg.h" #include "subopt-helper.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "libmpcodecs/vf.h" #include "sub/font_load.h" @@ -1135,12 +1136,6 @@ skip_upload: } static int -draw_frame(uint8_t *src[]) -{ - return VO_ERROR; -} - -static int query_format(uint32_t format) { int depth; Modified: trunk/libvo/vo_ivtv.c ============================================================================== --- trunk/libvo/vo_ivtv.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_ivtv.c Sat Jan 18 22:39:07 2014 (r36613) @@ -45,6 +45,7 @@ #include "mp_msg.h" #include "subopt-helper.h" #include "video_out.h" +#define NO_DRAW_SLICE #include "video_out_internal.h" #include "vo_ivtv.h" #include "libmpdemux/mpeg_packetizer.h" @@ -250,12 +251,6 @@ flip_page (void) pes = NULL; } -static int -draw_slice (uint8_t *image[], int stride[], int w, int h, int x, int y) -{ - return 0; -} - static void uninit (void) { Modified: trunk/libvo/vo_jpeg.c ============================================================================== --- trunk/libvo/vo_jpeg.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_jpeg.c Sat Jan 18 22:39:07 2014 (r36613) @@ -43,6 +43,7 @@ #include "subopt-helper.h" #include "mp_msg.h" #include "video_out.h" +#define NO_DRAW_SLICE #include "video_out_internal.h" #include "mp_core.h" #include "help_mp.h" @@ -287,14 +288,6 @@ static void flip_page (void) /* ------------------------------------------------------------------------- */ -static int draw_slice(uint8_t *src[], int stride[], int w, int h, - int x, int y) -{ - return 0; -} - -/* ------------------------------------------------------------------------- */ - static int query_format(uint32_t format) { if (format == IMGFMT_RGB24) { Modified: trunk/libvo/vo_kva.c ============================================================================== --- trunk/libvo/vo_kva.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_kva.c Sat Jan 18 22:39:07 2014 (r36613) @@ -39,6 +39,7 @@ #include "mp_msg.h" #include "help_mp.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "libmpcodecs/vf.h" #include "aspect.h" @@ -1004,11 +1005,6 @@ static int control(uint32_t request, voi return VO_NOTIMPL; } -static int draw_frame(uint8_t *src[]) -{ - return VO_ERROR; -} - static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) { uint8_t *s; Modified: trunk/libvo/vo_matrixview.c ============================================================================== --- trunk/libvo/vo_matrixview.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_matrixview.c Sat Jan 18 22:39:07 2014 (r36613) @@ -30,6 +30,7 @@ #include "mp_msg.h" #include "subopt-helper.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "libmpcodecs/vf.h" #include "gl_common.h" @@ -173,12 +174,6 @@ static int draw_slice(uint8_t *src[], in } -static int draw_frame(uint8_t *src[]) -{ - return 0; -} - - static int query_format(uint32_t format) { int caps = VFCAP_CSP_SUPPORTED | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE; Modified: trunk/libvo/vo_md5sum.c ============================================================================== --- trunk/libvo/vo_md5sum.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_md5sum.c Sat Jan 18 22:39:07 2014 (r36613) @@ -39,6 +39,8 @@ #include "subopt-helper.h" #include "mp_msg.h" #include "video_out.h" +#define NO_DRAW_FRAME +#define NO_DRAW_SLICE #include "video_out_internal.h" #include "mp_core.h" /* for exit_player() */ #include "help_mp.h" @@ -180,14 +182,6 @@ static void md5sum_output_sum(unsigned c /* ------------------------------------------------------------------------- */ -static int draw_frame(uint8_t *src[]) -{ - mp_msg(MSGT_VO, MSGL_V, "%s: draw_frame() is called!\n", info.short_name); - return -1; -} - -/* ------------------------------------------------------------------------- */ - static uint32_t draw_image(mp_image_t *mpi) { unsigned char md5sum[16]; @@ -241,14 +235,6 @@ static uint32_t draw_image(mp_image_t *m /* ------------------------------------------------------------------------- */ -static int draw_slice(uint8_t *src[], int stride[], int w, int h, - int x, int y) -{ - return 0; -} - -/* ------------------------------------------------------------------------- */ - static int query_format(uint32_t format) { switch (format) { Modified: trunk/libvo/vo_mga.c ============================================================================== --- trunk/libvo/vo_mga.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_mga.c Sat Jan 18 22:39:07 2014 (r36613) @@ -26,6 +26,7 @@ #include "mp_msg.h" #include "help_mp.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include <sys/ioctl.h> Modified: trunk/libvo/vo_mng.c ============================================================================== --- trunk/libvo/vo_mng.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_mng.c Sat Jan 18 22:39:07 2014 (r36613) @@ -38,6 +38,7 @@ #include <libmng.h> #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "mp_msg.h" #include "subopt-helper.h" @@ -514,18 +515,6 @@ static void flip_page(void) } /** - * @brief put frame data onto canvas (not supported) - * @return always 1 to indicate error - */ -static int draw_frame(uint8_t *src[]) -{ - /* draw_frame() not supported - * VFCAP_ACCEPT_STRIDE is set for format - * so draw_slice() will be called instead of this function */ - return 1; -} - -/** * @brief deinitialize MNG vo module */ static void uninit(void) Modified: trunk/libvo/vo_mpegpes.c ============================================================================== --- trunk/libvo/vo_mpegpes.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_mpegpes.c Sat Jan 18 22:39:07 2014 (r36613) @@ -54,6 +54,7 @@ #include "config.h" #include "video_out.h" +#define NO_DRAW_SLICE #include "video_out_internal.h" #include "libmpdemux/mpeg_packetizer.h" @@ -215,12 +216,6 @@ static void flip_page (void) { } -static int draw_slice(uint8_t *srcimg[], int stride[], int w,int h,int x0,int y0) -{ - return 0; -} - - static int query_format(uint32_t format) { Modified: trunk/libvo/vo_null.c ============================================================================== --- trunk/libvo/vo_null.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_null.c Sat Jan 18 22:39:07 2014 (r36613) @@ -28,6 +28,7 @@ #include "mp_msg.h" #include "help_mp.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" static const vo_info_t info = @@ -59,12 +60,6 @@ flip_page(void) } static int -draw_frame(uint8_t *src[]) -{ - return 0; -} - -static int query_format(uint32_t format) { if (IMGFMT_IS_HWACCEL(format)) Modified: trunk/libvo/vo_png.c ============================================================================== --- trunk/libvo/vo_png.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_png.c Sat Jan 18 22:39:07 2014 (r36613) @@ -36,6 +36,8 @@ #include "mp_msg.h" #include "help_mp.h" #include "video_out.h" +#define NO_DRAW_FRAME +#define NO_DRAW_SLICE #include "video_out_internal.h" #include "subopt-helper.h" #include "libavcodec/avcodec.h" @@ -191,16 +193,6 @@ static void draw_osd(void){} static void flip_page (void){} -static int draw_frame(uint8_t * src[]) -{ - return -1; -} - -static int draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y ) -{ - return -1; -} - static int query_format(uint32_t format) { Modified: trunk/libvo/vo_pnm.c ============================================================================== --- trunk/libvo/vo_pnm.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_pnm.c Sat Jan 18 22:39:07 2014 (r36613) @@ -38,6 +38,8 @@ #include "subopt-helper.h" #include "mp_msg.h" #include "video_out.h" +#define NO_DRAW_FRAME +#define NO_DRAW_SLICE #include "video_out_internal.h" #include "mp_core.h" /* for exit_player() */ #include "help_mp.h" @@ -504,22 +506,6 @@ static uint32_t draw_image(mp_image_t *m /* ------------------------------------------------------------------------- */ -static int draw_frame(uint8_t *src[]) -{ - mp_msg(MSGT_VO, MSGL_V, "%s: draw_frame() is called!\n", info.short_name); - return -1; -} - -/* ------------------------------------------------------------------------- */ - -static int draw_slice(uint8_t *src[], int stride[], int w, int h, - int x, int y) -{ - return 0; -} - -/* ------------------------------------------------------------------------- */ - static int query_format(uint32_t format) { /* Ensure that for PPM we get Packed RGB and for PGM(YUV) we get Modified: trunk/libvo/vo_s3fb.c ============================================================================== --- trunk/libvo/vo_s3fb.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_s3fb.c Sat Jan 18 22:39:07 2014 (r36613) @@ -42,6 +42,7 @@ #include "mp_msg.h" #include "fastmemcpy.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "aspect.h" #include "sub/sub.h" @@ -493,11 +494,6 @@ static int draw_frame(uint8_t *src[]) return 0; } -static int draw_slice(uint8_t *i[], int s[], int w, int h, int x, int y) -{ - return 1; -} - /* Attempt to start doing DR */ static uint32_t get_image(mp_image_t *mpi) { Modified: trunk/libvo/vo_svga.c ============================================================================== --- trunk/libvo/vo_svga.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_svga.c Sat Jan 18 22:39:07 2014 (r36613) @@ -52,6 +52,8 @@ TODO: #include "config.h" #include "video_out.h" +#define NO_DRAW_FRAME +#define NO_DRAW_SLICE #include "video_out_internal.h" #include "fastmemcpy.h" #include "osdep/getch2.h" @@ -553,17 +555,6 @@ static int config(uint32_t width, uint32 return 0; } -static int draw_slice(uint8_t *image[],int stride[], - int w, int h, int x, int y) { - assert(0); - return VO_ERROR;//this is yv12 only -> vf_scale should do all transforms -} - -static int draw_frame(uint8_t *src[]) { - assert(0); - return VO_ERROR;//this one should not be called -} - static void draw_osd(void) { mp_msg(MSGT_VO,MSGL_DBG4, "vo_svga: draw_osd()\n"); Modified: trunk/libvo/vo_tga.c ============================================================================== --- trunk/libvo/vo_tga.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_tga.c Sat Jan 18 22:39:07 2014 (r36613) @@ -53,6 +53,8 @@ #include "mp_msg.h" #include "help_mp.h" #include "video_out.h" +#define NO_DRAW_FRAME +#define NO_DRAW_SLICE #include "video_out_internal.h" static const vo_info_t info = @@ -181,16 +183,6 @@ static void flip_page (void) return; } -static int draw_slice(uint8_t *srcimg[], int stride[], int w,int h,int x,int y) -{ - return -1; -} - -static int draw_frame(uint8_t * src[]) -{ - return -1; -} - static int query_format(uint32_t format) { switch(format){ Modified: trunk/libvo/vo_v4l2.c ============================================================================== --- trunk/libvo/vo_v4l2.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_v4l2.c Sat Jan 18 22:39:07 2014 (r36613) @@ -40,6 +40,7 @@ #include "mp_msg.h" #include "subopt-helper.h" #include "video_out.h" +#define NO_DRAW_SLICE #include "video_out_internal.h" #include "libmpdemux/mpeg_packetizer.h" #include "vo_v4l2.h" @@ -221,12 +222,6 @@ flip_page (void) pes = NULL; } -static int -draw_slice (uint8_t *image[], int stride[], int w, int h, int x, int y) -{ - return 0; -} - static void uninit (void) { Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_vdpau.c Sat Jan 18 22:39:07 2014 (r36613) @@ -39,6 +39,7 @@ #include "sub/ass_mp.h" #include "mp_msg.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "libmpcodecs/vf.h" #include "x11_common.h" @@ -1042,11 +1043,6 @@ static int draw_slice(uint8_t *image[], } -static int draw_frame(uint8_t *src[]) -{ - return VO_ERROR; -} - static struct vdpau_render_state *get_surface(int number) { if (number >= MAX_VIDEO_SURFACES) Modified: trunk/libvo/vo_wii.c ============================================================================== --- trunk/libvo/vo_wii.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_wii.c Sat Jan 18 22:39:07 2014 (r36613) @@ -50,6 +50,7 @@ #include "config.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "sub/sub.h" #include "mp_msg.h" @@ -268,11 +269,6 @@ static void draw_alpha(int x0, int y0, i vo_draw_alpha_yuy2(w, h, src, srca, stride, dst, fb_line_len); } -static int draw_frame(uint8_t *src[]) -{ - return 1; -} - static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) { uint8_t *d, *s; Modified: trunk/libvo/vo_winvidix.c ============================================================================== --- trunk/libvo/vo_winvidix.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_winvidix.c Sat Jan 18 22:39:07 2014 (r36613) @@ -28,6 +28,7 @@ #include "config.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include <windows.h> @@ -279,7 +280,7 @@ static void check_events(void){ } } -/* draw_osd, flip_page, draw_slice, draw_frame should be +/* draw_osd, flip_page, draw_slice should be overwritten with vidix functions (vosub_vidix.c) */ static void draw_osd(void){ mp_msg(MSGT_VO, MSGL_FATAL, "[winvidix] error: didn't use vidix draw_osd!\n"); @@ -296,11 +297,6 @@ static int draw_slice(uint8_t *src[], in return -1; } -static int draw_frame(uint8_t *src[]){ - mp_msg(MSGT_VO, MSGL_FATAL, "[winvidix] error: didn't use vidix draw_frame!\n"); - return -1; -} - static int query_format(uint32_t format){ return vidix_query_fourcc(format); } Modified: trunk/libvo/vo_x11.c ============================================================================== --- trunk/libvo/vo_x11.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_x11.c Sat Jan 18 22:39:07 2014 (r36613) @@ -22,6 +22,7 @@ #include "config.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "libmpcodecs/vf.h" #include "aspect.h" @@ -495,11 +496,6 @@ static int draw_slice(uint8_t * src[], i return 0; } -static int draw_frame(uint8_t * src[]) -{ - return VO_ERROR; -} - static uint32_t get_image(mp_image_t * mpi) { if (zoomFlag || Modified: trunk/libvo/vo_xmga.c ============================================================================== --- trunk/libvo/vo_xmga.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_xmga.c Sat Jan 18 22:39:07 2014 (r36613) @@ -27,6 +27,7 @@ #include "config.h" #include "mp_msg.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" Modified: trunk/libvo/vo_xv.c ============================================================================== --- trunk/libvo/vo_xv.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_xv.c Sat Jan 18 22:39:07 2014 (r36613) @@ -42,6 +42,7 @@ Buffer allocation: #include "mp_msg.h" #include "help_mp.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "libmpcodecs/vf.h" @@ -417,11 +418,6 @@ static int draw_slice(uint8_t * image[], return 0; } -static int draw_frame(uint8_t * src[]) -{ - return VO_ERROR; -} - static uint32_t draw_image(mp_image_t * mpi) { if (mpi->flags & MP_IMGFLAG_DIRECT) Modified: trunk/libvo/vo_xvidix.c ============================================================================== --- trunk/libvo/vo_xvidix.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_xvidix.c Sat Jan 18 22:39:07 2014 (r36613) @@ -32,6 +32,7 @@ #include "config.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include <X11/Xlib.h> @@ -316,7 +317,7 @@ static void check_events(void) return; } -/* draw_osd, flip_page, draw_slice, draw_frame should be +/* draw_osd, flip_page, draw_slice should be overwritten with vidix functions (vosub_vidix.c) */ static void draw_osd(void) { @@ -340,13 +341,6 @@ static int draw_slice(uint8_t * src[], i return -1; } -static int draw_frame(uint8_t * src[]) -{ - mp_msg(MSGT_VO, MSGL_FATAL, - "[xvidix] error: didn't used vidix draw_frame!\n"); - return -1; -} - static int query_format(uint32_t format) { return vidix_query_fourcc(format); Modified: trunk/libvo/vo_xvmc.c ============================================================================== --- trunk/libvo/vo_xvmc.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_xvmc.c Sat Jan 18 22:39:07 2014 (r36613) @@ -24,6 +24,7 @@ #include "config.h" #include "mp_msg.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "osdep/timer.h" #include "libmpcodecs/vf.h" @@ -729,10 +730,6 @@ skip_surface_allocation: return 0; } -static int draw_frame(uint8_t *srcp[]){ - assert(0); -} - static void init_osd_yuv_pal(void) { char * palette; int rez; Modified: trunk/libvo/vo_xvr100.c ============================================================================== --- trunk/libvo/vo_xvr100.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_xvr100.c Sat Jan 18 22:39:07 2014 (r36613) @@ -44,6 +44,7 @@ #include "config.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "aspect.h" #include "geometry.h" @@ -369,12 +370,6 @@ static uint32_t get_image(mp_image_t *mp return VO_TRUE; } -static int draw_frame(uint8_t *src[]) -{ - mp_msg(MSGT_VO,MSGL_WARN,"!!! vo_xvr100::draw_frame() called !!!\n"); - return 0; -} - static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) { Modified: trunk/libvo/vo_yuv4mpeg.c ============================================================================== --- trunk/libvo/vo_yuv4mpeg.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_yuv4mpeg.c Sat Jan 18 22:39:07 2014 (r36613) @@ -47,6 +47,7 @@ #include "config.h" #include "subopt-helper.h" #include "video_out.h" +#define NO_DRAW_FRAME #include "video_out_internal.h" #include "mp_msg.h" @@ -221,12 +222,6 @@ static int draw_slice(uint8_t *srcimg[], return 0; } -static int draw_frame(uint8_t * src[]) -{ - // gets done in draw_slice - return 0; -} - static int query_format(uint32_t format) { if (format == IMGFMT_YV12) Modified: trunk/libvo/vo_zr2.c ============================================================================== --- trunk/libvo/vo_zr2.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vo_zr2.c Sat Jan 18 22:39:07 2014 (r36613) @@ -38,6 +38,8 @@ #include "config.h" #include "videodev_mjpeg.h" #include "video_out.h" +#define NO_DRAW_FRAME +#define NO_DRAW_SLICE #include "video_out_internal.h" #include "mp_msg.h" #include "subopt-helper.h" @@ -461,15 +463,6 @@ static int control(uint32_t request, voi return VO_NOTIMPL; } -static int draw_frame(uint8_t *src[]) { - return 0; -} - -static int draw_slice(uint8_t *image[], int stride[], - int w, int h, int x, int y) { - return 0; -} - static void draw_osd(void) { } Modified: trunk/libvo/vosub_vidix.c ============================================================================== --- trunk/libvo/vosub_vidix.c Sat Jan 18 21:41:46 2014 (r36612) +++ trunk/libvo/vosub_vidix.c Sat Jan 18 22:39:07 2014 (r36613) @@ -271,12 +271,6 @@ static uint32_t vidix_draw_image(mp_ima return VO_TRUE; } -static int vidix_draw_frame(uint8_t *image[]) -{ - mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_SUB_VIDIX_DummyVidixdrawframeWasCalled); - return -1; -} - static void vidix_flip_page(void) { if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { @@ -692,7 +686,7 @@ int vidix_preinit(const char *drvname,vo mp_msg(MSGT_VO,MSGL_V, "[VO_SUB_VIDIX] Author: %s.\n", vidix_cap.author); /* we are able to tune up this stuff depend on fourcc format */ server->draw_slice=vidix_draw_slice; - server->draw_frame=vidix_draw_frame; + server->draw_frame=NULL; server->flip_page=vidix_flip_page; server->draw_osd=vidix_draw_osd; // server_control = server->control;

1 0

r36612 - trunk/mplayer.c
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sat Jan 18 21:41:46 2014 New Revision: 36612 Log: Fully reinit audio chain on format change. This ensures that we insert all necessary filters like downmixing, but loses the current settings like volume or equalizer that were set at runtime. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Jan 18 19:34:37 2014 (r36611) +++ trunk/mplayer.c Sat Jan 18 21:41:46 2014 (r36612) @@ -2221,6 +2221,9 @@ static int fill_audio_out_buffers(void) } if (format_change) { uninit_player(INITIALIZED_AO); + af_uninit(sh_audio->afilter); + free(sh_audio->afilter); + sh_audio->afilter = NULL; reinit_audio_chain(); } return 1;

1 0

r36610 - trunk/libvo/vo_bl.c
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sat Jan 18 15:05:27 2014 New Revision: 36610 Log: vo_bl: cosmetics, use more readable array indexing syntax. Modified: trunk/libvo/vo_bl.c Modified: trunk/libvo/vo_bl.c ============================================================================== --- trunk/libvo/vo_bl.c Sat Jan 18 15:04:31 2014 (r36609) +++ trunk/libvo/vo_bl.c Sat Jan 18 15:05:27 2014 (r36610) @@ -156,7 +156,7 @@ static void bml_write_frame(bl_file_t *f for (j = 0; j < bl->height; j++) { fprintf(f->fp, " <row>"); for (k = 0; k < bl->width * bl->channels; k++) - fprintf(f->fp, "%02x", *(i + j * bl->width * bl->channels + k)); + fprintf(f->fp, "%02x", i[j * bl->width * bl->channels + k]); fprintf(f->fp, "</row>\n"); } fprintf(f->fp, " </frame>\n");

1 0

r36609 - trunk/libvo/vo_bl.c
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sat Jan 18 15:04:31 2014 New Revision: 36609 Log: vo_bl: consistently multiply by "channels". Currently makes no difference since it is always 1. Modified: trunk/libvo/vo_bl.c Modified: trunk/libvo/vo_bl.c ============================================================================== --- trunk/libvo/vo_bl.c Sat Jan 18 14:59:00 2014 (r36608) +++ trunk/libvo/vo_bl.c Sat Jan 18 15:04:31 2014 (r36609) @@ -155,8 +155,8 @@ static void bml_write_frame(bl_file_t *f fprintf(f->fp, " <frame duration=\"%d\">\n", duration); for (j = 0; j < bl->height; j++) { fprintf(f->fp, " <row>"); - for (k = 0; k < bl->width; k++) - fprintf(f->fp, "%02x", *(i + j * bl->width + k)); + for (k = 0; k < bl->width * bl->channels; k++) + fprintf(f->fp, "%02x", *(i + j * bl->width * bl->channels + k)); fprintf(f->fp, "</row>\n"); } fprintf(f->fp, " </frame>\n"); @@ -335,7 +335,8 @@ static void check_events(void) { } static uint32_t draw_image(mp_image_t *mpi) { - memcpy_pic(image, mpi->planes[0], mpi->w, mpi->h, bl->width, mpi->stride[0]); + memcpy_pic(image, mpi->planes[0], mpi->w * bl->channels, mpi->h, + bl->width * bl->channels, mpi->stride[0]); return VO_TRUE; }

1 0

r36608 - trunk/libvo/vo_bl.c
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sat Jan 18 14:59:00 2014 New Revision: 36608 Log: vo_bl: Simplify realloc + memset to calloc. Also remove a condition that obviously cannot be true. Modified: trunk/libvo/vo_bl.c Modified: trunk/libvo/vo_bl.c ============================================================================== --- trunk/libvo/vo_bl.c Sat Jan 18 14:55:52 2014 (r36607) +++ trunk/libvo/vo_bl.c Sat Jan 18 14:59:00 2014 (r36608) @@ -247,14 +247,14 @@ static int config(uint32_t width, uint32 } /* resize or allocate frame and tmp buffers */ - ptr = realloc(bl_packet, bl_size); /* space for header and image data */ - if (!ptr) { + free(bl_packet); + bl_packet = calloc(bl_size, 1); /* space for header and image data */ + if (!bl_packet) { mp_msg(MSGT_VO, MSGL_ERR, "bl: out of memory error\n"); goto err_out; } - bl_packet = ptr; - image = ((unsigned char*)bl_packet + 12); /* pointer to image data */ + ptr = realloc(tmp, bl_size); /* space for image data only, could be slightly smaller */ if (!ptr) { mp_msg(MSGT_VO, MSGL_ERR, "bl: out of memory error\n"); @@ -281,11 +281,6 @@ static int config(uint32_t width, uint32 mp_msg(MSGT_VO, MSGL_ERR, "bl: height of movie too large %d > %d\n", height, bl->height); goto err_out; } - if (!image) { - mp_msg(MSGT_VO, MSGL_ERR, "bl: image should be initialized, internal error\n"); - goto err_out; - } - memset(image, 0, bl_size - 12); /* blank the image */ mp_msg(MSGT_VO, MSGL_V, "vo_config bl called\n"); return 0; err_out:

1 0

r36607 - trunk/libvo/vo_bl.c
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sat Jan 18 14:55:52 2014 New Revision: 36607 Log: vo_bl: Simplify/avoid duplicating size calculations. Modified: trunk/libvo/vo_bl.c Modified: trunk/libvo/vo_bl.c ============================================================================== --- trunk/libvo/vo_bl.c Sat Jan 18 14:49:18 2014 (r36606) +++ trunk/libvo/vo_bl.c Sat Jan 18 14:55:52 2014 (r36607) @@ -237,16 +237,17 @@ static int config(uint32_t width, uint32 if (reset_width) bl->width = width; /* use width of movie */ if (reset_height) bl->height = height; /* use height of movie */ + bl_size = 12 + bl->width*bl->height*bl->channels; + /* check for maximum size of UDP packet */ - if (12 + bl->width*bl->height*bl->channels > 65507) { + if (bl_size > 65507) { mp_msg(MSGT_VO, MSGL_ERR, "bl: %dx%d-%d does not fit into an UDP packet\n", bl->width, bl->height, bl->channels); goto err_out; } /* resize or allocate frame and tmp buffers */ - bl_size = 12 + bl->width*bl->height*bl->channels; - ptr = realloc(bl_packet, 12 + bl->width*bl->height*3); /* space for header and image data */ + ptr = realloc(bl_packet, bl_size); /* space for header and image data */ if (!ptr) { mp_msg(MSGT_VO, MSGL_ERR, "bl: out of memory error\n"); goto err_out; @@ -254,7 +255,7 @@ static int config(uint32_t width, uint32 bl_packet = ptr; image = ((unsigned char*)bl_packet + 12); /* pointer to image data */ - ptr = realloc(tmp, bl->width*bl->height*3); /* space for image data only */ + ptr = realloc(tmp, bl_size); /* space for image data only, could be slightly smaller */ if (!ptr) { mp_msg(MSGT_VO, MSGL_ERR, "bl: out of memory error\n"); goto err_out; @@ -284,7 +285,7 @@ static int config(uint32_t width, uint32 mp_msg(MSGT_VO, MSGL_ERR, "bl: image should be initialized, internal error\n"); goto err_out; } - memset(image, 0, bl->width*bl->height*3); /* blank the image */ + memset(image, 0, bl_size - 12); /* blank the image */ mp_msg(MSGT_VO, MSGL_V, "vo_config bl called\n"); return 0; err_out:

1 0

r36606 - trunk/libvo/vo_bl.c
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sat Jan 18 14:49:18 2014 New Revision: 36606 Log: vo_bl: cosmetics, reindent. Modified: trunk/libvo/vo_bl.c Modified: trunk/libvo/vo_bl.c ============================================================================== --- trunk/libvo/vo_bl.c Sat Jan 18 14:46:54 2014 (r36605) +++ trunk/libvo/vo_bl.c Sat Jan 18 14:49:18 2014 (r36606) @@ -237,30 +237,29 @@ static int config(uint32_t width, uint32 if (reset_width) bl->width = width; /* use width of movie */ if (reset_height) bl->height = height; /* use height of movie */ - /* check for maximum size of UDP packet */ - if (12 + bl->width*bl->height*bl->channels > 65507) { - mp_msg(MSGT_VO, MSGL_ERR, "bl: %dx%d-%d does not fit into an UDP packet\n", - bl->width, bl->height, bl->channels); - goto err_out; - } + /* check for maximum size of UDP packet */ + if (12 + bl->width*bl->height*bl->channels > 65507) { + mp_msg(MSGT_VO, MSGL_ERR, "bl: %dx%d-%d does not fit into an UDP packet\n", + bl->width, bl->height, bl->channels); + goto err_out; + } - /* resize or allocate frame and tmp buffers */ - bl_size = 12 + bl->width*bl->height*bl->channels; - ptr = realloc(bl_packet, 12 + bl->width*bl->height*3); /* space for header and image data */ - if (ptr) - bl_packet = ptr; - else { - mp_msg(MSGT_VO, MSGL_ERR, "bl: out of memory error\n"); - goto err_out; - } - image = ((unsigned char*)bl_packet + 12); /* pointer to image data */ - ptr = realloc(tmp, bl->width*bl->height*3); /* space for image data only */ - if (ptr) - tmp = ptr; - else { - mp_msg(MSGT_VO, MSGL_ERR, "bl: out of memory error\n"); - goto err_out; - } + /* resize or allocate frame and tmp buffers */ + bl_size = 12 + bl->width*bl->height*bl->channels; + ptr = realloc(bl_packet, 12 + bl->width*bl->height*3); /* space for header and image data */ + if (!ptr) { + mp_msg(MSGT_VO, MSGL_ERR, "bl: out of memory error\n"); + goto err_out; + } + bl_packet = ptr; + + image = ((unsigned char*)bl_packet + 12); /* pointer to image data */ + ptr = realloc(tmp, bl->width*bl->height*3); /* space for image data only */ + if (!ptr) { + mp_msg(MSGT_VO, MSGL_ERR, "bl: out of memory error\n"); + goto err_out; + } + tmp = ptr; bl_packet->magic = htonl(0x23542666); bl_packet->width = htons(bl->width);

1 0

r36605 - trunk/libvo/vo_bl.c
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sat Jan 18 14:46:54 2014 New Revision: 36605 Log: vo_bl: minor simplification of size reinit case. Modified: trunk/libvo/vo_bl.c Modified: trunk/libvo/vo_bl.c ============================================================================== --- trunk/libvo/vo_bl.c Sat Jan 18 14:43:10 2014 (r36604) +++ trunk/libvo/vo_bl.c Sat Jan 18 14:46:54 2014 (r36605) @@ -234,20 +234,15 @@ static int config(uint32_t width, uint32 int reset_height = bl->height < 0; /* adapt size of Blinkenlights UDP stream to size of movie */ - if (reset_width || reset_height) { - if (reset_width) { /* use width of movie */ - bl->width = width; - } - if (reset_height) { /* use height of movie */ - bl->height = height; - } + if (reset_width) bl->width = width; /* use width of movie */ + if (reset_height) bl->height = height; /* use height of movie */ + /* check for maximum size of UDP packet */ if (12 + bl->width*bl->height*bl->channels > 65507) { mp_msg(MSGT_VO, MSGL_ERR, "bl: %dx%d-%d does not fit into an UDP packet\n", bl->width, bl->height, bl->channels); goto err_out; } - } /* resize or allocate frame and tmp buffers */ bl_size = 12 + bl->width*bl->height*bl->channels;

1 0