mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-21 21:28:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

new msx264 using new x264 modified version that enables multi slicing.

Browse source 
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@515 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
This commit is contained in:
smorlat 2009-07-03 13:50:40 +00:00
parent 7fde5aa0f4
commit 2a08f842e9
5 changed files with 97 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
linphone/mediastreamer2/plugins/msx264/INSTALL Executable file → Normal file
View file

@ -2,15 +2,15 @@ Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006 Free Software Foundation, Inc.
2006, 2007, 2008 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
Briefly, the shell commands `./configure; make; make install' should
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
@ -67,12 +67,15 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
6. Often, you can also type `make uninstall' to remove the installed
files again.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that the
`configure' script does not know about. Run `./configure --help' for
details on some of the pertinent environment variables.
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. Run `./configure --help'
for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@ -85,7 +88,7 @@ is an example:
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
@ -97,10 +100,24 @@ architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
On MacOS X 10.5 and later systems, you can create libraries and
executables that work on multiple system types--known as "fat" or
"universal" binaries--by specifying multiple `-arch' options to the
compiler but only a single `-arch' option to the preprocessor. Like
this:
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CPP="gcc -E" CXXCPP="g++ -E"
This is not guaranteed to produce working output in all cases, you
may have to build one architecture at a time and combine the results
using the `lipo' tool if you have problems.
Installation Names
==================
By default, `make install' installs the package's commands under
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
@ -123,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@ -135,14 +152,36 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Particular systems
==================
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
./configure CC="cc -Ae"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
to try
./configure CC="cc"
and if that doesn't work, try
./configure CC="cc -nodtk"
Specifying the System Type
==========================
There may be some features `configure' cannot figure out automatically,
but needs to determine by the type of machine the package will run on.
Usually, assuming the package is built to be run on the _same_
architectures, `configure' can figure that out, but if it prints a
message saying it cannot guess the machine type, give it the
There may be some features `configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
_same_ architectures, `configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@ -168,9 +207,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share, you
can create a site shell script called `config.site' that gives default
values for variables like `CC', `cache_file', and `prefix'.
If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@ -179,7 +218,7 @@ A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@ -198,11 +237,19 @@ an Autoconf bug. Until the bug is fixed you can use this workaround:
`configure' Invocation
======================
`configure' recognizes the following options to control how it operates.
`configure' recognizes the following options to control how it
operates.
`--help'
`-h'
Print a summary of the options to `configure', and exit.
Print a summary of all of the options to `configure', and exit.
`--help=short'
`--help=recursive'
Print a summary of the options unique to this package's
`configure', and exit. The `short' variant lists options used
only in the top level, while the `recursive' variant lists options
also present in any nested packages.
`--version'
`-V'
@ -229,6 +276,16 @@ an Autoconf bug. Until the bug is fixed you can use this workaround:
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`--prefix=DIR'
Use DIR as the installation prefix. *Note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
`--no-create'
`-n'
Run the configure checks, but stop before creating any output
files.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

3
linphone/mediastreamer2/plugins/msx264/NEWS
View file

@ -1,2 +1,5 @@
Friday July 4, 2009 : msx264-1.2.0
- modified to compile against new multisliced version of x264 to allow packetization-mode=0
Wednesday August 20, 2008: msx264-1.1.0
- compiled together with x264-snapshot-20080421-2245+multislicing-patch.tar.gz, allows packetization-mode=0

26
linphone/mediastreamer2/plugins/msx264/README
View file

@ -2,16 +2,20 @@ msx264 - a GPL plugin to bring video H264 encoding/decoding capabilities to medi
It is based on ffmpeg for decoding and x264 for encoding.
It works with any version of x264. However if you want better performance and interroperability, it is
highly recommended to use a modified x264 version patched with the patch mentionned here:
http://mailman.videolan.org/pipermail/x264-devel/2008-April/004427.html
Unfortunately for bad reasons this patch hasn't been merged by x264 developpers, and no more applies with
recent versions.
highly recommended to use the modified multiscling-enabled x264 available from linphone.org.
This patch enables multi-slicing, ie smaller video packets that fit into the network mtu.
It enable RFC3984 packetization-mode=0 to work.
A x264 version modified by this patch can be found here:
http://download.savannah.gnu.org/releases/linphone/plugins/sources/x264-snapshot-20080421-2245+multislicing-patch.tar.gz
It enables RFC3984 packetization-mode=0 to work.
You can download this special x264 here:
http://download.savannah.gnu.org/releases/linphone/plugins/sources/x264-snapshot-20090704-linphone-org.tar.gz
So compile x264-snapshot-20080421-2245+multislicing-patch.tar.gz with ./configure && make && make install
Then compile msx264 with ./configure --enable-hacked-x264 && make && make install
So:
* compile x264-snapshot-20090704-linphone-org.tar.gz with ./configure && make && make install
* compile msx264 with ./configure --enable-hacked-x264 && make && make install
A bit of history
****************
The multislicing feature of x264 is something that has been contributed several time, but never merged (why ?).
The linphone.org version of x264 was inspired by a patch submitted on x264-devel mailing list:
http://mailman.videolan.org/pipermail/x264-devel/2008-April/004427.html

2
linphone/mediastreamer2/plugins/msx264/configure.ac
View file

@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT([msx264],[1.1.8])
AC_INIT([msx264],[1.2.0])
AM_INIT_AUTOMAKE([tar-ustar])

2
linphone/mediastreamer2/plugins/msx264/src/msx264.c
View file

@ -80,7 +80,7 @@ static void enc_preprocess(MSFilter *f){
params.i_fps_den=1;
#ifdef HACKED_X264
ms_message("Lucky guy, you have a hacked x264 lib that allows multislicing !");
params.slice_size_threshold=ms_get_payload_max_size()-100; /*-100 security margin*/
params.i_max_nalu_size=ms_get_payload_max_size()-100; /*-100 security margin*/
#endif
/*params.i_level_idc=30;*/
params.rc.i_rc_method = X264_RC_ABR;