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

Unified Diff: media/cast/video_receiver/video_decoder_unittest.cc

Issue 116623002: Cast: Adding support for GPU accelerated encode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed merge nits Created 6 years, 11 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/cast/video_receiver/video_decoder.cc ('k') | media/cast/video_sender/codecs/vp8/vp8_encoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/video_receiver/video_decoder_unittest.cc
diff --git a/media/cast/video_receiver/video_decoder_unittest.cc b/media/cast/video_receiver/video_decoder_unittest.cc
index 6405d1d7bee06d7997ff9d8defc24a724f0caa6b..0987dd4157f68382e400afa2dfc18f709ad78d3f 100644
--- a/media/cast/video_receiver/video_decoder_unittest.cc
+++ b/media/cast/video_receiver/video_decoder_unittest.cc
@@ -20,7 +20,6 @@ namespace cast {
using testing::_;
// Random frame size for testing.
-const int kFrameSize = 2345;
static const int64 kStartMillisecond = GG_INT64_C(1245);
namespace {
@@ -76,18 +75,6 @@ TEST_F(VideoDecoderTest, DISABLED_SizeZero) {
"Empty frame");
}
-// TODO(pwestin): EXPECT_DEATH tests can not pass valgrind.
-TEST_F(VideoDecoderTest, DISABLED_InvalidCodec) {
- EncodedVideoFrame encoded_frame;
- base::TimeTicks render_time;
- encoded_frame.data.assign(kFrameSize, 0);
- encoded_frame.codec = kExternalVideo;
- EXPECT_DEATH(
- decoder_->DecodeVideoFrame(&encoded_frame, render_time, base::Bind(
- &DecodeTestFrameCallback::DecodeComplete, test_callback_)),
- "Invalid codec");
-}
-
// TODO(pwestin): Test decoding a real frame.
} // namespace cast
« no previous file with comments | « media/cast/video_receiver/video_decoder.cc ('k') | media/cast/video_sender/codecs/vp8/vp8_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698