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

r36284 - in trunk/libvo: video_out.h vo_gl.c
by reimar 25 May '13

25 May '13

Author: reimar Date: Sat May 25 10:42:25 2013 New Revision: 36284 Log: Apply forgotten move of apply_border_pos function. Fixes compilation. Modified: trunk/libvo/video_out.h trunk/libvo/vo_gl.c Modified: trunk/libvo/video_out.h ============================================================================== --- trunk/libvo/video_out.h Sat May 25 09:43:22 2013 (r36283) +++ trunk/libvo/video_out.h Sat May 25 10:42:25 2013 (r36284) @@ -305,4 +305,13 @@ static inline int aspect_scaling(void) return vo_fs || vo_keepaspect; } +static inline int apply_border_pos(int full, int part, float pos) { + if (pos >= 0.0 && pos <= 1.0) { + return pos*(full - part); + } + if (pos < 0) + return pos * part; + return full - part + (pos - 1) * part; +} + #endif /* MPLAYER_VIDEO_OUT_H */ Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sat May 25 09:43:22 2013 (r36283) +++ trunk/libvo/vo_gl.c Sat May 25 10:42:25 2013 (r36284) @@ -179,15 +179,6 @@ static void redraw(void); static float video_matrix[16]; static float osd_matrix[16]; -static int apply_border_pos(int full, int part, float pos) { - if (pos >= 0.0 && pos <= 1.0) { - return pos*(full - part); - } - if (pos < 0) - return pos * part; - return full - part + (pos - 1) * part; -} - static void resize(void) { int i; draw_width = (vo_rotate & 1) ? vo_dheight : vo_dwidth;

1 0

r36283 - in trunk: DOCS/man/en/mplayer.1 libvo/video_out.c
by reimar 25 May '13

25 May '13

Author: reimar Date: Sat May 25 09:43:22 2013 New Revision: 36283 Log: border_pos support for a few more vos. Modified: trunk/libvo/video_out.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/libvo/video_out.c ============================================================================== --- trunk/libvo/video_out.c Sat May 25 08:54:41 2013 (r36282) +++ trunk/libvo/video_out.c Sat May 25 09:43:22 2013 (r36283) @@ -406,6 +406,7 @@ int lookup_keymap_table(const struct mp_ * and destination rectangle like Direct3D and VDPAU */ static void src_dst_split_scaling(int src_size, int dst_size, int scaled_src_size, + float bpos, int *src_start, int *src_end, int *dst_start, int *dst_end) { if (scaled_src_size > dst_size) { int border = src_size * (scaled_src_size - dst_size) / scaled_src_size; @@ -418,7 +419,7 @@ static void src_dst_split_scaling(int sr } else { *src_start = 0; *src_end = src_size; - *dst_start = (dst_size - scaled_src_size) / 2; + *dst_start = apply_border_pos(dst_size, scaled_src_size, bpos); *dst_end = *dst_start + scaled_src_size; } } @@ -455,12 +456,12 @@ void calc_src_dst_rects(int src_width, i scaled_width += vo_panscan_x; scaled_height += vo_panscan_y; if (borders) { - borders->left = (vo_dwidth - scaled_width ) / 2; - borders->top = (vo_dheight - scaled_height) / 2; + borders->left = apply_border_pos(vo_dwidth, scaled_width, vo_border_pos_x); + borders->top = apply_border_pos(vo_dheight, scaled_height, vo_border_pos_y); } - src_dst_split_scaling(src_width, vo_dwidth, scaled_width, + src_dst_split_scaling(src_width, vo_dwidth, scaled_width, vo_border_pos_x, &src->left, &src->right, &dst->left, &dst->right); - src_dst_split_scaling(src_height, vo_dheight, scaled_height, + src_dst_split_scaling(src_height, vo_dheight, scaled_height, vo_border_pos_y, &src->top, &src->bottom, &dst->top, &dst->bottom); } src->left += crop->left; src->right += crop->left;

1 0

r36282 - in trunk: DOCS/man/en/mplayer.1 cfg-mplayer.h libvo/video_out.c libvo/video_out.h libvo/vo_gl.c
by reimar 25 May '13

25 May '13

Author: reimar Date: Sat May 25 08:54:41 2013 New Revision: 36282 Log: Add options to determine where borders will be added when adjusting for aspect. Modified: trunk/cfg-mplayer.h trunk/libvo/video_out.c trunk/libvo/video_out.h trunk/libvo/vo_gl.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/cfg-mplayer.h ============================================================================== --- trunk/cfg-mplayer.h Fri May 24 16:20:19 2013 (r36281) +++ trunk/cfg-mplayer.h Sat May 25 08:54:41 2013 (r36282) @@ -173,6 +173,8 @@ const m_option_t mplayer_opts[]={ {"novsync", &vo_vsync, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"panscan", &vo_panscan, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, {"panscanrange", &vo_panscanrange, CONF_TYPE_FLOAT, CONF_RANGE, -19.0, 99.0, NULL}, + {"border-pos-x", &vo_border_pos_x, CONF_TYPE_FLOAT, CONF_RANGE, -1, 2, NULL}, + {"border-pos-y", &vo_border_pos_y, CONF_TYPE_FLOAT, CONF_RANGE, -1, 2, NULL}, {"monitor-orientation", &vo_rotate, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL}, {"grabpointer", &vo_grabpointer, CONF_TYPE_FLAG, 0, 0, 1, NULL}, Modified: trunk/libvo/video_out.c ============================================================================== --- trunk/libvo/video_out.c Fri May 24 16:20:19 2013 (r36281) +++ trunk/libvo/video_out.c Sat May 25 08:54:41 2013 (r36282) @@ -65,6 +65,8 @@ int vo_vsync = 0; int vo_fs = 0; int vo_fsmode = 0; float vo_panscan = 0.0f; +float vo_border_pos_x = 0.5; +float vo_border_pos_y = 0.5; int vo_rotate; int vo_ontop = 0; int vo_adapter_num=0; Modified: trunk/libvo/video_out.h ============================================================================== --- trunk/libvo/video_out.h Fri May 24 16:20:19 2013 (r36281) +++ trunk/libvo/video_out.h Sat May 25 08:54:41 2013 (r36282) @@ -232,6 +232,8 @@ extern int vo_vsync; extern int vo_fs; extern int vo_fsmode; extern float vo_panscan; +extern float vo_border_pos_x; +extern float vo_border_pos_y; extern int vo_rotate; extern int vo_adapter_num; extern int vo_refresh_rate; Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Fri May 24 16:20:19 2013 (r36281) +++ trunk/libvo/vo_gl.c Sat May 25 08:54:41 2013 (r36282) @@ -179,6 +179,15 @@ static void redraw(void); static float video_matrix[16]; static float osd_matrix[16]; +static int apply_border_pos(int full, int part, float pos) { + if (pos >= 0.0 && pos <= 1.0) { + return pos*(full - part); + } + if (pos < 0) + return pos * part; + return full - part + (pos - 1) * part; +} + static void resize(void) { int i; draw_width = (vo_rotate & 1) ? vo_dheight : vo_dwidth; @@ -225,15 +234,15 @@ static void resize(void) { scale_y = (double)new_h / (double)vo_dheight; video_matrix[0] *= scale_x; video_matrix[4] *= scale_x; - video_matrix[12] *= scale_x; + video_matrix[12] = -1 + apply_border_pos(vo_dwidth, new_w, vo_border_pos_x) * 2.0 / vo_dwidth; video_matrix[1] *= scale_y; video_matrix[5] *= scale_y; - video_matrix[13] *= scale_y; + video_matrix[13] = 1 - apply_border_pos(vo_dheight, new_h, vo_border_pos_y) * 2.0 / vo_dheight; if (vo_rotate & 1) { int tmp = new_w; new_w = new_h; new_h = tmp; } - ass_border_x = (draw_width - new_w) / 2; - ass_border_y = (draw_height - new_h) / 2; + ass_border_x = apply_border_pos(draw_width, new_w, vo_border_pos_x); + ass_border_y = apply_border_pos(draw_height, new_h, vo_border_pos_y); } mpglLoadMatrixf(video_matrix);

1 0

r36281 - trunk/libmpcodecs/vf_stereo3d.c
by reimar 24 May '13

24 May '13

Author: reimar Date: Fri May 24 16:20:19 2013 New Revision: 36281 Log: Fix typo in parameter name. Modified: trunk/libmpcodecs/vf_stereo3d.c Modified: trunk/libmpcodecs/vf_stereo3d.c ============================================================================== --- trunk/libmpcodecs/vf_stereo3d.c Fri May 24 11:53:27 2013 (r36280) +++ trunk/libmpcodecs/vf_stereo3d.c Fri May 24 16:20:19 2013 (r36281) @@ -422,7 +422,7 @@ static const struct format_preset { {"arcc", ANAGLYPH_RC_COLOR}, {"anaglyph_red_cyan_color", ANAGLYPH_RC_COLOR}, {"arcd", ANAGLYPH_RC_DUBOIS}, - {"anaglyph_red_cyan_dubios", ANAGLYPH_RC_DUBOIS}, + {"anaglyph_red_cyan_dubois", ANAGLYPH_RC_DUBOIS}, {"agmg", ANAGLYPH_GM_GRAY}, {"anaglyph_green_magenta_gray", ANAGLYPH_GM_GRAY}, {"agmh", ANAGLYPH_GM_HALF},

1 0

r36280 - trunk/etc/codecs.conf
by reimar 24 May '13

24 May '13

Author: reimar Date: Fri May 24 11:53:27 2013 New Revision: 36280 Log: Remove incorrect comment, FFmpeg decoder supports 10 bit. Also make FFmpeg decoder the default. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat May 18 06:33:32 2013 (r36279) +++ trunk/etc/codecs.conf Fri May 24 11:53:27 2013 (r36280) @@ -3301,15 +3301,6 @@ videocodec ffcavs dll "cavs" out YV12,I420 -videocodec qtdnxhd - info "QuickTime Avid DNxHD" - comment "needed for decoding 10-bit DNxHD" - status working - fourcc AVdn - driver qtvideo - dll "AvidAVdnCodec.qtx" - out UYVY,BGR24 - videocodec ffdnxhd info "FFmpeg DNxHD" status working @@ -3318,6 +3309,14 @@ videocodec ffdnxhd dll "dnxhd" out 422P,422P10 +videocodec qtdnxhd + info "QuickTime Avid DNxHD" + status working + fourcc AVdn + driver qtvideo + dll "AvidAVdnCodec.qtx" + out UYVY,BGR24 + videocodec ffavui info "FFmpeg Avid Meridien" status working

1 0

r36278 - in trunk: configure mpcommon.c
by reimar 17 May '13

17 May '13

Author: reimar Date: Fri May 17 17:59:38 2013 New Revision: 36278 Log: Rename HAVE_CMOV to HAVE_I686 for FFmpeg. Keep the cmov name in configure since it is less confusing, since cmov is what we test for and also since for example VIA C3 sometimes is considered i686 that does not implement the optional CMOV instruction. Modified: trunk/configure trunk/mpcommon.c Modified: trunk/configure ============================================================================== --- trunk/configure Fri May 17 15:04:37 2013 (r36277) +++ trunk/configure Fri May 17 17:59:38 2013 (r36278) @@ -3122,7 +3122,7 @@ if arm ; then echores "$_iwmmxt" fi -cpuexts_all='ALTIVEC AVX MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV CMOV FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 NEON IWMMXT MMI VIS MVI' +cpuexts_all='ALTIVEC AVX MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 NEON IWMMXT MMI VIS MVI' test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" test "$_mmx" = yes && cpuexts="MMX $cpuexts" test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts" @@ -3136,7 +3136,7 @@ test "$_ssse3" = yes && cpuexts="SSS test "$_sse4_1" = yes && cpuexts="SSE4 $cpuexts" test "$_sse4_2" = yes && cpuexts="SSE42 $cpuexts" test "$_avx" = yes && cpuexts="AVX $cpuexts" -test "$_cmov" = yes && cpuexts="CMOV $cpuexts" +test "$_cmov" = yes && cpuexts="I686 $cpuexts" test "$_fast_cmov" = yes && cpuexts="FAST_CMOV $cpuexts" test "$_fast_clz" = yes && cpuexts="FAST_CLZ $cpuexts" test "$_armv5te" = yes && cpuexts="ARMV5TE $cpuexts" Modified: trunk/mpcommon.c ============================================================================== --- trunk/mpcommon.c Fri May 17 15:04:37 2013 (r36277) +++ trunk/mpcommon.c Fri May 17 17:59:38 2013 (r36278) @@ -106,7 +106,7 @@ if (HAVE_SSE42) mp_msg(MSGT_CPLAYER,MSGL_V," SSE4.2"); if (HAVE_AVX) mp_msg(MSGT_CPLAYER,MSGL_V," AVX"); -if (HAVE_CMOV) +if (HAVE_I686) mp_msg(MSGT_CPLAYER,MSGL_V," CMOV"); mp_msg(MSGT_CPLAYER,MSGL_V,"\n"); #endif /* CONFIG_RUNTIME_CPUDETECT */

1 0

r36277 - trunk/etc/codecs.conf
by cehoyos 17 May '13

17 May '13

Author: cehoyos Date: Fri May 17 15:04:37 2013 New Revision: 36277 Log: Do not prefer the binary AIC decoder over FFmpeg's. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Fri May 17 15:03:59 2013 (r36276) +++ trunk/etc/codecs.conf Fri May 17 15:04:37 2013 (r36277) @@ -3484,7 +3484,7 @@ videocodec ffaic videocodec qtaic info "QuickTime AIC video decoder" comment "Mac OS X only" - status untested + status working fourcc icod driver qtvideo dll "QuickTime.qts"

1 0

r36276 - trunk/etc/codecs.conf
by cehoyos 17 May '13

17 May '13

Author: cehoyos Date: Fri May 17 15:03:59 2013 New Revision: 36276 Log: Support FFmpeg Apple Intermediate Decoder. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Thu May 16 21:57:32 2013 (r36275) +++ trunk/etc/codecs.conf Fri May 17 15:03:59 2013 (r36276) @@ -3474,6 +3474,13 @@ videocodec qtcine out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8 out YV12,YUY2 +videocodec ffaic + info "FFmpeg Apple Intermediate" + fourcc icod + driver ffmpeg + dll aic + out YV12 + videocodec qtaic info "QuickTime AIC video decoder" comment "Mac OS X only"

1 0

r36275 - trunk/libvo/vo_gl.c
by reimar 16 May '13

16 May '13

Author: reimar Date: Thu May 16 21:57:32 2013 New Revision: 36275 Log: vo_gl: Extract some code into separate function. This should make it less messy to support other ways to do direct rendering. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Thu May 16 21:20:31 2013 (r36274) +++ trunk/libvo/vo_gl.c Thu May 16 21:57:32 2013 (r36275) @@ -986,26 +986,14 @@ static int draw_slice(uint8_t *src[], in return 0; } -static uint32_t get_image(mp_image_t *mpi) { +static int get_pbo_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" "Expect a _major_ speed penalty\n"); err_shown = 1; - return VO_FALSE; - } - if (gl_bufferptr) return VO_FALSE; - if (mpi->flags & MP_IMGFLAG_READABLE) return VO_FALSE; - if (mpi->type != MP_IMGTYPE_STATIC && mpi->type != MP_IMGTYPE_TEMP && - mpi->type != MP_IMGTYPE_IPB && - mpi->type != MP_IMGTYPE_NUMBERED) - return VO_FALSE; - if (mesa_buffer) mpi->width = texture_width; - else if (ati_hack) { - mpi->width = texture_width; - mpi->height = texture_height; + return 0; } mpi->stride[0] = mpi->width * mpi->bpp / 8; needed_size = mpi->stride[0] * mpi->height + 31; @@ -1040,7 +1028,7 @@ static uint32_t get_image(mp_image_t *mp mp_msg(MSGT_VO, MSGL_ERR, "[gl] could not acquire buffer for dr\n" "Expect a _major_ speed penalty\n"); err_shown = 1; - return VO_FALSE; + return 0; } if (is_yuv) { // planar YUV @@ -1076,6 +1064,24 @@ static uint32_t get_image(mp_image_t *mp mpi->planes[2] = gl_bufferptr_uv[1]; } } + return 1; +} + +static uint32_t get_image(mp_image_t *mpi) { + dr_rejectcnt++; + if (gl_bufferptr) return VO_FALSE; + if (mpi->flags & MP_IMGFLAG_READABLE) return VO_FALSE; + if (mpi->type != MP_IMGTYPE_STATIC && mpi->type != MP_IMGTYPE_TEMP && + mpi->type != MP_IMGTYPE_IPB && + mpi->type != MP_IMGTYPE_NUMBERED) + return VO_FALSE; + if (mesa_buffer) mpi->width = texture_width; + else if (ati_hack) { + mpi->width = texture_width; + mpi->height = texture_height; + } + if (!get_pbo_image(mpi)) + return VO_FALSE; mpi->flags |= MP_IMGFLAG_DIRECT; dr_rejectcnt--; return VO_TRUE;

1 0

r36274 - trunk/libvo/gl_common.c
by reimar 16 May '13

16 May '13

Author: reimar Date: Thu May 16 21:20:31 2013 New Revision: 36274 Log: Support 16-bit YUV on OpenGL ES. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Thu May 16 20:22:53 2013 (r36273) +++ trunk/libvo/gl_common.c Thu May 16 21:20:31 2013 (r36274) @@ -595,7 +595,8 @@ static void getFunctions(void *(*getProc else hqtexfmt = GL_RGB16; use_depth_l16 = !!strstr(allexts, "GL_EXT_shadow") || - !!strstr(allexts, "GL_ARB_shadow"); + !!strstr(allexts, "GL_ARB_shadow") || + !!strstr(allexts, "GL_OES_depth_texture"); free(allexts); } @@ -635,8 +636,8 @@ void glCreateClearTex(GLenum target, GLe // ensure we get enough bits GLint bits = 0; mpglGetTexLevelParameteriv(target, 0, GL_TEXTURE_LUMINANCE_SIZE, &bits); - if (bits > 0 && bits < 14 && (use_depth_l16 || HAVE_BIGENDIAN)) { - fmt = GL_DEPTH_COMPONENT16; + if (bits >= 0 && bits < 14 && (use_depth_l16 || HAVE_BIGENDIAN)) { + fmt = GL_DEPTH_COMPONENT; format = GL_DEPTH_COMPONENT; if (!use_depth_l16) { // if we cannot get 16 bit anyway, we can fall back

1 0