diff options
author | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2013-03-28 15:31:22 +0000 |
commit | 2a99a7e74a7f215066514fe81d2bfa6639d9eddd (patch) | |
tree | 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae /media/base/video_decoder.h | |
parent | 61c449bbbb53310a8c041d8cefdd6b01a126cc7e (diff) | |
download | chromium_org-2a99a7e74a7f215066514fe81d2bfa6639d9eddd.tar.gz |
Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
Diffstat (limited to 'media/base/video_decoder.h')
-rw-r--r-- | media/base/video_decoder.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/base/video_decoder.h b/media/base/video_decoder.h index 915a9b429f..904a6fd978 100644 --- a/media/base/video_decoder.h +++ b/media/base/video_decoder.h @@ -69,6 +69,12 @@ class MEDIA_EXPORT VideoDecoder // that return formats with an alpha channel. virtual bool HasAlpha() const; + // Returns true if the decoder currently has the ability to decode and return + // a VideoFrame. Most implementations can allocate a new VideoFrame and hence + // this will always return true. Override and return false for decoders that + // use a fixed set of VideoFrames for decoding. + virtual bool HasOutputFrameAvailable() const; + protected: friend class base::RefCountedThreadSafe<VideoDecoder>; virtual ~VideoDecoder(); |