March 2009 - MPlayer-cvslog - lists.mplayerhq.hu

r23524 - trunk/etc/codecs.conf
by compn 10 Jun '10

10 Jun '10

Author: compn Date: Sat Jun 9 00:59:04 2007 New Revision: 23524 Log: add mmes fourcc for mpeg2 in avi files Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Sat Jun 9 00:59:04 2007 @@ -58,6 +58,7 @@ videocodec mpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -85,6 +86,7 @@ videocodec ffmpeg2 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -104,6 +106,7 @@ videocodec ffmpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -122,6 +125,7 @@ videocodec ffmpeg12mc fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" out IDCT_MPEG2

4 5

r28039 - trunk/etc/codecs.conf
by diego 04 Sep '09

04 Sep '09

Author: diego Date: Wed Nov 26 14:04:10 2008 New Revision: 28039 Log: Update Tremor comment regarding fixed-point mode. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Wed Nov 26 14:04:10 2008 @@ -3494,7 +3494,7 @@ audiocodec vorbis audiocodec tremor info "OggVorbis audio decoder" status working - comment "OggVorbis fixed-point decoder useful for ARM based systems" + comment "fixed-point decoder useful systems without floating-point unit" fourcc vrbs format 0x566F driver tremor

4 3

r28743 - trunk/libvo/vo_vdpau.c
by cehoyos 16 Aug '09

16 Aug '09

Author: cehoyos Date: Fri Feb 27 22:52:59 2009 New Revision: 28743 Log: Add one-field-only output for -vo vdpau. Change syntax of -vo vdpau:deint for the last time. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Fri Feb 27 22:46:13 2009 (r28742) +++ trunk/libvo/vo_vdpau.c Fri Feb 27 22:52:59 2009 (r28743) @@ -208,7 +208,7 @@ static void video_to_output_surface(void // we would need to provide 2 past and 1 future frames to allow advanced // deinterlacing, which is not really possible currently. - for (i = 0; i <= !!deint; i++) { + for (i = 0; i <= !!(deint > 1); i++) { int field = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME; VdpOutputSurface output_surface; if (i) @@ -394,9 +394,9 @@ static int create_vdp_mixer(VdpChromaTyp &vid_height, &vdp_chroma_type }; - if (deint == 2) - features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL; if (deint == 3) + features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL; + if (deint == 4) features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL; if (pullup) features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE; @@ -946,9 +946,10 @@ static const char help_msg[] = "\nOptions:\n" " deint (all modes > 0 respect -field-dominance)\n" " 0: no deinterlacing\n" - " 1: bob deinterlacing (current fallback)\n" - " 2: temporal deinterlacing (not yet working)\n" - " 3: temporal-spatial deinterlacing (not yet working)\n" + " 1: only show first field\n" + " 2: bob deinterlacing (current fallback)\n" + " 3: temporal deinterlacing (not yet working)\n" + " 4: temporal-spatial deinterlacing (not yet working)\n" " pullup\n" " Try to apply inverse-telecine (needs deinterlacing, not working)\n" " denoise\n"

2 1

r29118 - trunk/libvo/video_out.c
by cehoyos 31 Mar '09

31 Mar '09

Author: cehoyos Date: Wed Apr 1 00:06:40 2009 New Revision: 29118 Log: Prefer vo vdpau over vo xv where available. Modified: trunk/libvo/video_out.c Modified: trunk/libvo/video_out.c ============================================================================== --- trunk/libvo/video_out.c Wed Apr 1 00:00:00 2009 (r29117) +++ trunk/libvo/video_out.c Wed Apr 1 00:06:40 2009 (r29118) @@ -174,12 +174,12 @@ const vo_functions_t* const video_out_dr #ifdef CONFIG_3DFX &video_out_3dfx, #endif -#ifdef CONFIG_XV - &video_out_xv, -#endif #if CONFIG_VDPAU &video_out_vdpau, #endif +#ifdef CONFIG_XV + &video_out_xv, +#endif #ifdef CONFIG_X11 &video_out_x11, &video_out_xover,

1 0

r29117 - trunk/fmt-conversion.c
by reimar 31 Mar '09

31 Mar '09

Author: reimar Date: Wed Apr 1 00:00:00 2009 New Revision: 29117 Log: 100l, add forgotten BGR15 format to fmt-conversion.c table Modified: trunk/fmt-conversion.c Modified: trunk/fmt-conversion.c ============================================================================== --- trunk/fmt-conversion.c Tue Mar 31 20:49:04 2009 (r29116) +++ trunk/fmt-conversion.c Wed Apr 1 00:00:00 2009 (r29117) @@ -28,6 +28,7 @@ static const struct { {IMGFMT_BGR32, PIX_FMT_RGB32}, {IMGFMT_BGR24, PIX_FMT_BGR24}, {IMGFMT_BGR16, PIX_FMT_RGB565}, + {IMGFMT_BGR15, PIX_FMT_RGB555}, {IMGFMT_BGR8, PIX_FMT_RGB8}, {IMGFMT_BGR4, PIX_FMT_RGB4}, {IMGFMT_BGR1, PIX_FMT_MONOBLACK},

1 0

r29116 - trunk/etc/codecs.conf
by compn 31 Mar '09

31 Mar '09

Author: compn Date: Tue Mar 31 20:49:04 2009 New Revision: 29116 Log: cdvh decodes with ffdv Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Mar 31 19:11:04 2009 (r29115) +++ trunk/etc/codecs.conf Tue Mar 31 20:49:04 2009 (r29116) @@ -1524,6 +1524,7 @@ videocodec ffdv info "FFmpeg DV" status working fourcc CDVC,cdvc + fourcc CDVH,cdvh ; Canopus DVCPRO HD fourcc DVSD,dvsd ; PAL fourcc DVCS,dvcs ; NTSC ? fourcc "dvcp" ; PAL DV in .mov

1 0

r29112 - trunk/libvo/geometry.c
by reimar 31 Mar '09

31 Mar '09

Author: reimar Date: Tue Mar 31 18:16:12 2009 New Revision: 29112 Log: Get rid of nonsensical limits on -geometry x, y,w and h values, they only cause confusion on multi-monitor setups. Modified: trunk/libvo/geometry.c Modified: trunk/libvo/geometry.c ============================================================================== --- trunk/libvo/geometry.c Tue Mar 31 08:30:38 2009 (r29111) +++ trunk/libvo/geometry.c Tue Mar 31 18:16:12 2009 (r29112) @@ -20,6 +20,7 @@ #include <stdio.h> #include <string.h> +#include <limits.h> #include "geometry.h" #include "mp_msg.h" @@ -38,7 +39,7 @@ int geometry(int *xpos, int *ypos, int * { int width, height, xoff, yoff, xper, yper; - width = height = xoff = yoff = xper = yper = -1; + width = height = xoff = yoff = xper = yper = INT_MIN; if(vo_geometry != NULL) { if(sscanf(vo_geometry, "%ix%i+%i+%i", &width, &height, &xoff, &yoff) != 4 ) @@ -90,22 +91,14 @@ int geometry(int *xpos, int *ypos, int * mp_msg(MSGT_VO, MSGL_V,"geometry window parameter: widw: %i," " widh: %i, scrw: %i, scrh: %i\n",*widw, *widh, scrw, scrh); - /* FIXME: better checking of bounds... */ - if( width != -1 && (width < 0 || width > scrw)) - width = (scrw < *widw) ? scrw : *widw; - if( height != -1 && (height < 0 || height > scrh)) - height = (scrh < *widh) ? scrh : *widh; - if(xoff != -1 && (xoff < 0 || xoff + width > scrw)) xoff = 0; - if(yoff != -1 && (yoff < 0 || yoff + height > scrh)) yoff = 0; - - if(xoff != -1 && xpos) *xpos = xoff; - if(yoff != -1 && ypos) *ypos = yoff; - if(width != -1 && widw) *widw = width; - if(height != -1 && widh) *widh = height; + if (xoff != INT_MIN && xpos) *xpos = xoff; + if (yoff != INT_MIN && ypos) *ypos = yoff; + if (width > 0 && widw) *widw = width; + if (height > 0 && widh) *widh = height; - if( width != -1 || height != -1) + if (width > 0 || height > 0) geometry_wh_changed = 1; - if( xoff != -1 || yoff != -1) + if (xoff != INT_MIN || yoff != INT_MIN) geometry_xy_changed = 1; } return 1;

1 0

r29111 - trunk/cpuinfo.c
by zuxy 31 Mar '09

31 Mar '09

Author: zuxy Date: Tue Mar 31 08:30:38 2009 New Revision: 29111 Log: More flags; sync with Linux kernel. Modified: trunk/cpuinfo.c Modified: trunk/cpuinfo.c ============================================================================== --- trunk/cpuinfo.c Tue Mar 31 00:49:28 2009 (r29110) +++ trunk/cpuinfo.c Tue Mar 31 08:30:38 2009 (r29111) @@ -186,6 +186,8 @@ main(void) char *desc; } cap2[] = { CPUID_FEATURE_DEF(0, "pni", "SSE3 Extensions"), + CPUID_FEATURE_DEF(1, "pclmulqdq", "Carryless Multiplication"), + CPUID_FEATURE_DEF(2, "dtes64", "64-bit Debug Store"), CPUID_FEATURE_DEF(3, "monitor", "MONITOR/MWAIT"), CPUID_FEATURE_DEF(4, "ds_cpl", "CPL Qualified Debug Store"), CPUID_FEATURE_DEF(5, "vmx", "Virtual Machine Extensions"), @@ -194,13 +196,20 @@ main(void) CPUID_FEATURE_DEF(8, "tm2", "Thermal Monitor 2"), CPUID_FEATURE_DEF(9, "ssse3", "Supplemental SSE3"), CPUID_FEATURE_DEF(10, "cid", "L1 Context ID"), + CPUID_FEATURE_DEF(12, "fma", "Fused Multiply Add"), CPUID_FEATURE_DEF(13, "cx16", "CMPXCHG16B Available"), CPUID_FEATURE_DEF(14, "xtpr", "xTPR Disable"), CPUID_FEATURE_DEF(15, "pdcm", "Perf/Debug Capability MSR"), CPUID_FEATURE_DEF(18, "dca", "Direct Cache Access"), CPUID_FEATURE_DEF(19, "sse4_1", "SSE4.1 Extensions"), CPUID_FEATURE_DEF(20, "sse4_2", "SSE4.2 Extensions"), + CPUID_FEATURE_DEF(21, "x2apic", "x2APIC Feature"), + CPUID_FEATURE_DEF(22, "movbe", "MOVBE Instruction"), CPUID_FEATURE_DEF(23, "popcnt", "Pop Count Instruction"), + CPUID_FEATURE_DEF(25, "aes", "AES Instruction"), + CPUID_FEATURE_DEF(26, "xsave", "XSAVE/XRSTOR Extensions"), + CPUID_FEATURE_DEF(27, "osxsave", "XSAVE/XRSTOR Enabled in the OS"), + CPUID_FEATURE_DEF(28, "avx", "Advanced Vector Extension"), { -1 } }; static struct { @@ -227,7 +236,7 @@ main(void) CPUID_FEATURE_DEF(1, "cmp_legacy", "Chip Multi-Core"), CPUID_FEATURE_DEF(2, "svm", "Secure Virtual Machine"), CPUID_FEATURE_DEF(3, "extapic", "Extended APIC Space"), - CPUID_FEATURE_DEF(4, "cr8legacy", "CR8 Available in Legacy Mode"), + CPUID_FEATURE_DEF(4, "cr8_legacy", "CR8 Available in Legacy Mode"), CPUID_FEATURE_DEF(5, "abm", "Advanced Bit Manipulation"), CPUID_FEATURE_DEF(6, "sse4a", "SSE4A Extensions"), CPUID_FEATURE_DEF(7, "misalignsse", "Misaligned SSE Mode"),

1 0

r29110 - trunk/libmpdemux/mp_taglists.c
by bcoudurier 30 Mar '09

30 Mar '09

Author: bcoudurier Date: Tue Mar 31 00:49:28 2009 New Revision: 29110 Log: override lavf tag for pcm s24le, mov uses the same for s24be Modified: trunk/libmpdemux/mp_taglists.c Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Mon Mar 30 23:17:42 2009 (r29109) +++ trunk/libmpdemux/mp_taglists.c Tue Mar 31 00:49:28 2009 (r29110) @@ -59,6 +59,7 @@ static const AVCodecTag mp_wav_override_ { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's')}, { CODEC_ID_PCM_S16LE, 1}, { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')}, + { CODEC_ID_PCM_S24LE, 1}, { 0, 0 }, };

1 0

r29109 - trunk/libvo/vo_vdpau.c
by cehoyos 30 Mar '09

30 Mar '09

Author: cehoyos Date: Mon Mar 30 23:17:42 2009 New Revision: 29109 Log: Support IMGFMT_NV12 for vo vdpau. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Mon Mar 30 19:05:39 2009 (r29108) +++ trunk/libvo/vo_vdpau.c Mon Mar 30 23:17:42 2009 (r29109) @@ -607,6 +607,9 @@ static int config(uint32_t width, uint32 case IMGFMT_IYUV: vdp_pixel_format = VDP_YCBCR_FORMAT_YV12; break; + case IMGFMT_NV12: + vdp_pixel_format = VDP_YCBCR_FORMAT_NV12; + break; case IMGFMT_YUY2: vdp_pixel_format = VDP_YCBCR_FORMAT_YUYV; vdp_chroma_type = VDP_CHROMA_TYPE_422; @@ -903,6 +906,8 @@ static uint32_t draw_image(mp_image_t *m struct vdpau_render_state *rndr = get_surface(deint_counter); deint_counter = (deint_counter + 1) % 3; vid_surface_num = rndr - surface_render; + if (image_format == IMGFMT_NV12) + destdata[1] = destdata[2]; vdp_st = vdp_video_surface_put_bits_y_cb_cr(rndr->surface, vdp_pixel_format, (const void *const*)destdata, @@ -949,6 +954,7 @@ static int query_format(uint32_t format) case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: + case IMGFMT_NV12: case IMGFMT_YUY2: case IMGFMT_UYVY: return default_flags | VOCAP_NOSLICES;

1 0