summaryrefslogtreecommitdiffstats
path: root/media/video
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 00:44:39 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 00:44:39 +0000
commite4be2dd25b1883bad7bed358e52e04f01c6e6f78 (patch)
tree842b39b7ea3547a97e07e2d4dcbb4795020c435c /media/video
parent6415176be8ad6b36d4adafa1c8e76aa89c5ca17c (diff)
downloadchromium_src-e4be2dd25b1883bad7bed358e52e04f01c6e6f78.zip
chromium_src-e4be2dd25b1883bad7bed358e52e04f01c6e6f78.tar.gz
chromium_src-e4be2dd25b1883bad7bed358e52e04f01c6e6f78.tar.bz2
Deinline even more destructors.
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5794003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video')
-rw-r--r--media/video/ffmpeg_video_decode_engine.cc8
-rw-r--r--media/video/ffmpeg_video_decode_engine.h6
-rw-r--r--media/video/omx_video_decode_engine.cc4
-rw-r--r--media/video/omx_video_decode_engine.h2
4 files changed, 15 insertions, 5 deletions
diff --git a/media/video/ffmpeg_video_decode_engine.cc b/media/video/ffmpeg_video_decode_engine.cc
index a2009f4..f52cf16 100644
--- a/media/video/ffmpeg_video_decode_engine.cc
+++ b/media/video/ffmpeg_video_decode_engine.cc
@@ -331,6 +331,14 @@ void FFmpegVideoDecodeEngine::Seek() {
event_handler_->OnSeekComplete();
}
+AVCodecContext* FFmpegVideoDecodeEngine::codec_context() const {
+ return codec_context_;
+}
+
+void FFmpegVideoDecodeEngine::SetCodecContextForTest(AVCodecContext* context) {
+ codec_context_ = context;
+}
+
void FFmpegVideoDecodeEngine::ReadInput() {
DCHECK_EQ(output_eos_reached_, false);
pending_input_buffers_++;
diff --git a/media/video/ffmpeg_video_decode_engine.h b/media/video/ffmpeg_video_decode_engine.h
index a7ce4e4..53baa54 100644
--- a/media/video/ffmpeg_video_decode_engine.h
+++ b/media/video/ffmpeg_video_decode_engine.h
@@ -36,11 +36,9 @@ class FFmpegVideoDecodeEngine : public VideoDecodeEngine {
virtual void Flush();
virtual void Seek();
- virtual AVCodecContext* codec_context() const { return codec_context_; }
+ virtual AVCodecContext* codec_context() const;
- virtual void SetCodecContextForTest(AVCodecContext* context) {
- codec_context_ = context;
- }
+ virtual void SetCodecContextForTest(AVCodecContext* context);
VideoFrame::Format GetSurfaceFormat() const;
private:
diff --git a/media/video/omx_video_decode_engine.cc b/media/video/omx_video_decode_engine.cc
index 1ffdf40..9ca3089 100644
--- a/media/video/omx_video_decode_engine.cc
+++ b/media/video/omx_video_decode_engine.cc
@@ -276,6 +276,10 @@ void OmxVideoDecodeEngine::Seek() {
event_handler_->OnSeekComplete();
}
+int OmxVideoDecodeEngine::current_omx_spec_version() const {
+ return 0x00000101;
+}
+
VideoFrame::Format OmxVideoDecodeEngine::GetSurfaceFormat() const {
// TODO(jiesun): Both OmxHeaderType and EGLImage surface type could have
// different surface formats.
diff --git a/media/video/omx_video_decode_engine.h b/media/video/omx_video_decode_engine.h
index 86cabe9..9a6c0a7 100644
--- a/media/video/omx_video_decode_engine.h
+++ b/media/video/omx_video_decode_engine.h
@@ -36,7 +36,7 @@ class OmxVideoDecodeEngine : public VideoDecodeEngine {
virtual void Seek();
// Subclass can provide a different value.
- virtual int current_omx_spec_version() const { return 0x00000101; }
+ virtual int current_omx_spec_version() const;
private:
enum OmxIlState {