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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: README.chromium

Issue 4533003: patched ffmpeg nov 2 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 1 month 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 | libswscale.tar.gz » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: README.chromium
===================================================================
--- README.chromium (revision 65184)
+++ README.chromium (working copy)
@@ -3,20 +3,20 @@
The FFmpeg source is from Alexander Strange's ffmpeg-mt branch:
git://gitorious.org/~astrange/ffmpeg/ffmpeg-mt.git
- Date: Oct 10 2010
- Commit: 3f7521893b9072181763ea176ef8da0c0ad1922a
- This corresponds to r25432 in the mainline ffmpeg repository.
+ Date: Nov 02 2010
+ Commit:
+ This corresponds to r2???? in the mainline ffmpeg repository.
Tom Finegan 2010/11/05 14:21:33 Should correct this...
libvpx source
git://review.webmproject.org/libvpx.git
- Date: Oct 22 2010
- Commit: 09bcc1f710ea65dc158639479288fb1908ff0c53
- Version is v0.9.2-125-g3b9e72b
+ Date: Nov 02 2010
+ Commit:
+ Version is v0.9.5
swscale source is optional.
git://git.ffmpeg.org/libswscale/
- Date: Oct 11 2010
- Commit: fae6720e516a0c1448a22b4a5cbc67e6819c965e
+ Date: Nov 02 2010
+ Commit:
The static_pthread_O2.patch does two things. First, it uses -O2 instead of
-O3 to build ffmpeg, improving size and performance for Pentium4.
@@ -51,6 +51,8 @@
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/14_vp8_encode_options.patch
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/15_webp_ffmpeg.patch
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/16_neon_offsets.patch
+ patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/17_mpegthread.patch
+ patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/18_respect_swscale.patch
cd ..
There is also a script "make_src_tree.sh" that automates most of the steps
@@ -147,134 +149,150 @@
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/01_static_pthread_O2.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/to_upstream/01_static_pthread_O2.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/to_upstream/01_static_pthread_O2.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/02_mov_dref_looping.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/to_upstream/02_mov_dref_looping.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/to_upstream/02_mov_dref_looping.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/03_mpeg4_video_to_elementary_stream.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/to_upstream/03_mpeg4_video_to_elementary_stream.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/to_upstream/03_mpeg4_video_to_elementary_stream.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/04_vc1_bsfs.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/to_upstream/04_vc1_bsfs.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/to_upstream/04_vc1_bsfs.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/05_respect_flac_dirac_configure.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/to_upstream/05_respect_flac_dirac_configure.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/to_upstream/05_respect_flac_dirac_configure.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/06_remove_decode_on_config_no_svq3.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/to_upstream/06_remove_decode_on_config_no_svq3.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/to_upstream/06_remove_decode_on_config_no_svq3.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/ugly/07_get_bits_overrun.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/ugly/07_get_bits_overrun.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/ugly/07_get_bits_overrun.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/ugly/08_enforce_theora_oob.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/ugly/08_enforce_theora_oob.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/ugly/08_enforce_theora_oob.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/ugly/09_enforce_vorbis_oob_divzero.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/ugly/09_enforce_vorbis_oob_divzero.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/ugly/09_enforce_vorbis_oob_divzero.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/ugly/10_aac_oob_read.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/ugly/10_aac_oob_read.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/ugly/10_aac_oob_read.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/11_mkv_buffer_overflow.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/to_upstream/11_mkv_buffer_overflow.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/to_upstream/11_mkv_buffer_overflow.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/12_ogg_seek_to_zero.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/to_upstream/12_ogg_seek_to_zero.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/to_upstream/12_ogg_seek_to_zero.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/ugly/13_remove_avcore.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/ugly/13_remove_avcore.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/ugly/13_remove_avcore.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/14_vp8_encode_options.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/to_upstream/14_vp8_encode_options.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/to_upstream/14_vp8_encode_options.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/15_webp_ffmpeg.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/to_upstream/15_webp_ffmpeg.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/to_upstream/15_webp_ffmpeg.patch
rm -rf orig
cp -R ffmpeg-mt orig
cd ffmpeg-mt
patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/16_neon_offsets.patch
cd ..
- diff -rpu -N orig ffmpeg-mt
- diff -rpu -N orig ffmpeg-mt >patches/to_upstream/16_neon_offsets.patch
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/to_upstream/16_neon_offsets.patch
+ rm -rf orig
+ cp -R ffmpeg-mt orig
+ cd ffmpeg-mt
+ patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/17_mpegthread.patch
+ cd ..
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/to_upstream/17_mpegthread.patch
+
+ rm -rf orig
+ cp -R ffmpeg-mt orig
+ cd ffmpeg-mt
+ patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/18_respect_swscale.patch
+ cd ..
+ diff -wurp -N orig ffmpeg-mt
+ diff -wurp -N orig ffmpeg-mt >patches/to_upstream/18_respect_swscale.patch
+
Testing
Updates should be tested against
http://wiki.xiph.org/TheoraTestsuite
WebKit Layout Tests
http://www.chromium.org/developers/testing/webkit-layout-tests
- make -j16 -r test_shell BUILDTYPE=Debug
+ make -r test_shell BUILDTYPE=Debug
./src/webkit/tools/layout_tests/run_webkit_tests.sh --debug media/\*
« no previous file with comments | « no previous file | libswscale.tar.gz » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698