June 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r36301 - trunk/libvo/vo_vdpau.c
by reimar 06 Jun '13

06 Jun '13

Author: reimar Date: Thu Jun 6 15:03:50 2013 New Revision: 36301 Log: VDPAU: fix RGBA output to use a surface of correct size and to redraw on resize. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Wed Jun 5 04:13:06 2013 (r36300) +++ trunk/libvo/vo_vdpau.c Thu Jun 6 15:03:50 2013 (r36301) @@ -147,6 +147,7 @@ static VdpPreemptionCallbackRegister /* output_surfaces[NUM_OUTPUT_SURFACES] is misused for OSD. */ #define osd_surface output_surfaces[NUM_OUTPUT_SURFACES] static VdpOutputSurface output_surfaces[NUM_OUTPUT_SURFACES + 1]; +static VdpOutputSurface rgba_surface; static VdpVideoSurface deint_surfaces[3]; static mp_image_t *deint_mpi[2]; static int output_surface_width, output_surface_height; @@ -225,11 +226,27 @@ static void push_deint_surface(VdpVideoS deint_surfaces[0] = surface; } +static const uint32_t rotate_flags[4] = { + VDP_OUTPUT_SURFACE_RENDER_ROTATE_0, + VDP_OUTPUT_SURFACE_RENDER_ROTATE_90, + VDP_OUTPUT_SURFACE_RENDER_ROTATE_180, + VDP_OUTPUT_SURFACE_RENDER_ROTATE_270 +}; + static void video_to_output_surface(void) { VdpTime dummy; VdpStatus vdp_st; int i; + if (image_format == IMGFMT_BGRA) { + vdp_st = vdp_output_surface_render_output_surface(output_surfaces[surface_num], + &out_rect_vid, + rgba_surface, + &src_rect_vid, NULL, NULL, + rotate_flags[vo_rotate & 3]); + CHECK_ST_WARNING("Error when calling vdp_output_surface_render_output_surface") + return; + } if (vid_surface_num < 0) return; @@ -266,13 +283,6 @@ static void video_to_output_surface(void } } -static const uint32_t rotate_flags[4] = { - VDP_OUTPUT_SURFACE_RENDER_ROTATE_0, - VDP_OUTPUT_SURFACE_RENDER_ROTATE_90, - VDP_OUTPUT_SURFACE_RENDER_ROTATE_180, - VDP_OUTPUT_SURFACE_RENDER_ROTATE_270 -}; - static void resize(void) { VdpStatus vdp_st; @@ -317,19 +327,7 @@ static void resize(void) mp_msg(MSGT_VO, MSGL_DBG2, "OUT CREATE: %u\n", output_surfaces[i]); } } - if (image_format == IMGFMT_BGRA) { - vdp_st = vdp_output_surface_render_output_surface(output_surfaces[surface_num], - NULL, VDP_INVALID_HANDLE, - NULL, NULL, NULL, - rotate_flags[vo_rotate & 3]); - CHECK_ST_WARNING("Error when calling vdp_output_surface_render_output_surface") - vdp_st = vdp_output_surface_render_output_surface(output_surfaces[1 - surface_num], - NULL, VDP_INVALID_HANDLE, - NULL, NULL, NULL, - rotate_flags[vo_rotate & 3]); - CHECK_ST_WARNING("Error when calling vdp_output_surface_render_output_surface") - } else - video_to_output_surface(); + video_to_output_surface(); if (visible_buf) flip_page(); } @@ -538,6 +536,8 @@ static void mark_invalid(void) decoder = VDP_INVALID_HANDLE; video_mixer = VDP_INVALID_HANDLE; + rgba_surface = VDP_INVALID_HANDLE; + for (i = 0; i < 3; i++) deint_surfaces[i] = VDP_INVALID_HANDLE; @@ -558,6 +558,11 @@ static void free_video_specific(void) vdp_decoder_destroy(decoder); decoder_max_refs = -1; + if (rgba_surface != VDP_INVALID_HANDLE) { + vdp_st = vdp_output_surface_destroy(rgba_surface); + CHECK_ST_WARNING("Error destroying RGBA surface") + } + for (i = 0; i < MAX_VIDEO_SURFACES; i++) { if (surface_render[i].surface != VDP_INVALID_HANDLE) { vdp_st = vdp_video_surface_destroy(surface_render[i].surface); @@ -662,6 +667,7 @@ static int config(uint32_t width, uint32 uint32_t d_height, uint32_t flags, char *title, uint32_t format) { + VdpStatus vdp_st; XVisualInfo vinfo; XSetWindowAttributes xswa; XWindowAttributes attribs; @@ -741,6 +747,13 @@ static int config(uint32_t width, uint32 case IMGFMT_UYVY: vdp_pixel_format = VDP_YCBCR_FORMAT_UYVY; vdp_chroma_type = VDP_CHROMA_TYPE_422; + break; + case IMGFMT_BGRA: + vdp_st = vdp_output_surface_create(vdp_device, VDP_RGBA_FORMAT_B8G8R8A8, + vid_width, vid_height, + &rgba_surface); + CHECK_ST_ERROR("Error creating RGBA surface") + break; } if (create_vdp_mixer(vdp_chroma_type)) return -1; @@ -1040,16 +1053,10 @@ static uint32_t draw_image(mp_image_t *m } else if (image_format == IMGFMT_BGRA) { VdpStatus vdp_st; VdpRect r = {0, 0, vid_width, vid_height}; - vdp_st = vdp_output_surface_put_bits_native(output_surfaces[2], + vdp_st = vdp_output_surface_put_bits_native(rgba_surface, (void const*const*)mpi->planes, mpi->stride, &r); CHECK_ST_ERROR("Error when calling vdp_output_surface_put_bits_native") - vdp_st = vdp_output_surface_render_output_surface(output_surfaces[surface_num], - &out_rect_vid, - output_surfaces[2], - &src_rect_vid, NULL, NULL, - rotate_flags[vo_rotate & 3]); - CHECK_ST_ERROR("Error when calling vdp_output_surface_render_output_surface") } else if (!(mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)) { VdpStatus vdp_st; void *destdata[3] = {mpi->planes[0], mpi->planes[2], mpi->planes[1]}; @@ -1270,6 +1277,7 @@ static int preinit(const char *arg) output_surfaces[i] = VDP_INVALID_HANDLE; vdp_flip_queue = VDP_INVALID_HANDLE; output_surface_width = output_surface_height = -1; + rgba_surface = VDP_INVALID_HANDLE; // full grayscale palette. for (i = 0; i < PALETTE_SIZE; ++i)

1 0

r36300 - trunk/cpudetect.c
by reimar 05 Jun '13

05 Jun '13

Author: reimar Date: Wed Jun 5 04:13:06 2013 New Revision: 36300 Log: Update #if for previous commit, fixes compilation for cases that previously would have broken SSE detection. Modified: trunk/cpudetect.c Modified: trunk/cpudetect.c ============================================================================== --- trunk/cpudetect.c Tue Jun 4 22:31:32 2013 (r36299) +++ trunk/cpudetect.c Wed Jun 5 04:13:06 2013 (r36300) @@ -56,7 +56,7 @@ CpuCaps gCpuCaps; #if CONFIG_RUNTIME_CPUDETECT /* I believe this code works. However, it has only been used on a PII and PIII */ -#if defined(__linux__) && defined(_POSIX_SOURCE) && !ARCH_X86_64 +#if defined(__linux__) && !ARCH_X86_64 static void sigill_handler_sse( int signal, struct sigcontext sc ) { mp_msg(MSGT_CPUDETECT,MSGL_V, "SIGILL, " ); @@ -75,7 +75,7 @@ static void sigill_handler_sse( int sign gCpuCaps.hasSSE=0; } -#endif /* __linux__ && _POSIX_SOURCE */ +#endif /* __linux__ */ #if (defined(__MINGW32__) || defined(__CYGWIN__)) && !ARCH_X86_64 LONG CALLBACK win32_sig_handler_sse(EXCEPTION_POINTERS* ep)

1 0

r36299 - trunk/cpudetect.c
by reimar 04 Jun '13

04 Jun '13

Author: reimar Date: Tue Jun 4 22:31:32 2013 New Revision: 36299 Log: Remove unnecessary condition. We already assume that we have sigaction available on Linux, e.g. in the cache code. Might fix Bugzilla bug #2141. Modified: trunk/cpudetect.c Modified: trunk/cpudetect.c ============================================================================== --- trunk/cpudetect.c Mon Jun 3 19:38:06 2013 (r36298) +++ trunk/cpudetect.c Tue Jun 4 22:31:32 2013 (r36299) @@ -177,7 +177,6 @@ static void check_os_katmai_support( voi mp_msg(MSGT_CPUDETECT,MSGL_V, gCpuCaps.hasSSE ? "yes.\n" : "no!\n" ); } #elif defined(__linux__) -#if defined(_POSIX_SOURCE) struct sigaction saved_sigill; /* Save the original signal handlers. @@ -210,13 +209,6 @@ static void check_os_katmai_support( voi */ mp_msg(MSGT_CPUDETECT,MSGL_V, "Tests of OS support for SSE %s\n", gCpuCaps.hasSSE ? "passed." : "failed!" ); #else - /* We can't use POSIX signal handling to test the availability of - * SSE, so we disable it by default. - */ - mp_msg(MSGT_CPUDETECT,MSGL_WARN, "Cannot test OS support for SSE, disabling to be safe.\n" ); - gCpuCaps.hasSSE=0; -#endif /* _POSIX_SOURCE */ -#else /* Do nothing on other platforms for now. */ mp_msg(MSGT_CPUDETECT,MSGL_WARN, "Cannot test OS support for SSE, leaving disabled.\n" );

1 0

r36298 - trunk/libao2/ao_jack.c
by reimar 03 Jun '13

03 Jun '13

Author: reimar Date: Mon Jun 3 19:38:06 2013 New Revision: 36298 Log: Cosmetics: fix indentation. Modified: trunk/libao2/ao_jack.c Modified: trunk/libao2/ao_jack.c ============================================================================== --- trunk/libao2/ao_jack.c Mon Jun 3 19:38:04 2013 (r36297) +++ trunk/libao2/ao_jack.c Mon Jun 3 19:38:06 2013 (r36298) @@ -247,16 +247,16 @@ static int init(int rate, int channels, // list matching ports if connections should be made if (connect) { - if (!port_name) - port_flags |= JackPortIsPhysical; - matching_ports = jack_get_ports(client, port_name, NULL, port_flags); - i = 0; - while (matching_ports && matching_ports[i]) i++; - if (!i) { - mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] no physical ports available\n"); - goto err_out; - } - if (channels > i) channels = i; + if (!port_name) + port_flags |= JackPortIsPhysical; + matching_ports = jack_get_ports(client, port_name, NULL, port_flags); + i = 0; + while (matching_ports && matching_ports[i]) i++; + if (!i) { + mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] no physical ports available\n"); + goto err_out; + } + if (channels > i) channels = i; } num_ports = channels;

1 0

r36297 - in trunk: DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 libao2/ao_jack.c
by reimar 03 Jun '13

03 Jun '13

Author: reimar Date: Mon Jun 3 19:38:04 2013 New Revision: 36297 Log: Add (no)connect option to ao_jack. Patch by Markus Appel [masolomaster3000 googlemail com]. Modified: trunk/libao2/ao_jack.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/de/mplayer.1 trunk/DOCS/man/en/mplayer.1 Modified: trunk/libao2/ao_jack.c ============================================================================== --- trunk/libao2/ao_jack.c Mon Jun 3 13:20:28 2013 (r36296) +++ trunk/libao2/ao_jack.c Mon Jun 3 19:38:04 2013 (r36297) @@ -192,6 +192,8 @@ static void print_help (void) "Example: mplayer -ao jack:port=myout\n" " connects MPlayer to the jack ports named myout\n" "\nOptions:\n" + " connect\n" + " Automatically connect to output ports\n" " port=<port name>\n" " Connects to the given ports instead of the default physical ones\n" " name=<client name>\n" @@ -208,11 +210,13 @@ static int init(int rate, int channels, char *port_name = NULL; char *client_name = NULL; int autostart = 0; + int connect = 1; const opt_t subopts[] = { {"port", OPT_ARG_MSTRZ, &port_name, NULL}, {"name", OPT_ARG_MSTRZ, &client_name, NULL}, {"estimate", OPT_ARG_BOOL, &estimate, NULL}, {"autostart", OPT_ARG_BOOL, &autostart, NULL}, + {"connect", OPT_ARG_BOOL, &connect, NULL}, {NULL} }; jack_options_t open_options = JackUseExactName; @@ -241,7 +245,8 @@ static int init(int rate, int channels, buffer = av_fifo_alloc(BUFFSIZE); jack_set_process_callback(client, outputaudio, 0); - // list matching ports + // list matching ports if connections should be made + if (connect) { if (!port_name) port_flags |= JackPortIsPhysical; matching_ports = jack_get_ports(client, port_name, NULL, port_flags); @@ -252,6 +257,7 @@ static int init(int rate, int channels, goto err_out; } if (channels > i) channels = i; + } num_ports = channels; // create out_* output ports

1 0

r36296 - trunk/etc/codecs.conf
by cehoyos 03 Jun '13

03 Jun '13

Author: cehoyos Date: Mon Jun 3 13:20:28 2013 New Revision: 36296 Log: Support Go2Meeting v4 via Kostya's decoder in FFmpeg. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sun Jun 2 01:07:27 2013 (r36295) +++ trunk/etc/codecs.conf Mon Jun 3 13:20:28 2013 (r36296) @@ -1776,6 +1776,14 @@ videocodec eescreen guid 0x9a6e798c, 0x00ba, 0x478c, 0x8d, 0x64, 0x88, 0xf2, 0xe5, 0xb2, 0x5c, 0x1a out BGR32,BGR24,BGR16 ;,BGR15 +videocodec ffg2m + info "FFmpeg Go2Meeting" + status working + fourcc G2M4 + driver ffmpeg + dll g2m + out RGB24 + videocodec gotomeeting info "GoToMeeting codec" status working

1 0

r36295 - trunk/libmpcodecs/vf_mcdeint.c
by cehoyos 01 Jun '13

01 Jun '13

Author: cehoyos Date: Sun Jun 2 01:07:27 2013 New Revision: 36295 Log: mcdeint: avoid uninited data read Do not read padding or out-of-buffer values when computing the output value for a pixel close to the image buffer edge. This avoids non visible artifacts which affected the output checksum. Patch by Stefano Sabatini, stefasab gmail Modified: trunk/libmpcodecs/vf_mcdeint.c Modified: trunk/libmpcodecs/vf_mcdeint.c ============================================================================== --- trunk/libmpcodecs/vf_mcdeint.c Sat Jun 1 06:05:02 2013 (r36294) +++ trunk/libmpcodecs/vf_mcdeint.c Sun Jun 2 01:07:27 2013 (r36295) @@ -115,27 +115,49 @@ static void filter(struct vf_priv_s *p, for(y=0; y<h; y++){ if((y ^ p->parity) & 1){ for(x=0; x<w; x++){ - if((x-2)+(y-1)*w>=0 && (x+2)+(y+1)*w<w*h){ //FIXME either alloc larger images or optimize this + if(y>0 && y<h-1){ + int is_edge= x<3 || x>w-4; uint8_t *filp= &p->frame_dec->data[i][x + y*fils]; uint8_t *srcp= &src[i][x + y*srcs]; int diff0= filp[-fils] - srcp[-srcs]; int diff1= filp[+fils] - srcp[+srcs]; - int spatial_score= ABS(srcp[-srcs-1] - srcp[+srcs-1]) - +ABS(srcp[-srcs ] - srcp[+srcs ]) - +ABS(srcp[-srcs+1] - srcp[+srcs+1]) - 1; int temp= filp[0]; +#define DELTA(j) av_clip(j, -x, w-1-x) + +#define GET_SCORE_EDGE(j)\ + ABS(srcp[-srcs+DELTA(-1+(j))] - srcp[+srcs+DELTA(-1-(j))])+\ + ABS(srcp[-srcs+DELTA(j) ] - srcp[+srcs+DELTA( -(j))])+\ + ABS(srcp[-srcs+DELTA(1+(j)) ] - srcp[+srcs+DELTA( 1-(j))]) + +#define GET_SCORE(j)\ + ABS(srcp[-srcs-1+(j)] - srcp[+srcs-1-(j)])+\ + ABS(srcp[-srcs +(j)] - srcp[+srcs -(j)])+\ + ABS(srcp[-srcs+1+(j)] - srcp[+srcs+1-(j)]) + +#define CHECK_EDGE(j)\ + { int score= GET_SCORE_EDGE(j);\ + if(score < spatial_score){\ + spatial_score= score;\ + diff0= filp[-fils+DELTA(j)] - srcp[-srcs+DELTA(j)];\ + diff1= filp[+fils+DELTA(-(j))] - srcp[+srcs+DELTA(-(j))];\ + #define CHECK(j)\ - { int score= ABS(srcp[-srcs-1+j] - srcp[+srcs-1-j])\ - + ABS(srcp[-srcs +j] - srcp[+srcs -j])\ - + ABS(srcp[-srcs+1+j] - srcp[+srcs+1-j]);\ + { int score= GET_SCORE(j);\ if(score < spatial_score){\ spatial_score= score;\ - diff0= filp[-fils+j] - srcp[-srcs+j];\ - diff1= filp[+fils-j] - srcp[+srcs-j]; + diff0= filp[-fils+(j)] - srcp[-srcs+(j)];\ + diff1= filp[+fils-(j)] - srcp[+srcs-(j)];\ - CHECK(-1) CHECK(-2) }} }} - CHECK( 1) CHECK( 2) }} }} + if (is_edge) { + int spatial_score= GET_SCORE_EDGE(0)-1; + CHECK_EDGE(-1) CHECK_EDGE(-2) }} }} + CHECK_EDGE( 1) CHECK_EDGE( 2) }} }} + } else { + int spatial_score= GET_SCORE(0)-1; + CHECK(-1) CHECK(-2) }} }} + CHECK( 1) CHECK( 2) }} }} + } #if 0 if((diff0 ^ diff1) > 0){ int mindiff= ABS(diff0) > ABS(diff1) ? diff1 : diff0;

1 0