diff options
| author | ihf@chromium.org <ihf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 02:25:17 +0000 |
|---|---|---|
| committer | ihf@chromium.org <ihf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 02:25:17 +0000 |
| commit | 2decb263aecf4eba6e56e76ab191a6a842f2059a (patch) | |
| tree | 52a8fdc40386a4760d70789699813b8078266cff /chrome_frame | |
| parent | a78313b4762c9c9e0d96261abf009daf7ccb83e5 (diff) | |
| download | chromium_src-2decb263aecf4eba6e56e76ab191a6a842f2059a.zip chromium_src-2decb263aecf4eba6e56e76ab191a6a842f2059a.tar.gz chromium_src-2decb263aecf4eba6e56e76ab191a6a842f2059a.tar.bz2 | |
Glue ffmpeg to Chrome
1) works for Linux, OSX, Windows
2) mostly renaming #defines
3) avcodec_thread_init is deprecated and has been removed, see
http://ffmpeg.org/pipermail/ffmpeg-cvslog/2011-February/034326.html
4) will require a rebaseline of
platform/chromium-mac/media/video-currentTime-set-expected.txt
platform/chromium-win/media/video-currentTime-set-expected.txt
with a change of
-video.currentTime.toFixed(2) == '5.82'
+video.currentTime.toFixed(2) == '5.81'
BUG=87831
TESTS=ran Theora Testsuite, media tests, WebKit media tests
Review URL: http://codereview.chromium.org/6993042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/perf/chrome_frame_perftest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc index dac9605..5ae0757 100644 --- a/chrome_frame/test/perf/chrome_frame_perftest.cc +++ b/chrome_frame/test/perf/chrome_frame_perftest.cc @@ -295,9 +295,9 @@ class ChromeFrameStartupTest : public ChromeFramePerfTestBase { chrome_frame_dll_ = dir_app_.Append(L"servers"); chrome_frame_dll_ = chrome_frame_dll_.Append(kChromeFrameDllName); icu_dll_ = dir_app_.Append(L"icudt.dll"); - avcodec52_dll_ = dir_app_.Append(L"avcodec-52.dll"); - avformat52_dll_ = dir_app_.Append(L"avformat-52.dll"); - avutil50_dll_ = dir_app_.Append(L"avutil-50.dll"); + avcodec_dll_ = dir_app_.Append(L"avcodec-53.dll"); + avformat_dll_ = dir_app_.Append(L"avformat-53.dll"); + avutil_dll_ = dir_app_.Append(L"avutil-51.dll"); } // TODO(iyengar) @@ -355,9 +355,9 @@ class ChromeFrameStartupTest : public ChromeFramePerfTestBase { FilePath chrome_exe_; FilePath chrome_frame_dll_; FilePath icu_dll_; - FilePath avcodec52_dll_; - FilePath avformat52_dll_; - FilePath avutil50_dll_; + FilePath avcodec_dll_; + FilePath avformat_dll_; + FilePath avutil_dll_; protected: // Individual startup tests should implement this function. @@ -964,7 +964,7 @@ TEST_F(ChromeFrameBinariesLoadTest, PerfWarm) { TEST_F(ChromeFrameStartupTestActiveX, PerfCold) { SetConfigInt(L"PreRead", 0); FilePath binaries_to_evict[] = { - avcodec52_dll_, avformat52_dll_, avutil50_dll_, chrome_exe_, chrome_dll_, + avcodec_dll_, avformat_dll_, avutil_dll_, chrome_exe_, chrome_dll_, chrome_frame_dll_ }; RunStartupTest("cold", "t", "about:blank", true /* cold */, @@ -976,7 +976,7 @@ TEST_F(ChromeFrameStartupTestActiveX, PerfCold) { TEST_F(ChromeFrameStartupTestActiveX, PerfColdPreRead) { SetConfigInt(L"PreRead", 1); FilePath binaries_to_evict[] = { - avcodec52_dll_, avformat52_dll_, avutil50_dll_, chrome_exe_, chrome_dll_, + avcodec_dll_, avformat_dll_, avutil_dll_, chrome_exe_, chrome_dll_, chrome_frame_dll_ }; RunStartupTest("cold_preread", "t", "about:blank", true /* cold */, |