summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-18 20:48:42 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-18 20:48:42 +0000
commit727e24483574841112ae91694d8491a872020c90 (patch)
tree3c2b2c33f7ba4f4f81d393c5fb4e2c9987fef856 /media
parent28ac12554ed7b79bc2a6ac733b3cbdc661c12be1 (diff)
downloadchromium_src-727e24483574841112ae91694d8491a872020c90.zip
chromium_src-727e24483574841112ae91694d8491a872020c90.tar.gz
chromium_src-727e24483574841112ae91694d8491a872020c90.tar.bz2
Clear obsolete comment in GpuVideoDecoder.
Review URL: https://codereview.chromium.org/14002006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/filters/gpu_video_decoder.cc2
-rw-r--r--media/filters/gpu_video_decoder.h7
2 files changed, 1 insertions, 8 deletions
diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc
index 867ac36..555164e 100644
--- a/media/filters/gpu_video_decoder.cc
+++ b/media/filters/gpu_video_decoder.cc
@@ -195,8 +195,6 @@ void GpuVideoDecoder::Reset(const base::Closure& closure) {
return;
}
- // VideoRendererBase::Flush() can't complete while it has a pending read to
- // us, so we fulfill such a read here.
if (!pending_read_cb_.is_null())
EnqueueFrameAndTriggerFrameDelivery(VideoFrame::CreateEmptyFrame());
diff --git a/media/filters/gpu_video_decoder.h b/media/filters/gpu_video_decoder.h
index b14c455..c2defb3 100644
--- a/media/filters/gpu_video_decoder.h
+++ b/media/filters/gpu_video_decoder.h
@@ -105,11 +105,6 @@ class MEDIA_EXPORT GpuVideoDecoder
private:
enum State {
kNormal,
- // Avoid the use of "flush" in these enums because the term is overloaded:
- // Filter::Flush() means drop pending data on the floor, but
- // VideoDecodeAccelerator::Flush() means drain pending data (Filter::Flush()
- // actually corresponds to VideoDecodeAccelerator::Reset(), confusingly
- // enough).
kDrainingDecoder,
kDecoderDrained,
};
@@ -133,7 +128,7 @@ class MEDIA_EXPORT GpuVideoDecoder
void EnqueueFrameAndTriggerFrameDelivery(
const scoped_refptr<VideoFrame>& frame);
- // Indicate the picturebuffer can be reused by the decoder.
+ // Indicate the picture buffer can be reused by the decoder.
void ReusePictureBuffer(int64 picture_buffer_id);
void RecordBufferData(