February 2015 - MPlayer-cvslog - lists.mplayerhq.hu

r37376 - in trunk: DOCS/man/en/mplayer.1 cfg-mplayer.h libvo/video_out.c libvo/video_out.h libvo/vo_gl.c libvo/x11_common.c
by cigaes 27 Feb '15

27 Feb '15

Author: cigaes Date: Fri Feb 27 19:14:02 2015 New Revision: 37376 Log: libvo: implement fs-borders. Allow to specify extra borders in full screen mode. This is useful if part of the screen is unusuable, for example with a video projector overlapping on the furniture. Modified: trunk/cfg-mplayer.h trunk/libvo/video_out.c trunk/libvo/video_out.h trunk/libvo/vo_gl.c trunk/libvo/x11_common.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 Tue Feb 24 21:16:35 2015 (r37375) +++ trunk/cfg-mplayer.h Fri Feb 27 19:14:02 2015 (r37376) @@ -175,6 +175,10 @@ const m_option_t mplayer_opts[]={ {"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}, + {"fs-border-left", &vo_fs_border_l, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, + {"fs-border-right", &vo_fs_border_r, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, + {"fs-border-top", &vo_fs_border_t, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, + {"fs-border-bottom", &vo_fs_border_b, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, 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 Tue Feb 24 21:16:35 2015 (r37375) +++ trunk/libvo/video_out.c Fri Feb 27 19:14:02 2015 (r37376) @@ -67,6 +67,10 @@ 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_fs_border_l = 0; +int vo_fs_border_r = 0; +int vo_fs_border_t = 0; +int vo_fs_border_b = 0; int vo_rotate; int vo_ontop = 0; int vo_adapter_num=0; Modified: trunk/libvo/video_out.h ============================================================================== --- trunk/libvo/video_out.h Tue Feb 24 21:16:35 2015 (r37375) +++ trunk/libvo/video_out.h Fri Feb 27 19:14:02 2015 (r37376) @@ -233,6 +233,10 @@ extern int vo_fsmode; extern float vo_panscan; extern float vo_border_pos_x; extern float vo_border_pos_y; +extern int vo_fs_border_l; +extern int vo_fs_border_r; +extern int vo_fs_border_t; +extern int vo_fs_border_b; 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 Tue Feb 24 21:16:35 2015 (r37375) +++ trunk/libvo/vo_gl.c Fri Feb 27 19:14:02 2015 (r37376) @@ -203,6 +203,8 @@ static void resize(void) { geometry(&left, &top, &w, &h, vo_dwidth, vo_dheight); top = vo_dheight - h - top; mpglViewport(left, top, w, h); + } else if (vo_fs) { + mpglViewport(vo_fs_border_l, vo_fs_border_b, vo_dwidth, vo_dheight); } else mpglViewport(0, 0, vo_dwidth, vo_dheight); Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Tue Feb 24 21:16:35 2015 (r37375) +++ trunk/libvo/x11_common.c Fri Feb 27 19:14:02 2015 (r37376) @@ -963,6 +963,19 @@ int vo_x11_check_events(Display * mydisp return ret; } +static void vo_x11_update_fs_borders(void) +{ + if (!vo_fs) + return; + if (vo_dwidth <= vo_fs_border_l + vo_fs_border_r || + vo_dheight <= vo_fs_border_t + vo_fs_border_b) { + mp_msg(MSGT_VO, MSGL_ERR, "[x11] borders too wide, ignored.\n"); + return; + } + vo_dwidth -= vo_fs_border_l + vo_fs_border_r; + vo_dheight -= vo_fs_border_t + vo_fs_border_b; +} + /** * \brief sets the size and position of the non-fullscreen window. */ @@ -1145,6 +1158,7 @@ void vo_x11_create_vo_window(XVisualInfo vo_fs = 0; vo_dwidth = width; vo_dheight = height; + vo_x11_update_fs_borders(); vo_window = vo_x11_create_smooth_window(mDisplay, mRootWin, vis->visual, x, y, width, height, vis->depth, col_map); window_state = VOFLAG_HIDDEN; @@ -1189,6 +1203,7 @@ void vo_x11_create_vo_window(XVisualInfo // set the size values right. vo_dwidth = vo_screenwidth; vo_dheight = vo_screenheight; + vo_x11_update_fs_borders(); } final: if (vo_gc != None) @@ -1381,7 +1396,11 @@ int vo_x11_update_geometry(void) { Window dummy_win; XGetGeometry(mDisplay, vo_window, &dummy_win, &dummy_int, &dummy_int, &w, &h, &dummy_int, &depth); - if (w <= INT_MAX && h <= INT_MAX) { vo_dwidth = w; vo_dheight = h; } + if (w <= INT_MAX && h <= INT_MAX) { + vo_dwidth = w; + vo_dheight = h; + vo_x11_update_fs_borders(); + } XTranslateCoordinates(mDisplay, vo_window, mRootWin, 0, 0, &vo_dx, &vo_dy, &dummy_win);

1 0

r37375 - trunk/configure
by reimar 24 Feb '15

24 Feb '15

Author: reimar Date: Tue Feb 24 21:16:35 2015 New Revision: 37375 Log: configure: define HAVE_AS_FUNC to fix ARM compilation. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Feb 19 21:30:51 2015 (r37374) +++ trunk/configure Tue Feb 24 21:16:35 2015 (r37375) @@ -9189,6 +9189,7 @@ $def_gnutls #define HAVE_ALIGNED_STACK 1 #define HAVE_AS_DN_DIRECTIVE 1 +#define HAVE_AS_FUNC 1 #define HAVE_ASM_MOD_Q 1 #define HAVE_ATOMICS_GCC 1 #define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1

1 0

r37374 - trunk/configure
by michael 19 Feb '15

19 Feb '15

Author: michael Date: Thu Feb 19 21:30:51 2015 New Revision: 37374 Log: disable new qsv decoder to avoid build failure It would be better to implement proper detection of its dependancies but this at least makes sure build isnt broken Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Feb 11 15:08:46 2015 (r37373) +++ trunk/configure Thu Feb 19 21:30:51 2015 (r37374) @@ -1580,7 +1580,7 @@ libavmuxers=$(echo $libavmuxers_all) libavprotocols=$(echo $libavprotocols_all) libavfilters=$(echo $libavfilters_all) -libavdecoders=$(filter_out_component decoder 'LIB[A-Z0-9_]*') +libavdecoders=$(filter_out_component decoder 'LIB[A-Z0-9_]* H264_QSV') libavencoders=$(filter_out_component encoder 'LIB[A-Z0-9_]* NVENC') libavdemuxers=$(filter_out_component demuxer 'AVISYNTH LIB[A-Z0-9_]* REDIR') libavmuxers=$(filter_out_component muxer 'LIB[A-Z0-9_]* RTP RTSP SAP') @@ -8592,6 +8592,7 @@ CONFIG_H264QPEL= yes CONFIG_HPELDSP = yes CONFIG_IIRFILTER = yes CONFIG_QPELDSP = yes +CONFIG_QSV = no CONFIG_HUFFYUVDSP = yes CONFIG_HUFFYUVENCDSP = yes CONFIG_IDCTDSP = yes @@ -9183,6 +9184,7 @@ $def_gnutls #define CONFIG_SMALL 0 #define CONFIG_SWSCALE_ALPHA 1 #define SWS_MAX_FILTER_SIZE 256 +#define CONFIG_QSV 0 #define CONFIG_VAAPI 0 #define HAVE_ALIGNED_STACK 1

1 0

r37373 - trunk/libvo/vo_gl.c
by cigaes 11 Feb '15

11 Feb '15

Author: cigaes Date: Wed Feb 11 15:08:46 2015 New Revision: 37373 Log: vo_gl: fix typo introduced in r37354. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Wed Feb 11 02:51:12 2015 (r37372) +++ trunk/libvo/vo_gl.c Wed Feb 11 15:08:46 2015 (r37373) @@ -1435,7 +1435,7 @@ static int control(uint32_t request, voi if (scaled_osd) {r->w = image_width; r->h = image_height;} else if (aspect_scaling()) { r->ml = ass_border_l; - r->ml = ass_border_r; + r->mr = ass_border_r; r->mt = ass_border_t; r->mb = ass_border_b; }

1 0

r37372 - trunk/libmpcodecs/ad_spdif.c
by michael 11 Feb '15

11 Feb '15

Author: michael Date: Wed Feb 11 02:51:12 2015 New Revision: 37372 Log: mpcodecs/ad_spdif: Avoid build failure with access to internal field Note, this is not the optimal solution, mplayer should not access this field at all Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: trunk/libmpcodecs/ad_spdif.c Modified: trunk/libmpcodecs/ad_spdif.c ============================================================================== --- trunk/libmpcodecs/ad_spdif.c Tue Feb 10 14:46:10 2015 (r37371) +++ trunk/libmpcodecs/ad_spdif.c Wed Feb 11 02:51:12 2015 (r37372) @@ -23,6 +23,7 @@ #include "ad_internal.h" #include "av_helpers.h" #include "libavformat/avformat.h" +#include "libavformat/internal.h" #include "libavcodec/avcodec.h" #include "libavutil/opt.h" @@ -129,7 +130,7 @@ static int init(sh_audio_t *sh) break; } } - lavf_ctx->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE; + lavf_ctx->internal->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE; if (AVERROR_PATCHWELCOME == lavf_ctx->oformat->write_header(lavf_ctx)) { mp_msg(MSGT_DECAUDIO,MSGL_INFO, "This codec is not supported by spdifenc.\n");

1 0

r37371 - trunk/etc/codecs.conf
by cehoyos 10 Feb '15

10 Feb '15

Author: cehoyos Date: Tue Feb 10 14:46:10 2015 New Revision: 37371 Log: Support Radvision H.264 with codec_tag rv64. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Thu Feb 5 22:50:44 2015 (r37370) +++ trunk/etc/codecs.conf Tue Feb 10 14:46:10 2015 (r37371) @@ -1414,6 +1414,7 @@ videocodec ffh264 fourcc x3eV fourcc Q264,V264 fourcc GAVC,UMSV + fourcc rv64 ; Radvision format 0x10000005 driver ffmpeg dll h264 @@ -1436,6 +1437,7 @@ videocodec ffh264vdpau fourcc x3eV fourcc Q264,V264 fourcc GAVC,UMSV + fourcc rv64 ; Radvision format 0x10000005 driver ffmpeg dll h264 @@ -1455,6 +1457,7 @@ videocodec ffh264vdpauold fourcc x3eV fourcc Q264,V264 fourcc GAVC,UMSV + fourcc rv64 ; Radvision format 0x10000005 driver ffmpeg dll h264_vdpau @@ -1473,6 +1476,7 @@ videocodec ffh264crystalhd fourcc ai5p,ai5q,ai52,ai53 fourcc ai55,ai56 fourcc x3eV + fourcc rv64 ; Radvision format 0x10000005 driver ffmpeg dll h264_crystalhd @@ -1492,6 +1496,7 @@ videocodec ffh264vda fourcc ai55,ai56 fourcc x3eV fourcc Q264 + fourcc rv64 ; Radvision format 0x10000005 driver ffmpeg dll h264_vda @@ -1512,6 +1517,7 @@ videocodec coreavcwindows fourcc ai5p,ai5q,ai52,ai53 fourcc ai55,ai56 fourcc x3eV + fourcc rv64 ; Radvision format 0x10000005 driver dshow dll "CoreAVCDecoder.ax"

1 0

r37362 - trunk/libmpdemux/demux_mpg.c
by SubJunk 08 Feb '15

08 Feb '15

Author: SubJunk Date: Thu Jan 22 03:29:44 2015 New Revision: 37362 Log: Fixed support for DVD audio Modified: trunk/libmpdemux/demux_mpg.c Modified: trunk/libmpdemux/demux_mpg.c ============================================================================== --- trunk/libmpdemux/demux_mpg.c Sun Jan 18 20:39:27 2015 (r37361) +++ trunk/libmpdemux/demux_mpg.c Thu Jan 22 03:29:44 2015 (r37362) @@ -1107,6 +1107,13 @@ static demuxer_t* demux_mpg_ps_open(demu { sh_video_t *sh_video = demuxer->video->sh; + if(demuxer->audio->id!=-2) { + if(!ds_fill_buffer(demuxer->audio)){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,"MPEG: " MSGTR_MissingAudioStream); + demuxer->audio->sh=NULL; + } + } + if(sh_video && !sh_video->format && ps_probe > 0) { int head; off_t pos = stream_tell(demuxer->stream);

3 4

r37370 - trunk/configure
by reimar 05 Feb '15

05 Feb '15

Author: reimar Date: Thu Feb 5 22:50:44 2015 New Revision: 37370 Log: Basic aarch64 support. Patch by Marcin Juszkiewicz [mjuszkiewicz redhat] Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Feb 5 04:54:30 2015 (r37369) +++ trunk/configure Thu Feb 5 22:50:44 2015 (r37370) @@ -1716,6 +1716,7 @@ if test -z "$_target" ; then alpha) host_arch=alpha ;; sun4*|sparc*) host_arch=sparc ;; parisc*|hppa*|9000*) host_arch=hppa ;; + aarch64*) host_arch=aarch64 ;; arm*|zaurus|cats) host_arch=arm ;; sh3|sh4|sh4a) host_arch=sh ;; s390) host_arch=s390 ;; @@ -2421,6 +2422,11 @@ case "$host_arch" in _optimizing="$proc" ;; + aarch64) + arch='aarch64' + iproc='aarch64' + ;; + arm*) arch='arm' iproc='arm'

1 0

r37369 - trunk/etc/codecs.conf
by compn 05 Feb '15

05 Feb '15

Author: compn Date: Thu Feb 5 04:54:30 2015 New Revision: 37369 Log: add ap4x to prores decoders Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Feb 3 00:46:05 2015 (r37368) +++ trunk/etc/codecs.conf Thu Feb 5 04:54:30 2015 (r37369) @@ -3730,7 +3730,7 @@ videocodec qtprores fourcc apcn fourcc apcs fourcc apco - fourcc ap4h + fourcc ap4h,ap4x driver qtvideo dll "AppleProResDecoder.qtx" out YUY2 @@ -3742,7 +3742,7 @@ videocodec ffprores fourcc apcn fourcc apcs fourcc apco - fourcc ap4h + fourcc ap4h,ap4x driver ffmpeg dll prores out 422P10,444P10 @@ -3754,7 +3754,7 @@ videocodec ffproreslgpl fourcc apcn fourcc apcs fourcc apco - fourcc ap4h + fourcc ap4h,ap4x driver ffmpeg dll prores_lgpl out 422P10,444P10

1 0

r37368 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 02 Feb '15

02 Feb '15

Author: reimar Date: Tue Feb 3 00:46:05 2015 New Revision: 37368 Log: vd_ffmpeg.c: fix indentation after last commit. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Tue Feb 3 00:46:04 2015 (r37367) +++ trunk/libmpcodecs/vd_ffmpeg.c Tue Feb 3 00:46:05 2015 (r37368) @@ -605,16 +605,16 @@ static void update_configuration(sh_vide set_format_params(avctx, pix_fmt); if (!ignore_aspect) { - mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect); + mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect); - // Do not overwrite sh->original_aspect on the first call, - // if a container aspect is available (which is preferred then). - // But set it even if the sample aspect did not change, since a - // resolution change can cause an aspect change even if the - // _sample_ aspect is unchanged. - if (sh->original_aspect == 0 || (aspect_change && ctx->last_sample_aspect_ratio.den)) - sh->original_aspect = aspect; - ctx->last_sample_aspect_ratio = avctx->sample_aspect_ratio; + // Do not overwrite sh->original_aspect on the first call, + // if a container aspect is available (which is preferred then). + // But set it even if the sample aspect did not change, since a + // resolution change can cause an aspect change even if the + // _sample_ aspect is unchanged. + if (sh->original_aspect == 0 || (aspect_change && ctx->last_sample_aspect_ratio.den)) + sh->original_aspect = aspect; + ctx->last_sample_aspect_ratio = avctx->sample_aspect_ratio; } ctx->pix_fmt = pix_fmt; ctx->best_csp = pixfmt2imgfmt2(pix_fmt, avctx->codec_id);

1 0