Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(516)

Unified Diff: README.chromium

Issue 164120: Add patches for block-level quant in theora, -O2 on build, and statically link pthread on Windows (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | r18986_theora_block_quant.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: README.chromium
===================================================================
--- README.chromium (revision 22704)
+++ README.chromium (working copy)
@@ -5,10 +5,21 @@
git://gitorious.org/~astrange/ffmpeg/ffmpeg-mt.git
Commit: 42b521db9177ed2d4e62845659fdcd44c59757f9
+The Theora patches are also from the ffmpeg-mt branch above. The git commit
+numbers and the corresponding svn revisions for them from ffmpeg mainline can
+be found at the top of each patch.
+
The libswscale source is from the public libswscale repository:
git://git.ffmpeg.org/libswscale
Commit: 69fc1002e2c92aac84dccc5047141feefc94b309
+The static_pthread_O2.patch does two things. First, it uses -O2 instead of
+-O3 to build ffmpeg. This yields a significant savings in binary size, and
+also seems to improve performance (lower CPU usage). Second, the patch adds
+a modification that statically links pthreadGC2 into avcodec-52.dll on an
+MSYS/MinGW build in Windows. This reduces the number of DLLs required for
+distribution, and lowers the total size of the binaries.
+
Steps for extracting:
1) Extract ffmpeg-mt, which creates the directory ffmpeg-mt:
tar xzvf ffmpeg-mt.tar.gz
@@ -16,6 +27,16 @@
cd ffmpeg-mt
3) Extract libswscale in place:
tar xzvf ../libswscale.tar.gz
+ 4) Apply the Theora patches:
+ patch -p1 < ../r18986_theora_block_quant.patch
+ patch -p1 < ../r19351_theora_decode_tables_limit127.patch
+ patch -p1 < ../r19356_theora_decode_init_error_passing.patch
+ patch -p1 < ../r19350_init_loop_filter_127fix.patch
+ patch -p1 < ../r19355_invalid_huffman_table.patch
+ 5) Apply the static_pthread_O2.patch:
+ patch -p1 < ../static_pthread_O2.patch
+ 6) If on mac, apply the mac_install_name.patch:
+ patch -p1 < ../mac_install_name.patch
NOTE: Under Windows it is recommended to use Chromium's MinGW/MSYS environment
or 7-Zip to extract the archives. We've experienced issues when using WinRAR.
@@ -53,10 +74,9 @@
If building on Windows with Chromium's MinGW/MSYS environment, add the following:
--target-os=mingw32 --enable-memalign-hack --cc=gcc-sjlj
-If building on Mac, apply the mac_install_name.patch first so that the configure
-script will generate dylibs that know how to locate themselves in an application
-package.
- patch -p1 < mac_install_name.patch
+If building on Mac, do not forget to do step (6) of the extraction to apply the
+mac_install_name.patch first so that the configure script will generate dylibs
+that know how to locate themselves in an application package.
To build:
make
« no previous file with comments | « no previous file | r18986_theora_block_quant.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698