From 44430f7f48512dc0ae8c45d6313e5b8eb215f67e Mon Sep 17 00:00:00 2001 From: "fbarchard@chromium.org" Date: Thu, 22 Jul 2010 00:42:17 +0000 Subject: Revert 53281 - ffmpeg update with vp3 patches. switch to av_register_protocol2 video-played-collapse layout test fails and will be fixed later. BUG=48037 TEST=ffmpeg should still build/run Review URL: http://codereview.chromium.org/3010016 TBR=fbarchard@chromium.org Review URL: http://codereview.chromium.org/2805098 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53285 0039d316-1c4b-4281-b951-d872f2087c98 --- media/base/mock_ffmpeg.cc | 8 ++++---- media/base/mock_ffmpeg.h | 2 +- media/ffmpeg/ffmpeg_common.h | 1 - media/filters/ffmpeg_glue.cc | 2 +- media/test/ffmpeg_tests/ffmpeg_tests.cc | 2 +- media/tools/media_bench/media_bench.cc | 2 +- media/tools/omx_test/omx_test.cc | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) (limited to 'media') diff --git a/media/base/mock_ffmpeg.cc b/media/base/mock_ffmpeg.cc index f3aa552..5f29a55 100644 --- a/media/base/mock_ffmpeg.cc +++ b/media/base/mock_ffmpeg.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -33,7 +33,7 @@ MockFFmpeg::MockFFmpeg() EXPECT_CALL(*this, AVCodecInit()) .Times(AtMost(1)) .WillOnce(Return()); - EXPECT_CALL(*this, AVRegisterProtocol2(_,_)) + EXPECT_CALL(*this, AVRegisterProtocol(_)) .Times(AtMost(1)) .WillOnce(DoAll(SaveArg<0>(&protocol_), Return(0))); EXPECT_CALL(*this, AVRegisterAll()) @@ -89,8 +89,8 @@ void avcodec_init() { media::MockFFmpeg::get()->AVCodecInit(); } -int av_register_protocol2(URLProtocol* protocol, int size) { - return media::MockFFmpeg::get()->AVRegisterProtocol2(protocol, size); +int av_register_protocol(URLProtocol* protocol) { + return media::MockFFmpeg::get()->AVRegisterProtocol(protocol); } void av_register_all() { diff --git a/media/base/mock_ffmpeg.h b/media/base/mock_ffmpeg.h index 09daf03..836e02b 100644 --- a/media/base/mock_ffmpeg.h +++ b/media/base/mock_ffmpeg.h @@ -19,7 +19,7 @@ class MockFFmpeg { // TODO(ajwong): Organize this class, and make sure that all mock entrypoints // are still used. MOCK_METHOD0(AVCodecInit, void()); - MOCK_METHOD2(AVRegisterProtocol2, int(URLProtocol* protocol, int size)); + MOCK_METHOD1(AVRegisterProtocol, int(URLProtocol* protocol)); MOCK_METHOD0(AVRegisterAll, void()); MOCK_METHOD1(AVRegisterLockManager, int(int (*cb)(void**, enum AVLockOp))); diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h index 7b73781..10f67d2 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -18,7 +18,6 @@ extern "C" { MSVC_PUSH_DISABLE_WARNING(4244); #include #include -#include #include #include MSVC_POP_WARNING(); diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc index 6f637c3..cf06f35 100644 --- a/media/filters/ffmpeg_glue.cc +++ b/media/filters/ffmpeg_glue.cc @@ -134,7 +134,7 @@ FFmpegGlue::FFmpegGlue() { // Register our protocol glue code with FFmpeg. avcodec_init(); - av_register_protocol2(&kFFmpegURLProtocol, sizeof(kFFmpegURLProtocol)); + av_register_protocol(&kFFmpegURLProtocol); av_lockmgr_register(&LockManagerOperation); // Now register the rest of FFmpeg. diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index f8da45c..a967bc3 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -115,7 +115,7 @@ int main(int argc, const char** argv) { avcodec_init(); av_log_set_level(verbose_level); av_register_all(); - av_register_protocol2(&kFFmpegFileProtocol, sizeof(kFFmpegFileProtocol)); + av_register_protocol(&kFFmpegFileProtocol); AVFormatContext* format_context = NULL; // av_open_input_file wants a char*, which can't work with wide paths. // So we assume ASCII on Windows. On other platforms we can pass the diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc index 939e35f..cdc2560 100644 --- a/media/tools/media_bench/media_bench.cc +++ b/media/tools/media_bench/media_bench.cc @@ -223,7 +223,7 @@ int main(int argc, const char** argv) { avcodec_init(); av_log_set_level(verbose_level); av_register_all(); - av_register_protocol2(&kFFmpegFileProtocol, sizeof(kFFmpegFileProtocol)); + av_register_protocol(&kFFmpegFileProtocol); AVFormatContext* format_context = NULL; // av_open_input_file wants a char*, which can't work with wide paths. // So we assume ASCII on Windows. On other platforms we can pass the diff --git a/media/tools/omx_test/omx_test.cc b/media/tools/omx_test/omx_test.cc index ac885b2..5203eb0 100644 --- a/media/tools/omx_test/omx_test.cc +++ b/media/tools/omx_test/omx_test.cc @@ -273,7 +273,7 @@ static bool InitFFmpeg() { return false; avcodec_init(); av_register_all(); - av_register_protocol2(&kFFmpegFileProtocol, sizeof(kFFmpegFileProtocol)); + av_register_protocol(&kFFmpegFileProtocol); return true; } -- cgit v1.1