[Mplayer-cvslog] CVS: main Makefile, 1.299, 1.300 cfg-mencoder.h, 1.87, 1.88 configure, 1.908, 1.909 mencoder.c, 1.252, 1.253
Ivan Kalvachev CVS
syncmail at mplayerhq.hu
Fri Aug 27 22:43:07 CEST 2004
CVS change done by Ivan Kalvachev CVS
Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv26158
Modified Files:
Makefile cfg-mencoder.h configure mencoder.c
Log Message:
x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- Makefile 23 Aug 2004 00:25:19 -0000 1.299
+++ Makefile 27 Aug 2004 20:43:04 -0000 1.300
@@ -32,7 +32,7 @@
VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(CACA_LIB)
AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(JACK_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
-CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(DTS_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB)
+CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(DTS_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(X264_LIB)
COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB)
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall
Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- cfg-mencoder.h 19 May 2004 04:33:00 -0000 1.87
+++ cfg-mencoder.h 27 Aug 2004 20:43:04 -0000 1.88
@@ -63,6 +63,10 @@
extern m_option_t xvidencopts_conf[];
#endif
+#if defined(HAVE_X264)
+extern m_option_t x264encopts_conf[];
+#endif
+
extern m_option_t nuvopts_conf[];
m_option_t ovc_conf[]={
@@ -78,6 +82,7 @@
{"xvid", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_XVID, NULL},
{"qtvideo", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_QTVIDEO, NULL},
{"nuv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_NUV, NULL},
+ {"x264", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_X264, NULL},
{"help", "\nAvailable codecs:\n"
" copy - frame copy, without re-encoding. Doesn't work with filters.\n"
" frameno - special audio-only file for 3-pass encoding, see DOCS.\n"
@@ -103,6 +108,9 @@
#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
" xvid - XviD encoding\n"
#endif
+#ifdef HAVE_X264
+ " x264 - H.264 encoding\n"
+#endif
"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
{NULL, NULL, 0, 0, 0, 0, NULL}
};
@@ -239,6 +247,9 @@
#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
{"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#endif
+#if defined(HAVE_X264)
+ {"x264encopts", x264encopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+#endif
{"nuvopts", nuvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.908
retrieving revision 1.909
diff -u -r1.908 -r1.909
--- configure 26 Aug 2004 09:24:03 -0000 1.908
+++ configure 27 Aug 2004 20:43:04 -0000 1.909
@@ -198,6 +198,7 @@
--disable-xanim disable XAnim DLL support [autodetect]
--disable-real disable RealPlayer DLL support [autodetect]
--disable-xvid disable XviD codec [autodetect]
+ --disable-x264 disable H.264 encoder [autodetect]
--disable-divx4linux disable DivX4linux/Divx5linux codec [autodetect]
--enable-opendivx enable _old_ OpenDivx codec [disable]
--disable-libavcodec disable libavcodec [autodetect]
@@ -320,6 +321,8 @@
--with-reallibdir=DIR RealPlayer DLL files in DIR
--with-xvidlibdir=DIR libxvidcore (XviD) in DIR (*)
--with-xvidincdir=DIR XviD header in DIR (*)
+ --with-x264libdir=DIR libx264 in DIR
+ --with-x264incdir=DIR x264 header in DIR
--with-dtslibdir=DIR libdts library in DIR (*)
--with-dtsincdir=DIR libdts header in DIR (*)
--with-livelibdir=DIR LIVE.COM Streaming Media libraries in DIR
@@ -1298,6 +1301,7 @@
_vidix=auto
_joystick=no
_xvid=auto
+_x264=auto
_divx4linux=auto
_opendivx=no
_lirc=auto
@@ -1502,6 +1506,8 @@
--disable-joystick) _joystick=no ;;
--enable-xvid) _xvid=yes ;;
--disable-xvid) _xvid=no ;;
+ --enable-x264) _x264=yes ;;
+ --disable-x264) _x264=no ;;
--enable-divx4linux) _divx4linux=yes ;;
--disable-divx4linux) _divx4linux=no ;;
--enable-opendivx) _opendivx=yes ;;
@@ -1708,6 +1714,12 @@
--with-dtsincdir=*)
_inc_libdts=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
;;
+ --with-x264libdir=*)
+ _ld_x264=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
+ ;;
+ --with-x264incdir=*)
+ _inc_x264=-I`echo $ac_option | cut -d '=' -f 2 |sed 's,:, -I,g'`
+ ;;
--with-sdl-config=*)
_sdlconfig=`echo $ac_option | cut -d '=' -f 2`
;;
@@ -5474,6 +5486,25 @@
echores "$_xvidcompat"
fi
+echocheck "x264"
+cat > $TMPC << EOF
+#include <stdint.h>
+#include <stdarg.h>
+#include <x264.h>
+int main(void) { x264_encoder_open((void*)0); return 0; }
+EOF
+_ld_x264="$_ld_x264 -lx264 -lm"
+if test "$_x264" != no && cc_check $_inc_x264 $_ld_x264 ; then
+ _x264=yes
+ _def_x264='#define HAVE_X264 1'
+ _codecmodules="x264 $_codecmodules"
+else
+ _x264=no
+ _ld_x264=''
+ _def_x264='#undef HAVE_X264'
+ _nocodecmodules="x264 $_nocodecmodules"
+fi
+echores "$_x264"
echocheck "DivX4linux/DivX5linux/OpenDivX decore"
# DivX5: DEC_OPT_MEMORY_REQS - DivX4: DEC_OPT_FRAME_311
@@ -6268,6 +6299,9 @@
XVID = $_xvid
XVID_INC = $_inc_xvid
XVID_LIB = $_ld_xvid
+X264 = $_x264
+X264_INC = $_inc_x264
+X264_LIB = $_ld_x264
CONFIG_DTS = $_libdts
DTS_INC = $_inc_libdts
DTS_LIB = $_ld_libdts
@@ -6410,6 +6444,9 @@
$_def_decore_xvid
$_def_encore_xvid
+/* Define if you are using the X.264 library */
+$_def_x264
+
/* Define to include support for libdv-0.9.5 */
$_def_libdv
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- mencoder.c 24 Aug 2004 19:36:16 -0000 1.252
+++ mencoder.c 27 Aug 2004 20:43:04 -0000 1.253
@@ -9,6 +9,7 @@
#define VCODEC_QTVIDEO 10
#define VCODEC_NUV 11
#define VCODEC_RAW 12
+#define VCODEC_X264 13
#define ACODEC_COPY 0
#define ACODEC_PCM 1
@@ -708,7 +709,8 @@
sh_video->vfilter=vf_open_encoder(NULL,"qtvideo",(char *)mux_v); break;
case VCODEC_NUV:
sh_video->vfilter=vf_open_encoder(NULL,"nuv",(char *)mux_v); break;
-
+ case VCODEC_X264:
+ sh_video->vfilter=vf_open_encoder(NULL,"x264",(char *)mux_v); break;
}
if(!mux_v->bih || !sh_video->vfilter){
mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_EncoderOpenFailed);
More information about the MPlayer-cvslog
mailing list