Author: rathann Update of /cvs/free/rpms/mplayer/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv28855 Modified Files: .cvsignore mplayer-nodvdcss.patch mplayer-x264.patch mplayer.spec sources Removed Files: mplayer-libgif.patch mplayer-llrintf.patch Log Message: * Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.113.20100703svn - 20100703 snapshot - rebased patches - dropped obsolete libgif patch - enabled libvpx support - enabled external libmpeg2 (internal copy is scheduled to be dropped by upstream) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mplayer/F-12/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 24 Apr 2010 22:01:05 -0000 1.15 +++ .cvsignore 3 Jul 2010 23:54:21 -0000 1.16 @@ -1,2 +1,2 @@ Blue-1.7.tar.bz2 -mplayer-export-2010-04-24.tar.bz2 +mplayer-export-2010-07-03.tar.bz2 mplayer-nodvdcss.patch: Makefile | 7 ------- configure | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) Index: mplayer-nodvdcss.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/F-12/mplayer-nodvdcss.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mplayer-nodvdcss.patch 24 Apr 2010 22:01:05 -0000 1.7 +++ mplayer-nodvdcss.patch 3 Jul 2010 23:54:21 -0000 1.8 @@ -1,7 +1,7 @@ -diff -up mplayer-export-2010-03-27/configure.nodvdcss mplayer-export-2010-03-27/configure ---- mplayer-export-2010-03-27/configure.nodvdcss 2010-03-25 20:53:05.000000000 +0100 -+++ mplayer-export-2010-03-27/configure 2010-03-27 22:54:31.000000000 +0100 -@@ -648,7 +648,7 @@ _dvdnavconfig=dvdnav-config +diff -up mplayer-export-2010-07-03/configure.nodvdcss mplayer-export-2010-07-03/configure +--- mplayer-export-2010-07-03/configure.nodvdcss 2010-07-02 18:52:32.000000000 +0200 ++++ mplayer-export-2010-07-03/configure 2010-07-03 18:00:01.000000000 +0200 +@@ -677,7 +677,7 @@ _dvdnavconfig=dvdnav-config _dvdreadconfig=dvdread-config _dvdread=auto _dvdread_internal=auto @@ -10,10 +10,10 @@ _xanim=auto _real=auto _live=auto -diff -up mplayer-export-2010-03-27/Makefile.nodvdcss mplayer-export-2010-03-27/Makefile ---- mplayer-export-2010-03-27/Makefile.nodvdcss 2010-03-27 22:54:31.000000000 +0100 -+++ mplayer-export-2010-03-27/Makefile 2010-03-27 22:55:40.000000000 +0100 -@@ -158,11 +158,6 @@ SRCS_COMMON-$(LIBDCA) += +diff -up mplayer-export-2010-07-03/Makefile.nodvdcss mplayer-export-2010-07-03/Makefile +--- mplayer-export-2010-07-03/Makefile.nodvdcss 2010-07-03 18:00:01.000000000 +0200 ++++ mplayer-export-2010-07-03/Makefile 2010-07-03 18:00:26.000000000 +0200 +@@ -146,11 +146,6 @@ SRCS_COMMON-$(LIBDCA) += SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ libmpcodecs/vd_libdv.c \ libmpdemux/demux_rawdv.c @@ -25,7 +25,7 @@ SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c -@@ -778,7 +773,6 @@ DIRS = . \ +@@ -764,7 +759,6 @@ DIRS = . \ libavutil/sh4 \ libavutil/tomi \ libavutil/x86 \ @@ -33,9 +33,9 @@ libdvdnav \ libdvdnav/vm \ libdvdread4 \ -@@ -907,7 +901,6 @@ codec-cfg.d codec-cfg.o: codecs.conf.h - $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h - $(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui osdep/mplayer.rc): version.h +@@ -887,7 +881,6 @@ $(call ADDSUFFIXES,.d .o,mpcommon osdep/ + + gui/%: CFLAGS += -Wno-strict-prototypes -libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS) libdvdnav/%: CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS) mplayer-x264.patch: configure | 2 libmpcodecs/ve_x264.c | 120 ++++++++++++++++++++++++-------------------------- 2 files changed, 60 insertions(+), 62 deletions(-) Index: mplayer-x264.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/F-12/mplayer-x264.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mplayer-x264.patch 24 Apr 2010 22:01:06 -0000 1.1 +++ mplayer-x264.patch 3 Jul 2010 23:54:21 -0000 1.2 @@ -1,19 +1,161 @@ -diff -up mplayer-export-2010-04-24/configure.x264 mplayer-export-2010-04-24/configure ---- mplayer-export-2010-04-24/configure.x264 2010-04-24 19:00:26.000000000 +0200 -+++ mplayer-export-2010-04-24/configure 2010-04-24 19:00:26.000000000 +0200 -@@ -7482,7 +7482,7 @@ if test "$_x264" = auto ; then +diff -up mplayer-export-2010-07-03/configure.x264 mplayer-export-2010-07-03/configure +--- mplayer-export-2010-07-03/configure.x264 2010-07-03 20:09:43.000000000 +0200 ++++ mplayer-export-2010-07-03/configure 2010-07-03 20:09:43.000000000 +0200 +@@ -7485,7 +7485,7 @@ if test "$_x264" = auto ; then cat > $TMPC << EOF #include <inttypes.h> #include <x264.h> --#if X264_BUILD < 89 +-#if X264_BUILD < 98 +#if X264_BUILD < 78 #error We do not support old versions of x264. Get the latest from git. #endif int main(void) { x264_encoder_open((void*)0); return 0; } -diff -up mplayer-export-2010-04-24/libmpcodecs/ve_x264.c.x264 mplayer-export-2010-04-24/libmpcodecs/ve_x264.c ---- mplayer-export-2010-04-24/libmpcodecs/ve_x264.c.x264 2010-04-20 11:14:54.000000000 +0200 -+++ mplayer-export-2010-04-24/libmpcodecs/ve_x264.c 2010-04-24 19:18:51.000000000 +0200 -@@ -152,7 +166,6 @@ static int config(struct vf_instance *vf +diff -up mplayer-export-2010-07-03/libmpcodecs/ve_x264.c.x264 mplayer-export-2010-07-03/libmpcodecs/ve_x264.c +--- mplayer-export-2010-07-03/libmpcodecs/ve_x264.c.x264 2010-06-10 23:58:03.000000000 +0200 ++++ mplayer-export-2010-07-03/libmpcodecs/ve_x264.c 2010-07-03 20:12:10.000000000 +0200 +@@ -56,6 +56,7 @@ typedef struct h264_module_t { + } h264_module_t; + + extern char* passtmpfile; ++static int turbo = 0; + static x264_param_t param; + static int parse_error = 0; + +@@ -64,79 +65,74 @@ static int encode_frame(struct vf_instan + + void x264enc_set_param(const m_option_t* opt, char* arg) + { +- static int initialized = 0; +- int slow_firstpass = 0; +- char *preset = NULL, *tune = NULL, *profile = NULL; +- char *p, *copy, *name; +- +- if (!initialized) { ++ static int initted = 0; ++ if(!initted) { + x264_param_default(&param); +- initialized = 1; ++ x264_param_parse(&param, "psnr", "no"); ++ x264_param_parse(&param, "ssim", "no"); ++ initted = 1; + } +- if (!arg) { +- mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: no options provided\n"); +- parse_error = 1; +- return; +- } else if (!*arg) +- /* Empty arguments, just doing initialization of default parameters. */ +- return; + +- /* Step 1: look for initial preset/tune. */ +- copy = p = strdup(arg); +- while ((name = strsep(&copy, ":"))) { +- char *value = strpbrk(name, "=:"); +- if (!value) +- continue; +- *value++ = 0; +- if (!strcasecmp(name, "preset")) +- preset = value; +- else if (!strcasecmp(name, "tune")) +- tune = value; +- } +- if (x264_param_default_preset(&param, preset, tune) < 0) { +- mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Invalid preset or tune.\n"); ++ if(!arg) { + parse_error = 1; ++ return; + } +- free(p); + +- /* Step 2: explicit user overrides */ +- while ((name = strsep(&arg, ":")) && *name) { +- int ret = 0; +- char *value = strpbrk(name, "=:"); +- +- if (value) +- *value++ = 0; +- if (!strcasecmp(name, "profile")) +- profile = value; +- else if (!strcasecmp(name, "turbo")) { +- mp_msg(MSGT_CFGPARSER, MSGL_WARN, "Option x264encopts: turbo option is deprecated; " +- "use slow_firstpass to disable turbo\n"); +- if (value && *value == '0') +- slow_firstpass = 1; +- } else if (!strcasecmp(name, "slow_firstpass")) +- slow_firstpass = 1; +- else if (strcasecmp(name, "preset") && strcasecmp(name, "tune")) { +- ret = x264_param_parse(&param, name, value); +- if (ret == X264_PARAM_BAD_NAME) +- mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Unknown suboption %s\n", name); +- if (ret == X264_PARAM_BAD_VALUE) +- mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Bad argument %s=%s\n", +- name, value ? value : "(null)"); ++ while(*arg) { ++ char *name = arg; ++ char *value; ++ int ret; ++ ++ arg += strcspn(arg, ":"); ++ if(*arg) { ++ *arg = 0; ++ arg++; ++ } ++ ++ value = strchr( name, '=' ); ++ if(value) { ++ *value = 0; ++ value++; ++ } + ++ if(!strcmp(name, "turbo")) { ++ turbo = value ? atoi(value) : 1; ++ continue; + } ++ ++ ret = x264_param_parse(&param, name, value); ++ if(ret == X264_PARAM_BAD_NAME) ++ mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Unknown suboption %s\n", name); ++ if(ret == X264_PARAM_BAD_VALUE) ++ mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Bad argument %s=%s\n", name, value ? value : "(null)"); ++ + /* mark this option as done, so it's not reparsed if there's another -x264encopts */ + *name = 0; + + parse_error |= ret; + } + +- /* Step 3: Apply fast first pass (turbo) options. */ +- if (!slow_firstpass) +- x264_param_apply_fastfirstpass(&param); +- +- /* Step 4: enforce profile */ +- if (profile && x264_param_apply_profile(&param, profile) < 0) +- parse_error = 1; ++ if(param.rc.b_stat_write && !param.rc.b_stat_read) { ++ /* Adjust or disable some flags to gain speed in the first pass */ ++ if(turbo == 1) ++ { ++ param.i_frame_reference = ( param.i_frame_reference + 1 ) >> 1; ++ param.analyse.i_subpel_refine = FFMAX( FFMIN( 3, param.analyse.i_subpel_refine - 1 ), 1 ); ++ param.analyse.inter &= ( ~X264_ANALYSE_PSUB8x8 ); ++ param.analyse.inter &= ( ~X264_ANALYSE_BSUB16x16 ); ++ param.analyse.i_trellis = 0; ++ } ++ else if(turbo >= 2) ++ { ++ param.i_frame_reference = 1; ++ param.analyse.i_subpel_refine = 1; ++ param.analyse.i_me_method = X264_ME_DIA; ++ param.analyse.inter = 0; ++ param.analyse.b_transform_8x8 = 0; ++ param.analyse.b_weighted_bipred = 0; ++ param.analyse.i_trellis = 0; ++ } ++ } + } + + static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { +@@ -156,7 +152,6 @@ static int config(struct vf_instance *vf param.i_height = height; param.i_fps_num = mod->mux->h.dwRate; param.i_fps_den = mod->mux->h.dwScale; @@ -21,15 +163,15 @@ param.vui.i_sar_width = d_width*height; param.vui.i_sar_height = d_height*width; -@@ -258,7 +258,10 @@ +@@ -264,7 +259,10 @@ static int encode_frame(struct vf_instan return -1; } if(i_size>0) { +- int keyframe = pic_out.b_keyframe; + int keyframe = (pic_out.i_type == X264_TYPE_IDR) || + (pic_out.i_type == X264_TYPE_I + && param.i_frame_reference == 1 + && !param.i_bframe); -- int keyframe = pic_out.b_keyframe; memcpy(mod->mux->buffer, nal->p_payload, i_size); muxer_write_chunk(mod->mux, i_size, keyframe?AVIIF_KEYFRAME:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); } Index: mplayer.spec =================================================================== RCS file: /cvs/free/rpms/mplayer/F-12/mplayer.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mplayer.spec 24 Apr 2010 22:12:03 -0000 1.26 +++ mplayer.spec 3 Jul 2010 23:54:21 -0000 1.27 @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20100424svn +%define pre 20100703svn %define svn 1 -%define svnbuild 2010-04-24 +%define svnbuild 2010-07-03 %define faad2min 1:2.6.1 Name: mplayer Version: 1.0 -Release: 0.112.%{pre}%{?dist} +Release: 0.113.%{pre}%{?dist} Summary: Movie player playing most video formats and DVDs Group: Applications/Multimedia @@ -27,9 +27,7 @@ Patch2: %{name}-config.patch Patch8: %{name}-manlinks.patch Patch14: %{name}-nodvdcss.patch -Patch15: %{name}-libgif.patch Patch16: %{name}-x264.patch -Patch17: %{name}-llrintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -61,9 +59,11 @@ BuildRequires: libdvdnav-devel >= 4.1.3-1 BuildRequires: libjpeg-devel BuildRequires: libmpcdec-devel +BuildRequires: libmpeg2-devel BuildRequires: libtheora-devel BuildRequires: libvdpau-devel BuildRequires: libvorbis-devel +BuildRequires: libvpx-devel >= 0.9.1 BuildRequires: lirc-devel BuildRequires: live555-devel BuildRequires: lzo-devel >= 2 @@ -190,18 +190,17 @@ --disable-mp3lame-lavc \\\ --disable-x264-lavc \\\ \\\ - --disable-liba52-internal \\\ %{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\ %{!?_with_faac:--disable-faac} \\\ --disable-faad-internal \\\ %{!?_with_libmad:--disable-mad} \\\ + --disable-libmpeg2-internal \\\ --disable-tremor-internal \\\ %{?_with_xmms:--enable-xmms} \\\ %{?_with_xmms:--with-xmmslibdir=%{_libdir}} \\\ \\\ --disable-bitmap-font \\\ --%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \\\ - --with-fribidi-config="pkg-config fribidi" \\\ %{!?_with_svgalib:--disable-svga} \\\ --disable-termcap \\\ --enable-xvmc \\\ @@ -222,9 +221,7 @@ %patch2 -p1 -b .config %patch8 -p1 -b .manlinks %patch14 -p1 -b .nodvdcss -%patch15 -p1 -b .libgif %patch16 -p1 -b .x264 -%patch17 -p1 -b .llrintf doconv() { iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \ @@ -397,6 +394,13 @@ %{_datadir}/mplayer/*.fp %changelog +* Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.113.20100703svn +- 20100703 snapshot +- rebased patches +- dropped obsolete libgif patch +- enabled libvpx support +- enabled external libmpeg2 (internal copy is scheduled to be dropped by upstream) + * Sat Apr 24 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.112.20100424svn - 20100424 snapshot - drop unused patch Index: sources =================================================================== RCS file: /cvs/free/rpms/mplayer/F-12/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 24 Apr 2010 22:01:06 -0000 1.16 +++ sources 3 Jul 2010 23:54:21 -0000 1.17 @@ -1,2 +1,2 @@ e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 -db1f4d70e2c1dc400e543269a525208b mplayer-export-2010-04-24.tar.bz2 +6169cad296bd67c399fd3dc18cca71aa mplayer-export-2010-07-03.tar.bz2 --- mplayer-libgif.patch DELETED --- --- mplayer-llrintf.patch DELETED ---