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

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

r37363 - trunk/libmpcodecs/ad_ffmpeg.c
by SubJunk 02 Feb '15

02 Feb '15

Author: SubJunk Date: Thu Jan 22 04:37:31 2015 New Revision: 37363 Log: Fixed support for transcoding DTS-ES (7 channel audio) to AC-3 Like the previous commit, which reverted r37335, this one reverts an older revision that broke the DTS-ES transcoding support. Modified: trunk/libmpcodecs/ad_ffmpeg.c Modified: trunk/libmpcodecs/ad_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/ad_ffmpeg.c Thu Jan 22 03:29:44 2015 (r37362) +++ trunk/libmpcodecs/ad_ffmpeg.c Thu Jan 22 04:37:31 2015 (r37363) @@ -127,10 +127,7 @@ static int init(sh_audio_t *sh_audio) lavc_context->bits_per_coded_sample = sh_audio->wf->wBitsPerSample; } lavc_context->channel_layout = sh_audio->channel_layout; - if (audio_output_channels == 1) - lavc_context->request_channel_layout = AV_CH_LAYOUT_MONO; - else if (audio_output_channels == 2) - lavc_context->request_channel_layout = AV_CH_LAYOUT_STEREO; + lavc_context->request_channels = audio_output_channels; lavc_context->codec_tag = sh_audio->format; //FOURCC lavc_context->codec_id = lavc_codec->id; // not sure if required, imho not --A'rpi

2 1

r37360 - in trunk: configure gui/win32/skinload.c
by ib 19 Jan '15

19 Jan '15

Author: ib Date: Fri Jan 16 22:38:35 2015 New Revision: 37360 Log: Replace stricmp by strcasecmp. This is preferable to the approach in r37357. (We have to define strcasecmp for Wine because there is only a prototype for it with the msvcrt C library, but we are using the native glibc one.) Modified: trunk/configure trunk/gui/win32/skinload.c Modified: trunk/configure ============================================================================== --- trunk/configure Fri Jan 16 22:30:02 2015 (r37359) +++ trunk/configure Fri Jan 16 22:38:35 2015 (r37360) @@ -1821,7 +1821,7 @@ if os2 ; then fi if wine ; then - extra_cflags="-fno-pic -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ -DWINE_NOWINSOCK -Dstricmp=lstrcmpiA $extra_cflags" + extra_cflags="-fno-pic -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ -DWINE_NOWINSOCK -Dstrcasecmp=lstrcmpiA $extra_cflags" fi if darwin && test "$cc_vendor" != "clang" ; then Modified: trunk/gui/win32/skinload.c ============================================================================== --- trunk/gui/win32/skinload.c Fri Jan 16 22:30:02 2015 (r37359) +++ trunk/gui/win32/skinload.c Fri Jan 16 22:38:35 2015 (r37360) @@ -39,12 +39,6 @@ #include "gui/util/mem.h" #include "gui/util/bitmap.h" -#ifndef stricmp -#ifdef __CYGWIN__ -#define stricmp strcasecmp -#endif -#endif - #define MAX_LINESIZE 256 typedef struct @@ -152,7 +146,7 @@ static image *pngRead(skin_t *skin, cons char *filename = NULL; FILE *fp; - if(!stricmp(fname, "NULL")) return 0; + if(!strcasecmp(fname, "NULL")) return 0; /* find filename in order file file.png */ if(!(fp = fopen(fname, "rb")))

3 6

r37361 - in trunk: configure gui/win32/skinload.c
by ib 18 Jan '15

18 Jan '15

Author: ib Date: Sun Jan 18 20:39:27 2015 New Revision: 37361 Log: Silence warning on strcasecmp for the Win32 GUI Wine build. Include the native glibc header file and get rid of the reference to stricmp that way. Modified: trunk/configure trunk/gui/win32/skinload.c Modified: trunk/configure ============================================================================== --- trunk/configure Fri Jan 16 22:38:35 2015 (r37360) +++ trunk/configure Sun Jan 18 20:39:27 2015 (r37361) @@ -1821,7 +1821,7 @@ if os2 ; then fi if wine ; then - extra_cflags="-fno-pic -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ -DWINE_NOWINSOCK -Dstrcasecmp=lstrcmpiA $extra_cflags" + extra_cflags="-fno-pic -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ -DWINE_NOWINSOCK $extra_cflags" fi if darwin && test "$cc_vendor" != "clang" ; then Modified: trunk/gui/win32/skinload.c ============================================================================== --- trunk/gui/win32/skinload.c Fri Jan 16 22:38:35 2015 (r37360) +++ trunk/gui/win32/skinload.c Sun Jan 18 20:39:27 2015 (r37361) @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <string.h> +#include <strings.h> #include <stdlib.h> #include <stdio.h> #include <inttypes.h>

1 0

r37359 - in trunk: configure gui/win32/skinload.c
by ib 16 Jan '15

16 Jan '15

Author: ib Date: Fri Jan 16 22:30:02 2015 New Revision: 37359 Log: Revert r37358. We are going to fix the stricmp issue (r37357) differently. Modified: trunk/configure trunk/gui/win32/skinload.c Modified: trunk/configure ============================================================================== --- trunk/configure Wed Jan 14 18:51:27 2015 (r37358) +++ trunk/configure Fri Jan 16 22:30:02 2015 (r37359) @@ -1821,7 +1821,7 @@ if os2 ; then fi if wine ; then - extra_cflags="-fno-pic -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ -DWINE_NOWINSOCK $extra_cflags" + extra_cflags="-fno-pic -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ -DWINE_NOWINSOCK -Dstricmp=lstrcmpiA $extra_cflags" fi if darwin && test "$cc_vendor" != "clang" ; then Modified: trunk/gui/win32/skinload.c ============================================================================== --- trunk/gui/win32/skinload.c Wed Jan 14 18:51:27 2015 (r37358) +++ trunk/gui/win32/skinload.c Fri Jan 16 22:30:02 2015 (r37359) @@ -43,9 +43,6 @@ #ifdef __CYGWIN__ #define stricmp strcasecmp #endif -#ifdef __WINE__ -#define stricmp lstrcmpiA -#endif #endif #define MAX_LINESIZE 256

1 0

r37358 - in trunk: configure gui/win32/skinload.c
by ib 14 Jan '15

14 Jan '15

Author: ib Date: Wed Jan 14 18:51:27 2015 New Revision: 37358 Log: Relocate stricmp definition for Wine. Remove it from the configure script. Modified: trunk/configure trunk/gui/win32/skinload.c Modified: trunk/configure ============================================================================== --- trunk/configure Wed Jan 14 18:48:59 2015 (r37357) +++ trunk/configure Wed Jan 14 18:51:27 2015 (r37358) @@ -1821,7 +1821,7 @@ if os2 ; then fi if wine ; then - extra_cflags="-fno-pic -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ -DWINE_NOWINSOCK -Dstricmp=lstrcmpiA $extra_cflags" + extra_cflags="-fno-pic -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ -DWINE_NOWINSOCK $extra_cflags" fi if darwin && test "$cc_vendor" != "clang" ; then Modified: trunk/gui/win32/skinload.c ============================================================================== --- trunk/gui/win32/skinload.c Wed Jan 14 18:48:59 2015 (r37357) +++ trunk/gui/win32/skinload.c Wed Jan 14 18:51:27 2015 (r37358) @@ -43,6 +43,9 @@ #ifdef __CYGWIN__ #define stricmp strcasecmp #endif +#ifdef __WINE__ +#define stricmp lstrcmpiA +#endif #endif #define MAX_LINESIZE 256

1 0

r37357 - trunk/gui/win32/skinload.c
by ib 14 Jan '15

14 Jan '15

Author: ib Date: Wed Jan 14 18:48:59 2015 New Revision: 37357 Log: Define stricmp for the Win32 GUI if non-existent. This fixes a compile problem with recent Cygwin. Reported by Stephen Sheldon, sfsheldo gmail com. Modified: trunk/gui/win32/skinload.c Modified: trunk/gui/win32/skinload.c ============================================================================== --- trunk/gui/win32/skinload.c Mon Jan 12 13:09:20 2015 (r37356) +++ trunk/gui/win32/skinload.c Wed Jan 14 18:48:59 2015 (r37357) @@ -39,6 +39,12 @@ #include "gui/util/mem.h" #include "gui/util/bitmap.h" +#ifndef stricmp +#ifdef __CYGWIN__ +#define stricmp strcasecmp +#endif +#endif + #define MAX_LINESIZE 256 typedef struct

1 0

r37356 - trunk/libvo/vo_vdpau.c
by cigaes 12 Jan '15

12 Jan '15

Author: cigaes Date: Mon Jan 12 13:09:20 2015 New Revision: 37356 Log: vo_vdpau: fix border-pos interaction with EOSD. The current version causes very visible distortions when pos is far from 0.5. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Mon Jan 12 13:09:19 2015 (r37355) +++ trunk/libvo/vo_vdpau.c Mon Jan 12 13:09:20 2015 (r37356) @@ -172,7 +172,7 @@ static int static VdpRect src_rect_vid; static VdpRect out_rect_vid; -static int border_x, border_y; +static int border_l, border_r, border_t, border_b; static struct vdpau_render_state surface_render[MAX_VIDEO_SURFACES]; static int surface_num; @@ -299,8 +299,10 @@ static void resize(void) src_rect_vid.x1 = src_rect.right; src_rect_vid.y0 = flip ? src_rect.bottom : src_rect.top; src_rect_vid.y1 = flip ? src_rect.top : src_rect.bottom; - border_x = borders.left; - border_y = borders.top; + border_l = borders.left; + border_t = borders.top; + border_r = borders.right; + border_b = borders.bottom; #ifdef CONFIG_FREETYPE // adjust font size to display size force_load_font = 1; @@ -999,7 +1001,7 @@ static void draw_osd(void) if (handle_preemption() < 0) return; - vo_draw_text_ext(vo_dwidth, vo_dheight, border_x, border_y, border_x, border_y, + vo_draw_text_ext(vo_dwidth, vo_dheight, border_l, border_t, border_r, border_b, vid_width, vid_height, draw_osd_I8A8); } @@ -1431,8 +1433,10 @@ static int control(uint32_t request, voi if (vo_fs) { r->w = vo_screenwidth; r->h = vo_screenheight; - r->ml = r->mr = border_x; - r->mt = r->mb = border_y; + r->ml = border_l; + r->mr = border_r; + r->mt = border_t; + r->mb = border_b; } else { r->w = vo_dwidth; r->h = vo_dheight;

1 0

r37355 - trunk/libvo/video_out.c
by cigaes 12 Jan '15

12 Jan '15

Author: cigaes Date: Mon Jan 12 13:09:19 2015 New Revision: 37355 Log: video_out: compute right and bottom border in calc_src_dst_rects(). Modified: trunk/libvo/video_out.c Modified: trunk/libvo/video_out.c ============================================================================== --- trunk/libvo/video_out.c Mon Jan 12 13:09:18 2015 (r37354) +++ trunk/libvo/video_out.c Mon Jan 12 13:09:19 2015 (r37355) @@ -458,6 +458,8 @@ void calc_src_dst_rects(int src_width, i if (borders) { 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); + borders->right = vo_dwidth - scaled_width - borders->left; + borders->bottom = vo_dheight - scaled_height - borders->top; } src_dst_split_scaling(src_width, vo_dwidth, scaled_width, vo_border_pos_x, &src->left, &src->right, &dst->left, &dst->right);

1 0

r37354 - trunk/libvo/vo_gl.c
by cigaes 12 Jan '15

12 Jan '15

Author: cigaes Date: Mon Jan 12 13:09:18 2015 New Revision: 37354 Log: vo_gl: fix border-pos interaction with EOSD. The current version causes very visible distortions when pos is far from 0.5. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Wed Jan 7 11:26:45 2015 (r37353) +++ trunk/libvo/vo_gl.c Mon Jan 12 13:09:18 2015 (r37354) @@ -166,7 +166,7 @@ static int texture_width; static int texture_height; static int mpi_flipped; static int vo_flipped; -static int ass_border_x, ass_border_y; +static int ass_border_l, ass_border_r, ass_border_t, ass_border_b; static unsigned int slice_height = 1; @@ -214,7 +214,7 @@ static void resize(void) { } } - ass_border_x = ass_border_y = 0; + ass_border_l = ass_border_t = 0; if (aspect_scaling() && use_aspect) { int new_w, new_h; double scale_x, scale_y; @@ -235,8 +235,10 @@ static void resize(void) { if (vo_rotate & 1) { int tmp = new_w; new_w = new_h; new_h = tmp; } - 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); + ass_border_l = apply_border_pos(draw_width, new_w, vo_border_pos_x); + ass_border_t = apply_border_pos(draw_height, new_h, vo_border_pos_y); + ass_border_r = draw_width - new_w - ass_border_l; + ass_border_b = draw_height - new_h - ass_border_t; } mpglLoadMatrixf(video_matrix); @@ -840,7 +842,7 @@ static void draw_osd(void) clearOSD(); osd_w = scaled_osd ? image_width : draw_width; osd_h = scaled_osd ? image_height : draw_height; - vo_draw_text_ext(osd_w, osd_h, ass_border_x, ass_border_y, ass_border_x, ass_border_y, + vo_draw_text_ext(osd_w, osd_h, ass_border_l, ass_border_t, ass_border_r, ass_border_b, image_width, image_height, create_osd_texture); } if (vo_doublebuffering) do_render_osd(RENDER_OSD); @@ -1432,8 +1434,10 @@ static int control(uint32_t request, voi r->mt = r->mb = r->ml = r->mr = 0; if (scaled_osd) {r->w = image_width; r->h = image_height;} else if (aspect_scaling()) { - r->ml = r->mr = ass_border_x; - r->mt = r->mb = ass_border_y; + r->ml = ass_border_l; + r->ml = ass_border_r; + r->mt = ass_border_t; + r->mb = ass_border_b; } } return VO_TRUE;

1 0