June 2008 - 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

r26345 - trunk/libao2/ao_sun.c
by reimar 08 Mar '09

08 Mar '09

Author: reimar Date: Mon Apr 7 19:39:41 2008 New Revision: 26345 Log: reset() should not senselessly close and reopen the device but instead just call flush_audio() Modified: trunk/libao2/ao_sun.c Modified: trunk/libao2/ao_sun.c ============================================================================== --- trunk/libao2/ao_sun.c (original) +++ trunk/libao2/ao_sun.c Mon Apr 7 19:39:41 2008 @@ -588,29 +588,7 @@ static void uninit(int immed){ // stop playing and empty buffers (for seeking/pause) static void reset(void){ - audio_info_t info; - - uninit(1); - audio_fd=open(audio_dev, O_WRONLY); - if(audio_fd<0){ - mp_msg(MSGT_AO, MSGL_FATAL, MSGTR_AO_SUN_CantReopenReset, strerror(errno)); - return; - } - - ioctl(audio_fd, AUDIO_DRAIN, 0); - - AUDIO_INITINFO(&info); - info.play.encoding = af2sunfmt(ao_data.format); - info.play.precision = - (ao_data.format==AF_FORMAT_S16_NE - ? AUDIO_PRECISION_16 - : AUDIO_PRECISION_8); - info.play.channels = ao_data.channels; - info.play.sample_rate = ao_data.samplerate; - info.play.samples = 0; - info.play.eof = 0; - info.play.error = 0; - ioctl (audio_fd, AUDIO_SETINFO, &info); + flush_audio(audio_fd); queued_bursts = 0; queued_samples = 0; }

4 4

r23335 - in trunk: configure vidix/Makefile
by diego 04 Feb '09

04 Feb '09

Author: diego Date: Thu May 17 23:48:56 2007 New Revision: 23335 Log: Remove awk test. awk is a basic Unix tool, any implementation is sufficient. Modified: trunk/configure trunk/vidix/Makefile Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Thu May 17 23:48:56 2007 @@ -7179,28 +7179,7 @@ if test "$_vidix_internal" = auto ; then beos && _vidix_internal=no darwin && _vidix_internal=no fi - -# checking for a working awk, I'm using mawk first, because it's fastest - atmos -_awk=awk if test "$_vidix_internal" = yes ; then -_awk_verc_fail=yes -echocheck "awk" -for _awk in mawk gawk nawk; do - if ( $_awk 'BEGIN{testme();}function testme(){print"";}' ) >> "$TMPLOG" 2>&1; then - _awk_verc_fail=no - break - fi -done -test "$_awk_verc_fail" = yes && _awk=no -echores "$_awk" -if test "$_awk_verc_fail" = yes; then -echo "VIDIX needs awk, but no working implementation was found!" -echo "Try the GNU version, which can be downloaded from:" -echo "ftp://ftp.gnu.org/gnu/gawk/" -echo "If you don't need VIDIX, you can use configure --disable-vidix instead." -die "no awk" -fi -fi if test "$_vidix_internal" = yes; then _res_comment="internal" @@ -7544,7 +7523,6 @@ libdir = \$(LIBDIR) #AR = ar CC = $_cc HOST_CC = $_host_cc -AWK = $_awk RANLIB = $_ranlib LDCONFIG = $_ldconfig INSTALL = $_install Modified: trunk/vidix/Makefile ============================================================================== --- trunk/vidix/Makefile (original) +++ trunk/vidix/Makefile Thu May 17 23:48:56 2007 @@ -47,7 +47,7 @@ rage128_vid.o: radeon_vid.c $(CC) -c $(CFLAGS) -DRAGE128 -o $@ $< pci_names.c pci_dev_ids.c: pci.db - LC_ALL=C $(AWK) -f pci_db2c.awk $< + LC_ALL=C awk -f pci_db2c.awk $< clean:: rm -f pci_*.c pci_*.h

5 8

r26914 - in trunk: DOCS/xml/en/video.xml Makefile drivers/Makefile
by diego 10 Sep '08

10 Sep '08

Author: diego Date: Wed May 28 14:40:15 2008 New Revision: 26914 Log: Merge drivers/Makefile into top-level Makefile. Removed: trunk/drivers/Makefile Modified: trunk/Makefile Changes in other areas also in this revision: Modified: trunk/DOCS/xml/en/video.xml Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Wed May 28 14:40:15 2008 @@ -840,7 +840,7 @@ clean: rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir)))) rm -f mplayer$(EXESUF) mencoder$(EXESUF) -distclean: clean testsclean toolsclean +distclean: clean testsclean toolsclean driversclean rm -rf DOCS/tech/doxygen rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \ @@ -957,7 +957,41 @@ NETSTREAM_DEPS = libavutil/libavutil.a \ TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS) $(CC) $(CFLAGS) -o $@ $^ + + +###### drivers ####### + +KERNEL_INC = /lib/modules/`uname -r`/build/include +KERNEL_VERSION = $(shell grep RELEASE $(KERNEL_INC)/linux/version.h | cut -d'"' -f2) +KERNEL_CFLAGS = -O2 -D__KERNEL__ -DMODULE -Wall -I$(KERNEL_INC) -include $(KERNEL_INC)/linux/modversions.h +KERNEL_OBJS = $(addprefix drivers/, mga_vid.o tdfx_vid.o radeon_vid.o rage128_vid.o) +MODULES_DIR = /lib/modules/$(KERNEL_VERSION)/misc + +drivers: $(KERNEL_OBJS) drivers/mga_vid_test drivers/tdfx_vid_test + +$(KERNEL_OBJS) drivers/mga_vid_test drivers/tdfx_vid_test: CFLAGS = $(KERNEL_CFLAGS) +drivers/mga_vid.o: drivers/mga_vid.c drivers/mga_vid.h +drivers/tdfx_vid.o: drivers/tdfx_vid.c drivers/3dfx.h +drivers/radeon_vid.o drivers/rage128_vid.o: CFLAGS += -fomit-frame-pointer -fno-strict-aliasing -fno-common -ffast-math +drivers/radeon_vid.o: drivers/radeon_vid.c drivers/radeon.h drivers/radeon_vid.h +drivers/rage128_vid.o: drivers/radeon_vid.c drivers/radeon.h drivers/radeon_vid.h + $(CC) $(CFLAGS) -DRAGE128 -c $< -o $@ + +install-drivers: + -mkdir -p $(MODULES_DIR) + install -m 644 $(KERNEL_OBJS) $(MODULES_DIR) + depmod -a + -mknod /dev/mga_vid c 178 0 + -mknod /dev/tdfx_vid c 178 0 + -mknod /dev/radeon_vid c 178 0 + -ln -s /dev/radeon_vid /dev/rage128_vid + +driversclean: + rm -f drivers/*.o drivers/*~ drivers/mga_vid_test drivers/tdfx_vid_test + + + -include $(DEPS) -.PHONY: all doxygen *install* recurse *tools +.PHONY: all doxygen *install* recurse *tools drivers .PHONY: checkheaders *clean dep depend tests

5 5

r23727 - trunk/libdvdcss/libdvdcss.c
by reimar 30 Aug '08

30 Aug '08

Author: reimar Date: Sat Jul 7 00:07:35 2007 New Revision: 23727 Log: Fix CSS format strings, they could print more than two digits for "negative" numbers. Modified: trunk/libdvdcss/libdvdcss.c Modified: trunk/libdvdcss/libdvdcss.c ============================================================================== --- trunk/libdvdcss/libdvdcss.c (original) +++ trunk/libdvdcss/libdvdcss.c Sat Jul 7 00:07:35 2007 @@ -472,7 +472,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( { char psz_tmp[16 + 1]; sprintf( psz_tmp, - "%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x", + "%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"", psz_serial[0], psz_serial[1], psz_serial[2], psz_serial[3], psz_serial[4], psz_serial[5], psz_serial[6], psz_serial[7] ); @@ -488,7 +488,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( psz_key[0] = '-'; for( i = 0; i < KEY_SIZE; i++ ) { - sprintf( &psz_key[1+i*2], "%.2x", dvdcss->css.p_disc_key[i] ); + sprintf( &psz_key[1+i*2], "%.2"PRIx8, dvdcss->css.p_disc_key[i] ); } psz_key[1 + KEY_SIZE * 2] = '\0'; }

4 12

r26723 - in trunk: Makefile av_opts.c av_opts.h
by michael 18 Aug '08

18 Aug '08

Author: michael Date: Sat May 10 20:54:10 2008 New Revision: 26723 Log: AVOptions support. Added: trunk/av_opts.c trunk/av_opts.h Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Sat May 10 20:54:10 2008 @@ -261,7 +261,8 @@ SRCS_COMMON-$(LIBASS) += libass/ass_utils.c \ libmpcodecs/vf_ass.c \ -SRCS_COMMON-$(LIBAVCODEC) += libaf/af_lavcresample.c \ +SRCS_COMMON-$(LIBAVCODEC) += av_opts.c \ + libaf/af_lavcresample.c \ libmpcodecs/ad_ffmpeg.c \ libmpcodecs/vd_ffmpeg.c \ libmpcodecs/vf_lavc.c \ Added: trunk/av_opts.c ============================================================================== --- (empty file) +++ trunk/av_opts.c Sat May 10 20:54:10 2008 @@ -0,0 +1,27 @@ +#include <stdlib.h> +#include <string.h> +#include "libavcodec/opt.h" + +int parse_avopts(void *v, char *str){ + char *start; + start= str= strdup(str); + + while(str && *str){ + char *next_opt, *arg; + + next_opt= strchr(str, ','); + if(next_opt) *next_opt++= 0; + + arg = strchr(str, '='); + if(arg) *arg++= 0; + + if(!av_set_string(v, str, arg)){ + free(start); + return -1; + } + str= next_opt; + } + + free(start); + return 0; +} \ No newline at end of file Added: trunk/av_opts.h ============================================================================== --- (empty file) +++ trunk/av_opts.h Sat May 10 20:54:10 2008 @@ -0,0 +1,5 @@ + +/** + * Parses str and sets AVOptions in v accordingly. + */ +int parse_avopts(void *v, char *str); \ No newline at end of file

6 21

r27130 - trunk/Makefile
by diego 01 Jul '08

01 Jul '08

Author: diego Date: Tue Jun 24 10:48:04 2008 New Revision: 27130 Log: Do not unconditionally recurse into FFmpeg subdirectories. Instead, just recurse if any file in the subdirectory changed. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Tue Jun 24 10:48:04 2008 @@ -735,7 +735,13 @@ dep depend: $(DEPS) ALLPARTLIBS = $(foreach part, $(PARTS), $(part)/$(part).a) -$(ALLPARTLIBS): recurse +libavutil/libavutil.a: libavutil/*.[ch] +libavcodec/libavcodec.a: libavcodec/*.[ch] libavcodec/*/*.[chS] +libavformat/libavformat.a: libavformat/*.[ch] +libpostproc/libpostproc.a: libpostproc/*.[ch] +libswscale/libswscale.a: libswscale/*.[chS] + +$(ALLPARTLIBS): $(MAKE) -C $(@D) mplayer$(EXESUF): $(MPLAYER_DEPS) @@ -1051,5 +1057,5 @@ dhahelperwinclean: -include $(DEPS) -.PHONY: all doxygen *install* recurse *tools drivers dhahelper* +.PHONY: all doxygen *install* *tools drivers dhahelper* .PHONY: checkheaders *clean dep depend tests

3 2

r26842 - trunk/cfg-mplayer.h
by compn 01 Jul '08

01 Jul '08

Author: compn Date: Wed May 21 17:11:49 2008 New Revision: 26842 Log: remove extra dash in nocorrect-pts option Modified: trunk/cfg-mplayer.h Modified: trunk/cfg-mplayer.h ============================================================================== --- trunk/cfg-mplayer.h (original) +++ trunk/cfg-mplayer.h Wed May 21 17:11:49 2008 @@ -320,7 +320,7 @@ const m_option_t mplayer_opts[]={ // a-v sync stuff: {"correct-pts", &user_correct_pts, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"no-correct-pts", &user_correct_pts, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"nocorrect-pts", &user_correct_pts, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"noautosync", &autosync, CONF_TYPE_FLAG, 0, 0, -1, NULL}, {"autosync", &autosync, CONF_TYPE_INT, CONF_RANGE, 0, 10000, NULL}, // {"dapsync", &dapsync, CONF_TYPE_FLAG, 0, 0, 1, NULL},

4 6

[propchange]: r27180 - svn:log
by kraymer 30 Jun '08

30 Jun '08

Author: kraymer Revision: 27180 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -14,4 +14,23 @@ r26449: 10L, forgot to commit the docume r26460: restore options alphabetical order r26650: Update documentation for the gl2 driver to make clear gl is usually preferred. r26674: add h264 to list of supported codecs -r26732: Mark new opti +r26732: Mark new options Michael committed as undocumented. +r26739: Oops, remove stray .TP. +r26749: -psprobe can be used in mpeg-pes streams, too +r26762: Add a new suboption to -vo xv and -vo xvmc that allows selection +r26763: Remove '(pass 1/2)' from some lavcopts. These options really worked on +r26795: Add support for AppleIR Remote as an input under Linux systems. +r26798: Document the -noar command-line option in en/fr manpages. +r26806: Document x264's AQ options +r26853: Update gl vo section with the new force-pbo suboption. +r26909: Add a slave command to stop stream playback. +r26979: small spelling/wording fixes +r26986: Document VIDIXIVTVALPHA environment variable. +r26997: Fix codec-specific options syntax declaration to be less confusing and wrong. +r27057: Ability for specifying TV standard individually for each TV channel. +r27132: Fix/restore the description of the rectangle video filter. + +previously applied: +r27169: add missing escapes and full stops for scaletempo filter +r27179: remove two trailing whitespaces +

1 0

r27171 - trunk/stream/tvi_v4l2.c
by voroshil 30 Jun '08

30 Jun '08

Author: voroshil Date: Mon Jun 30 19:46:27 2008 New Revision: 27171 Log: Try to get frame rate information through VIDIOC_G_PARM if capture device driver (such as uvcvideo USB video driver) does not provide VIDIOC_G_STD ioctl. Modified: trunk/stream/tvi_v4l2.c Modified: trunk/stream/tvi_v4l2.c ============================================================================== --- trunk/stream/tvi_v4l2.c (original) +++ trunk/stream/tvi_v4l2.c Mon Jun 30 19:46:27 2008 @@ -448,6 +448,18 @@ static int getstd(priv_t *priv) int i=0; if (ioctl(priv->video_fd, VIDIOC_G_STD, &id) < 0) { + struct v4l2_streamparm parm; + + parm.type=V4L2_BUF_TYPE_VIDEO_CAPTURE; + if(ioctl(priv->video_fd, VIDIOC_G_PARM, &parm) >= 0) { + mp_msg(MSGT_TV, MSGL_WARN, "%s: your device driver does not support VIDIOC_G_STD ioctl," + " VIDIOC_G_PARM was used instead.\n", info.short_name); + priv->standard.index=0; + priv->standard.id=0; + priv->standard.frameperiod=parm.parm.capture.timeperframe; + return 0; + } + mp_msg(MSGT_TV, MSGL_ERR, "%s: ioctl get standard failed: %s\n", info.short_name, strerror(errno)); return -1;

1 0