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

Unified Diff: media/filters/source_buffer_stream_unittest.cc

Issue 10910293: Add is_encrypted() in VideoDecoderConfig. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolve comments. Created 8 years, 3 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
Index: media/filters/source_buffer_stream_unittest.cc
diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc
index 10084ccca709974cc142922ae0c676246905b433..96b1826bfbaadfcb89c0d96d999e5e7995515e81 100644
--- a/media/filters/source_buffer_stream_unittest.cc
+++ b/media/filters/source_buffer_stream_unittest.cc
@@ -4,6 +4,8 @@
#include "media/filters/source_buffer_stream.h"
+#include <string>
+
#include "base/logging.h"
#include "media/base/data_buffer.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -22,7 +24,7 @@ class SourceBufferStreamTest : public testing::Test {
SourceBufferStreamTest() {
config_.Initialize(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN,
VideoFrame::YV12, kCodedSize, gfx::Rect(kCodedSize),
- kCodedSize, NULL, 0, false);
+ kCodedSize, NULL, 0, false, false);
stream_.reset(new SourceBufferStream(config_));
SetStreamInfo(kDefaultFramesPerSecond, kDefaultKeyframesPerSecond);
}
@@ -1837,7 +1839,7 @@ TEST_F(SourceBufferStreamTest, ConfigChange_Basic) {
gfx::Size kNewCodedSize(kCodedSize.width() * 2, kCodedSize.height() * 2);
VideoDecoderConfig new_config(
kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN, VideoFrame::YV12, kNewCodedSize,
- gfx::Rect(kNewCodedSize), kNewCodedSize, NULL, 0);
+ gfx::Rect(kNewCodedSize), kNewCodedSize, NULL, 0, false);
ASSERT_FALSE(new_config.Matches(config_));
Seek(0);
@@ -1884,7 +1886,7 @@ TEST_F(SourceBufferStreamTest, ConfigChange_Seek) {
gfx::Size kNewCodedSize(kCodedSize.width() * 2, kCodedSize.height() * 2);
VideoDecoderConfig new_config(
kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN, VideoFrame::YV12, kNewCodedSize,
- gfx::Rect(kNewCodedSize), kNewCodedSize, NULL, 0);
+ gfx::Rect(kNewCodedSize), kNewCodedSize, NULL, 0, false);
Seek(0);
NewSegmentAppend(0, 5, &kDataA);

Powered by Google App Engine
This is Rietveld 408576698