diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 18:25:03 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 18:25:03 +0000 |
commit | 7cf4091e5e3eb7b3ee40c8fdc886226100b3a2e7 (patch) | |
tree | 423fdaae7c04f5ea304640618000675feb4e3443 /media | |
parent | 57005ec7bf8cebf0e53a3e59dd9ca062ba1eb053 (diff) | |
download | chromium_src-7cf4091e5e3eb7b3ee40c8fdc886226100b3a2e7.zip chromium_src-7cf4091e5e3eb7b3ee40c8fdc886226100b3a2e7.tar.gz chromium_src-7cf4091e5e3eb7b3ee40c8fdc886226100b3a2e7.tar.bz2 |
Start deinlining non-empty virtual methods. (This will be automatically checked
for in the future.)
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/5574006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68746 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r-- | media/base/buffers.cc | 4 | ||||
-rw-r--r-- | media/base/buffers.h | 2 | ||||
-rw-r--r-- | media/base/filters.cc | 4 | ||||
-rw-r--r-- | media/base/filters.h | 2 | ||||
-rw-r--r-- | media/base/video_frame.h | 2 |
5 files changed, 11 insertions, 3 deletions
diff --git a/media/base/buffers.cc b/media/base/buffers.cc index 4708726..ab66b9a 100644 --- a/media/base/buffers.cc +++ b/media/base/buffers.cc @@ -13,4 +13,8 @@ StreamSample::StreamSample() {} StreamSample::~StreamSample() {} +bool Buffer::IsEndOfStream() const { + return GetData() == NULL; +} + } // namespace media diff --git a/media/base/buffers.h b/media/base/buffers.h index 525450d..c87cdf3 100644 --- a/media/base/buffers.h +++ b/media/base/buffers.h @@ -85,7 +85,7 @@ class Buffer : public StreamSample { virtual size_t GetDataSize() const = 0; // If there's no data in this buffer, it represents end of stream. - virtual bool IsEndOfStream() const { return GetData() == NULL; } + virtual bool IsEndOfStream() const; protected: virtual ~Buffer() {} diff --git a/media/base/filters.cc b/media/base/filters.cc index 923329b..d3d3bcb 100644 --- a/media/base/filters.cc +++ b/media/base/filters.cc @@ -133,6 +133,10 @@ const char* VideoRenderer::major_mime_type() const { return mime_type::kMajorTypeVideo; } +void* DemuxerStream::QueryInterface(const char* interface_id) { + return NULL; +} + DemuxerStream::~DemuxerStream() {} VideoDecoder::VideoDecoder() {} diff --git a/media/base/filters.h b/media/base/filters.h index 4fd52e2..49fa347 100644 --- a/media/base/filters.h +++ b/media/base/filters.h @@ -201,7 +201,7 @@ class DemuxerStream : public base::RefCountedThreadSafe<DemuxerStream> { // return NULL to indicate the interface is unknown. The derived filter // should NOT AddRef() the interface. The DemuxerStream::QueryInterface() // public template function will assign the interface to a scoped_refptr<>. - virtual void* QueryInterface(const char* interface_id) { return NULL; } + virtual void* QueryInterface(const char* interface_id); friend class base::RefCountedThreadSafe<DemuxerStream>; virtual ~DemuxerStream(); diff --git a/media/base/video_frame.h b/media/base/video_frame.h index ecb3f8a..b1be562 100644 --- a/media/base/video_frame.h +++ b/media/base/video_frame.h @@ -94,7 +94,7 @@ class VideoFrame : public StreamSample { static void CreateBlackFrame(int width, int height, scoped_refptr<VideoFrame>* frame_out); - virtual SurfaceType type() const { return type_; } + SurfaceType type() const { return type_; } Format format() const { return format_; } |