Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 Contains the sources used to compile FFmpeg binaries used by Google Chrome and | 1 Contains the sources used to compile FFmpeg binaries used by Google Chrome and |
| 2 Chromium. | 2 Chromium. |
| 3 | 3 |
| 4 The FFmpeg source is from Alexander Strange's ffmpeg-mt branch: | 4 The FFmpeg source is from Alexander Strange's ffmpeg-mt branch: |
| 5 git://gitorious.org/~astrange/ffmpeg/ffmpeg-mt.git | 5 git://gitorious.org/~astrange/ffmpeg/ffmpeg-mt.git |
| 6 | 6 |
| 7 Date: Monday July 18 2010 | 7 Date: Monday July 18 2010 |
| 8 Commit: 82324906156d303d5f3b3e10a1855bf05614ebfc | 8 Commit: 82324906156d303d5f3b3e10a1855bf05614ebfc |
| 9 This corresponds to 24286 in the mainline ffmpeg repository. | 9 This corresponds to 24286 in the mainline ffmpeg repository. |
| 10 | 10 |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 38 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/03_mpeg4_video _to_elementary_stream.patch | 38 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/03_mpeg4_video _to_elementary_stream.patch |
| 39 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/04_vc1_bsfs.pa tch | 39 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/04_vc1_bsfs.pa tch |
| 40 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/05_respect_fla c_dirac_configure.patch | 40 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/05_respect_fla c_dirac_configure.patch |
| 41 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/06_remove_deco de_on_config_no_svq3.patch | 41 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/06_remove_deco de_on_config_no_svq3.patch |
| 42 patch -p1 --no-backup-if-mismatch < ../patches/ugly/07_get_bits_overrun.p atch | 42 patch -p1 --no-backup-if-mismatch < ../patches/ugly/07_get_bits_overrun.p atch |
| 43 patch -p1 --no-backup-if-mismatch < ../patches/ugly/08_enforce_theora_oob .patch | 43 patch -p1 --no-backup-if-mismatch < ../patches/ugly/08_enforce_theora_oob .patch |
| 44 patch -p1 --no-backup-if-mismatch < ../patches/ugly/09_enforce_vorbis_oob _divzero.patch | 44 patch -p1 --no-backup-if-mismatch < ../patches/ugly/09_enforce_vorbis_oob _divzero.patch |
| 45 patch -p1 --no-backup-if-mismatch < ../patches/ugly/10_aac_oob_read.patch | 45 patch -p1 --no-backup-if-mismatch < ../patches/ugly/10_aac_oob_read.patch |
| 46 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/11_mkv_buffer_ overflow.patch | 46 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/11_mkv_buffer_ overflow.patch |
| 47 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/12_ogg_seek_to _zero.patch | 47 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/12_ogg_seek_to _zero.patch |
| 48 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/13_libvpx_chec k_decoder_only.patch | |
| 48 cd .. | 49 cd .. |
| 49 | 50 |
| 50 There is also a script "make_src_tree.sh" that automates most of the steps | 51 There is also a script "make_src_tree.sh" that automates most of the steps |
| 51 above for you. It is currently only tested on linux. | 52 above for you. It is currently only tested on linux. |
| 52 | 53 |
| 53 NOTE: Under Windows it is recommended to use Chromium's MinGW/MSYS environment | 54 NOTE: Under Windows it is recommended to use Chromium's MinGW/MSYS environment |
| 54 or 7-Zip to extract the archives. We've experienced issues when using WinRAR. | 55 or 7-Zip to extract the archives. We've experienced issues when using WinRAR. |
| 55 | 56 |
| 56 Since FFmpeg is sandboxed inside the render process, we're only interested in | 57 Since FFmpeg is sandboxed inside the render process, we're only interested in |
| 57 building the absolute minimum. | 58 building the absolute minimum. |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 120 # 1) Extract ffmpeg-mt, which creates the directory ffmpeg-mt: | 121 # 1) Extract ffmpeg-mt, which creates the directory ffmpeg-mt: |
| 121 cd /cygdrive/c/src/chromium/deps/third_party/ffmpeg | 122 cd /cygdrive/c/src/chromium/deps/third_party/ffmpeg |
| 122 rm -rf ffmpeg-mt | 123 rm -rf ffmpeg-mt |
| 123 tar xf ffmpeg-mt.tar.gz | 124 tar xf ffmpeg-mt.tar.gz |
| 124 # 2) Extract libswscale in place: | 125 # 2) Extract libswscale in place: |
| 125 cd ffmpeg-mt | 126 cd ffmpeg-mt |
| 126 tar xf ../libswscale.tar.gz | 127 tar xf ../libswscale.tar.gz |
| 127 cd .. | 128 cd .. |
| 128 | 129 |
| 129 # 3) Apply patches: | 130 # 3) Apply patches: |
| 130 rm -rf orig | 131 rm -rf orig |
|
scherkus (not reviewing)
2010/07/28 22:45:37
we don't have to do this now, but perhaps we can p
| |
| 131 cp -R ffmpeg-mt orig | 132 cp -R ffmpeg-mt orig |
| 132 cd ffmpeg-mt | 133 cd ffmpeg-mt |
| 133 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/01_static_pthr ead_O2.patch | 134 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/01_static_pthr ead_O2.patch |
| 134 cd .. | 135 cd .. |
| 135 diff -rpu -N orig ffmpeg-mt | 136 diff -rpu -N orig ffmpeg-mt |
| 136 diff -rpu -N orig ffmpeg-mt >patches/to_upstream/01_static_pthread_O2.pat ch | 137 diff -rpu -N orig ffmpeg-mt >patches/to_upstream/01_static_pthread_O2.pat ch |
| 137 | 138 |
| 138 rm -rf orig | 139 rm -rf orig |
| 139 cp -R ffmpeg-mt orig | 140 cp -R ffmpeg-mt orig |
| 140 cd ffmpeg-mt | 141 cd ffmpeg-mt |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 216 diff -rpu -N orig ffmpeg-mt >patches/to_upstream/11_mkv_buffer_overflow.p atch | 217 diff -rpu -N orig ffmpeg-mt >patches/to_upstream/11_mkv_buffer_overflow.p atch |
| 217 | 218 |
| 218 rm -rf orig | 219 rm -rf orig |
| 219 cp -R ffmpeg-mt orig | 220 cp -R ffmpeg-mt orig |
| 220 cd ffmpeg-mt | 221 cd ffmpeg-mt |
| 221 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/12_ogg_seek_to _zero.patch | 222 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/12_ogg_seek_to _zero.patch |
| 222 cd .. | 223 cd .. |
| 223 diff -rpu -N orig ffmpeg-mt | 224 diff -rpu -N orig ffmpeg-mt |
| 224 diff -rpu -N orig ffmpeg-mt >patches/to_upstream/12_ogg_seek_to_zero.patc h | 225 diff -rpu -N orig ffmpeg-mt >patches/to_upstream/12_ogg_seek_to_zero.patc h |
| 225 | 226 |
| 227 rm -rf orig | |
| 228 cp -R ffmpeg-mt orig | |
| 229 cd ffmpeg-mt | |
| 230 patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/13_libvpx_chec k_decoder_only.patch | |
| 231 cd .. | |
| 232 diff -rpu -N orig ffmpeg-mt | |
| 233 diff -rpu -N orig ffmpeg-mt >patches/to_upstream/13_libvpx_check_decoder_ only.patch | |
| 234 | |
| 235 | |
| 226 Testing | 236 Testing |
| 227 Updates should be tested against | 237 Updates should be tested against |
| 228 http://wiki.xiph.org/TheoraTestsuite | 238 http://wiki.xiph.org/TheoraTestsuite |
| 229 WebKit Layout Tests | 239 WebKit Layout Tests |
| 230 http://www.chromium.org/developers/testing/webkit-layout-tests | 240 http://www.chromium.org/developers/testing/webkit-layout-tests |
| 231 make -j16 -r test_shell BUILDTYPE=Debug | 241 make -j16 -r test_shell BUILDTYPE=Debug |
| 232 ./src/webkit/tools/layout_tests/run_webkit_tests.sh --debug media/\* | 242 ./src/webkit/tools/layout_tests/run_webkit_tests.sh --debug media/\* |
| 233 | 243 |
| OLD | NEW |