May 2012 - MPlayer-cvslog - lists.mplayerhq.hu

r34909 - in trunk: Changelog DOCS/man/en/mplayer.1
by reimar 16 May '12

16 May '12

Author: reimar Date: Wed May 16 16:27:57 2012 New Revision: 34909 Log: Improve -dr descriptions. The Changelog info was not really correct, the speedup was due to avoiding a slowdown caused by force-pbo which suffers from too slow memcpy on PPC. Modified: trunk/Changelog Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Wed May 16 16:27:55 2012 (r34908) +++ trunk/Changelog Wed May 16 16:27:57 2012 (r34909) @@ -16,7 +16,6 @@ MPlayer Other: * -dr support for H.264 B-frames. - 40% faster frame blitting on e.g. PPC G4 Macs with -vo gl * support adding noise at output resolution with -vo gl:noise-strength=8 * experimental support for OpenGL ES 1.0 in -vo gl * support for PGS (BluRay-compatible), DVB and XSUB subtitles.

1 0

r34908 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 16 May '12

16 May '12

Author: reimar Date: Wed May 16 16:27:55 2012 New Revision: 34908 Log: Do not keep b_count/ip_count stuck at large numbers. Fixes nonref_dr mode getting stuck at disabled. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Wed May 16 16:27:54 2012 (r34907) +++ trunk/libmpcodecs/vd_ffmpeg.c Wed May 16 16:27:55 2012 (r34908) @@ -694,12 +694,10 @@ static void release_buffer(struct AVCode //printf("release buffer %d %d %d\n", mpi ? mpi->flags&MP_IMGFLAG_PRESERVE : -99, ctx->ip_count, ctx->b_count); - if(ctx->ip_count <= 2 && ctx->b_count<=1){ if(mpi->flags&MP_IMGFLAG_PRESERVE) ctx->ip_count--; else ctx->b_count--; - } if (mpi) { // release mpi (in case MPI_IMGTYPE_NUMBERED is used, e.g. for VDPAU)

1 0

r34907 - trunk/libvo/vo_gl.c
by reimar 16 May '12

16 May '12

Author: reimar Date: Wed May 16 16:27:54 2012 New Revision: 34907 Log: vo_gl: collect some frame statistics for DR. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Tue May 15 23:53:41 2012 (r34906) +++ trunk/libvo/vo_gl.c Wed May 16 16:27:54 2012 (r34907) @@ -166,6 +166,9 @@ static int ass_border_x, ass_border_y; static unsigned int slice_height = 1; +// performance statistics +static int imgcnt, dr_imgcnt, dr_rejectcnt; + static void redraw(void); static void resize(int x,int y){ @@ -444,6 +447,8 @@ skip_upload: */ static void uninitGl(void) { int i = 0; + mp_msg(MSGT_VO, MSGL_V, "Drawn %i frames, %i using DR, DR refused %i\n", + imgcnt, dr_imgcnt, dr_rejectcnt); if (mpglDeletePrograms && fragprog) mpglDeletePrograms(1, &fragprog); fragprog = 0; @@ -908,6 +913,7 @@ static int draw_slice(uint8_t *src[], in static uint32_t get_image(mp_image_t *mpi) { int needed_size; + dr_rejectcnt++; if (!mpglGenBuffers || !mpglBindBuffer || !mpglBufferData || !mpglMapBuffer) { if (!err_shown) mp_msg(MSGT_VO, MSGL_ERR, "[gl] extensions missing for dr\n" @@ -994,6 +1000,7 @@ static uint32_t get_image(mp_image_t *mp } } mpi->flags |= MP_IMGFLAG_DIRECT; + dr_rejectcnt--; return VO_TRUE; } @@ -1015,8 +1022,10 @@ static uint32_t draw_image(mp_image_t *m unsigned char *planes[3]; mp_image_t mpi2 = *mpi; int w = mpi->w, h = mpi->h; + imgcnt++; if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) goto skip_upload; + dr_imgcnt += !!(mpi->flags & MP_IMGFLAG_DIRECT); mpi2.flags = 0; mpi2.type = MP_IMGTYPE_TEMP; mpi2.width = mpi2.w; mpi2.height = mpi2.h; if (force_pbo && !(mpi->flags & MP_IMGFLAG_DIRECT) && !gl_bufferptr && get_image(&mpi2) == VO_TRUE) { @@ -1325,6 +1334,7 @@ static int preinit_internal(const char * "Use -vo gl:nomanyfmts if playback fails.\n"); mp_msg(MSGT_VO, MSGL_V, "[gl] Using %d as slice height " "(0 means image height).\n", slice_height); + imgcnt = dr_imgcnt = dr_rejectcnt = 0; return 0;

1 0

r34906 - trunk/libvo/vo_gl.c
by reimar 15 May '12

15 May '12

Author: reimar Date: Tue May 15 23:53:41 2012 New Revision: 34906 Log: Never default to force-pbo on non-x86. We end up using the system memcpy there and it tends to be far too slow. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Tue May 15 23:18:39 2012 (r34905) +++ trunk/libvo/vo_gl.c Tue May 15 23:53:41 2012 (r34906) @@ -496,7 +496,8 @@ static void autodetectGlExtensions(void) if (ati_hack == -1) ati_hack = ati_broken_pbo; if (force_pbo == -1) { force_pbo = 0; - if (extensions && strstr(extensions, "_pixel_buffer_object")) + // memcpy is just too slow at least on PPC. + if (ARCH_X86 && extensions && strstr(extensions, "_pixel_buffer_object")) force_pbo = is_ati; } if (use_rectangle == -1) {

1 0

r34905 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 15 May '12

15 May '12

Author: reimar Date: Tue May 15 23:18:39 2012 New Revision: 34905 Log: Do not return void type and remove broken duplicate code. The second copy of that code would only be run after we already tried to use mpi pointer, which means in the case it was supposed to handle we had already crashed. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Tue May 15 23:18:37 2012 (r34904) +++ trunk/libmpcodecs/vd_ffmpeg.c Tue May 15 23:18:39 2012 (r34905) @@ -687,8 +687,10 @@ static void release_buffer(struct AVCode sh_video_t *sh = avctx->opaque; vd_ffmpeg_ctx *ctx = sh->context; int i; - if (pic->type != FF_BUFFER_TYPE_USER) - return avcodec_default_release_buffer(avctx, pic); + if (pic->type != FF_BUFFER_TYPE_USER) { + avcodec_default_release_buffer(avctx, pic); + return; + } //printf("release buffer %d %d %d\n", mpi ? mpi->flags&MP_IMGFLAG_PRESERVE : -99, ctx->ip_count, ctx->b_count); @@ -704,11 +706,6 @@ static void release_buffer(struct AVCode mpi->usage_count--; } - if(pic->type!=FF_BUFFER_TYPE_USER){ - avcodec_default_release_buffer(avctx, pic); - return; - } - for(i=0; i<4; i++){ pic->data[i]= NULL; }

1 0

r34904 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 15 May '12

15 May '12

Author: reimar Date: Tue May 15 23:18:37 2012 New Revision: 34904 Log: Do not provide multiple B-frames for direct rendering. Fixes some extreme stuttering with some H.264 samples. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Tue May 15 22:56:53 2012 (r34903) +++ trunk/libmpcodecs/vd_ffmpeg.c Tue May 15 23:18:37 2012 (r34904) @@ -563,8 +563,10 @@ static int get_buffer(AVCodecContext *av } if (ctx->nonref_dr) { - if (flags & MP_IMGFLAG_PRESERVE) + if (flags & MP_IMGFLAG_PRESERVE || ctx->b_count > 1) { + if (!(flags & MP_IMGFLAG_PRESERVE)) ctx->b_count--; return avcodec_default_get_buffer(avctx, pic); + } type = MP_IMGTYPE_TEMP; }

1 0

r34903 - trunk/mplayer.c
by reimar 15 May '12

15 May '12

Author: reimar Date: Tue May 15 22:56:53 2012 New Revision: 34903 Log: Do not override mpctx->stream during free_demuxer. In case of e.g. the chained MPEG-PS in mov demuxer, that will end up freeing the wrong stream later on. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Tue May 15 20:27:56 2012 (r34902) +++ trunk/mplayer.c Tue May 15 22:56:53 2012 (r34903) @@ -586,10 +586,8 @@ void uninit_player(unsigned int mask) if (mask & INITIALIZED_DEMUXER) { initialized_flags &= ~INITIALIZED_DEMUXER; current_module = "free_demuxer"; - if (mpctx->demuxer) { - mpctx->stream = mpctx->demuxer->stream; + if (mpctx->demuxer) free_demuxer(mpctx->demuxer); - } mpctx->demuxer = NULL; }

1 0

r34902 - trunk/etc/codecs.conf
by cehoyos 15 May '12

15 May '12

Author: cehoyos Date: Tue May 15 20:27:56 2012 New Revision: 34902 Log: Add some dv video fourcc's found by Piotr Bandurski. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue May 15 19:54:31 2012 (r34901) +++ trunk/etc/codecs.conf Tue May 15 20:27:56 2012 (r34902) @@ -2141,6 +2141,7 @@ videocodec ffdv fourcc dvhd,dvsl,dv25,dc25 fourcc dvs1,dvh1,dvis,PDVC fourcc IPDV,ipdv + fourcc SL25,SLDV driver ffmpeg dll dvvideo out 411P,422P,YV12

1 0

r34901 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 15 May '12

15 May '12

Author: reimar Date: Tue May 15 19:54:31 2012 New Revision: 34901 Log: Fix direct rendering for H.264. H.264 files without B-frames would fail to play completely with "Too many buffered pts" messages. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Mon May 14 22:24:43 2012 (r34900) +++ trunk/libmpcodecs/vd_ffmpeg.c Tue May 15 19:54:31 2012 (r34901) @@ -798,7 +798,10 @@ static mp_image_t *decode(sh_video_t *sh pkt.size = 0; av_destruct_packet(&pkt); - dr1= ctx->do_dr1; + // even when we do dr we might actually get a buffer we had + // FFmpeg allocate - this mostly happens with nonref_dr. + // Ensure we treat it correctly. + dr1= ctx->do_dr1 && pic->type == FF_BUFFER_TYPE_USER; if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame!\n"); //printf("repeat: %d\n", pic->repeat_pict); //-- vstats generation

1 0

r34900 - in trunk/libvo: sdl_common.c sdl_common.h vo_gl.c
by reimar 14 May '12

14 May '12

Author: reimar Date: Mon May 14 22:24:43 2012 New Revision: 34900 Log: Fix -fs with SDL-based vo gl. Modified: trunk/libvo/sdl_common.c trunk/libvo/sdl_common.h trunk/libvo/vo_gl.c Modified: trunk/libvo/sdl_common.c ============================================================================== --- trunk/libvo/sdl_common.c Mon May 14 21:52:52 2012 (r34899) +++ trunk/libvo/sdl_common.c Mon May 14 22:24:43 2012 (r34900) @@ -93,6 +93,19 @@ void vo_sdl_uninit(void) SDL_QuitSubSystem(SDL_INIT_VIDEO); } +int vo_sdl_config(int w, int h, int flags, const char *title) +{ + SDL_WM_SetCaption(title, NULL); + vo_dwidth = old_w = w; + vo_dheight = old_h = h; + vo_fs = !!(flags & VOFLAG_FULLSCREEN); + if (vo_fs) { + vo_dwidth = vo_screenwidth; + vo_dheight = vo_screenheight; + } + return 1; +} + void vo_sdl_fullscreen(void) { if (vo_fs) { Modified: trunk/libvo/sdl_common.h ============================================================================== --- trunk/libvo/sdl_common.h Mon May 14 21:52:52 2012 (r34899) +++ trunk/libvo/sdl_common.h Mon May 14 22:24:43 2012 (r34900) @@ -31,6 +31,7 @@ int vo_sdl_init(void); void vo_sdl_uninit(void); +int vo_sdl_config(int w, int h, int flags, const char *title); void vo_sdl_fullscreen(void); SDL_Surface *sdl_set_mode(int bpp, uint32_t flags); int sdl_default_handle_event(SDL_Event *event); Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Mon May 14 21:52:52 2012 (r34899) +++ trunk/libvo/vo_gl.c Mon May 14 22:24:43 2012 (r34900) @@ -42,11 +42,7 @@ #include "sub/eosd.h" #ifdef CONFIG_GL_SDL -#ifdef CONFIG_SDL_SDL_H -#include <SDL/SDL.h> -#else -#include <SDL.h> -#endif +#include "sdl_common.h" #endif static const vo_info_t info = @@ -659,9 +655,8 @@ static int create_window(uint32_t d_widt #endif #ifdef CONFIG_GL_SDL if (glctx.type == GLTYPE_SDL) { - SDL_WM_SetCaption(title, NULL); - vo_dwidth = d_width; - vo_dheight = d_height; + if (!vo_sdl_config(d_width, d_height, flags, title)) + return -1; } #endif return 0;

1 0