Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(590)

Unified Diff: media/filters/ffmpeg_video_decoder_unittest.cc

Issue 395703002: Fold {Audio|Video}Decoder::Stop() into the dtor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | media/filters/gpu_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_video_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index 9ccdbc2865f9f6bcc13b3e464e74772d126e9bc1..c3fde2700bdfbee02bf06b50a99a272c1d3fb310 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -61,7 +61,7 @@ class FFmpegVideoDecoderTest : public testing::Test {
}
virtual ~FFmpegVideoDecoderTest() {
- Stop();
+ Destroy();
}
void Initialize() {
@@ -89,8 +89,8 @@ class FFmpegVideoDecoderTest : public testing::Test {
message_loop_.RunUntilIdle();
}
- void Stop() {
- decoder_->Stop();
+ void Destroy() {
+ decoder_.reset();
message_loop_.RunUntilIdle();
}
@@ -421,25 +421,25 @@ TEST_F(FFmpegVideoDecoderTest, Reset_EndOfStream) {
Reset();
}
-// Test stopping when decoder has initialized but not decoded.
-TEST_F(FFmpegVideoDecoderTest, Stop_Initialized) {
+// Test destruction when decoder has initialized but not decoded.
+TEST_F(FFmpegVideoDecoderTest, Destroy_Initialized) {
Initialize();
- Stop();
+ Destroy();
}
-// Test stopping when decoder has decoded single frame.
-TEST_F(FFmpegVideoDecoderTest, Stop_Decoding) {
+// Test destruction when decoder has decoded single frame.
+TEST_F(FFmpegVideoDecoderTest, Destroy_Decoding) {
Initialize();
EnterDecodingState();
- Stop();
+ Destroy();
}
-// Test stopping when decoder has hit end of stream.
-TEST_F(FFmpegVideoDecoderTest, Stop_EndOfStream) {
+// Test destruction when decoder has hit end of stream.
+TEST_F(FFmpegVideoDecoderTest, Destroy_EndOfStream) {
Initialize();
EnterDecodingState();
EnterEndOfStreamState();
- Stop();
+ Destroy();
}
} // namespace media
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | media/filters/gpu_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698