diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-15 20:54:05 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-15 20:54:05 +0000 |
| commit | f89f58add772d9c9037334d42d8f167123eb372e (patch) | |
| tree | aee574920c938f67b444c9724f08c0981de2990f /media | |
| parent | f19a9fa2c3d0ca6c0c291d945696920ba97b2140 (diff) | |
| download | chromium_src-f89f58add772d9c9037334d42d8f167123eb372e.zip chromium_src-f89f58add772d9c9037334d42d8f167123eb372e.tar.gz chromium_src-f89f58add772d9c9037334d42d8f167123eb372e.tar.bz2 | |
Address post commit nits for r151132
BUG=141533
TBR=scherkus@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10830342
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/video_renderer.h | 4 | ||||
| -rw-r--r-- | media/filters/video_renderer_base_unittest.cc | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/media/base/video_renderer.h b/media/base/video_renderer.h index 0ac60e8..57e22bc 100644 --- a/media/base/video_renderer.h +++ b/media/base/video_renderer.h @@ -37,8 +37,8 @@ class MEDIA_EXPORT VideoRenderer // Used to query the current time or duration of the media. typedef base::Callback<base::TimeDelta()> TimeDeltaCB; - // Initialize a VideoRenderer with the given VideoDecoder, executing - // |init_cb| callback upon completion. + // Initialize a VideoRenderer with the given DemuxerStream and + // VideoDecoderList, executing |init_cb| callback upon completion. // // |statistics_cb| is executed periodically with video rendering stats, such // as dropped frames. diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc index 4c90500..b81c40d 100644 --- a/media/filters/video_renderer_base_unittest.cc +++ b/media/filters/video_renderer_base_unittest.cc @@ -107,7 +107,7 @@ class VideoRendererBaseTest : public ::testing::Test { InSequence s; EXPECT_CALL(*decoder_, Initialize(_, _, _)) - .WillOnce(RunPipelineStatusCB1(PIPELINE_OK)); + .WillOnce(RunPipelineStatusCB1(PIPELINE_OK)); // Set playback rate before anything else happens. renderer_->SetPlaybackRate(1.0f); @@ -696,7 +696,6 @@ TEST_F(VideoRendererBaseTest, VideoDecoder_InitFailure) { EXPECT_CALL(*decoder_, Initialize(_, _, _)) .WillOnce(RunPipelineStatusCB1(PIPELINE_ERROR_DECODE)); InitializeRenderer(PIPELINE_ERROR_DECODE); - - } +} } // namespace media |