diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 17:28:43 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 17:28:43 +0000 |
commit | 38e0898607eea03649b7b07e9cf890af7dc33ac7 (patch) | |
tree | 6ac95fd496661a6e0718c349bba089144e0fef09 /media/video | |
parent | 2a9662e31f18f77b856487b7266c70ccede557e0 (diff) | |
download | chromium_src-38e0898607eea03649b7b07e9cf890af7dc33ac7.zip chromium_src-38e0898607eea03649b7b07e9cf890af7dc33ac7.tar.gz chromium_src-38e0898607eea03649b7b07e9cf890af7dc33ac7.tar.bz2 |
FBTF: More dtor deinlining. (Can almost see the end!)
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/3962004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video')
-rw-r--r-- | media/video/ffmpeg_video_allocator.cc | 2 | ||||
-rw-r--r-- | media/video/ffmpeg_video_allocator.h | 2 | ||||
-rw-r--r-- | media/video/ffmpeg_video_decode_engine_unittest.cc | 1 | ||||
-rw-r--r-- | media/video/mft_h264_decode_engine.h | 1 | ||||
-rw-r--r-- | media/video/video_decode_engine.cc | 18 | ||||
-rw-r--r-- | media/video/video_decode_engine.h | 10 |
6 files changed, 26 insertions, 8 deletions
diff --git a/media/video/ffmpeg_video_allocator.cc b/media/video/ffmpeg_video_allocator.cc index e9530b35..0185629 100644 --- a/media/video/ffmpeg_video_allocator.cc +++ b/media/video/ffmpeg_video_allocator.cc @@ -21,6 +21,8 @@ FFmpegVideoAllocator::FFmpegVideoAllocator() release_buffer_(NULL) { } +FFmpegVideoAllocator::~FFmpegVideoAllocator() {} + void FFmpegVideoAllocator::Initialize(AVCodecContext* codec_context, VideoFrame::Format surface_format) { #ifdef FF_THREAD_FRAME // Only defined in FFMPEG-MT. diff --git a/media/video/ffmpeg_video_allocator.h b/media/video/ffmpeg_video_allocator.h index 92b84d6..c1e371a 100644 --- a/media/video/ffmpeg_video_allocator.h +++ b/media/video/ffmpeg_video_allocator.h @@ -24,7 +24,7 @@ namespace media { class FFmpegVideoAllocator { public: FFmpegVideoAllocator(); - virtual ~FFmpegVideoAllocator() {} + virtual ~FFmpegVideoAllocator(); struct RefCountedAVFrame { RefCountedAVFrame() : usage_count_(0) {} diff --git a/media/video/ffmpeg_video_decode_engine_unittest.cc b/media/video/ffmpeg_video_decode_engine_unittest.cc index 9f737ba..2902a10 100644 --- a/media/video/ffmpeg_video_decode_engine_unittest.cc +++ b/media/video/ffmpeg_video_decode_engine_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/message_loop.h" #include "base/scoped_ptr.h" #include "media/base/data_buffer.h" #include "media/base/mock_ffmpeg.h" diff --git a/media/video/mft_h264_decode_engine.h b/media/video/mft_h264_decode_engine.h index e13dce9..a131c2f 100644 --- a/media/video/mft_h264_decode_engine.h +++ b/media/video/mft_h264_decode_engine.h @@ -14,6 +14,7 @@ // (SendFlushMessage, SendDrainMessage, etc.) to avoid having // MFT_MESSAGE_TYPE in here #include <mfidl.h> +#include <vector> #include "base/gtest_prod_util.h" #include "base/scoped_comptr_win.h" diff --git a/media/video/video_decode_engine.cc b/media/video/video_decode_engine.cc new file mode 100644 index 0000000..04f3bea --- /dev/null +++ b/media/video/video_decode_engine.cc @@ -0,0 +1,18 @@ +// Copyright (c) 2010 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. + +#include "media/video/video_decode_engine.h" + +namespace media { + +VideoCodecConfig::VideoCodecConfig() + : codec(kCodecH264), + profile(kProfileDoNotCare), + level(kLevelDoNotCare), + width(0), + height(0), + opaque_context(NULL) { +} + +} // namespace media diff --git a/media/video/video_decode_engine.h b/media/video/video_decode_engine.h index 0cd96b3..4182215 100644 --- a/media/video/video_decode_engine.h +++ b/media/video/video_decode_engine.h @@ -6,9 +6,10 @@ #define MEDIA_VIDEO_VIDEO_DECODE_ENGINE_H_ #include "base/callback.h" -#include "base/message_loop.h" #include "media/base/video_frame.h" +class MessageLoop; + namespace media { class Buffer; @@ -27,12 +28,7 @@ static const uint32 kProfileDoNotCare = static_cast<uint32>(-1); static const uint32 kLevelDoNotCare = static_cast<uint32>(-1); struct VideoCodecConfig { - VideoCodecConfig() : codec(kCodecH264), - profile(kProfileDoNotCare), - level(kLevelDoNotCare), - width(0), - height(0), - opaque_context(NULL) {} + VideoCodecConfig(); VideoCodec codec; |