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

Unified Diff: media/test/pipeline_integration_test.cc

Issue 1716503002: Basic media tracks implementation for media stream parsers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 10 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/media.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 80871f98c7b7efdd28349874ea9e1801d14c7b4b..51a845bc5b12e6127b2d3b83996244c6b07ba395 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -21,6 +21,7 @@
#include "media/base/media.h"
#include "media/base/media_keys.h"
#include "media/base/media_switches.h"
+#include "media/base/media_tracks.h"
#include "media/base/test_data_util.h"
#include "media/base/timestamp_constants.h"
#include "media/cdm/aes_decryptor.h"
@@ -636,7 +637,7 @@ class MockMediaSource {
return last_timestamp_offset_;
}
- MOCK_METHOD0(InitSegmentReceived, void(void));
+ MOCK_METHOD1(InitSegmentReceived, void(const MediaTracks&));
private:
scoped_refptr<DecoderBuffer> file_data_;
@@ -682,7 +683,7 @@ class PipelineIntegrationTestHost : public testing::Test,
class PipelineIntegrationTest : public PipelineIntegrationTestHost {
public:
void StartPipelineWithMediaSource(MockMediaSource* source) {
- EXPECT_CALL(*source, InitSegmentReceived()).Times(AtLeast(1));
+ EXPECT_CALL(*source, InitSegmentReceived(_)).Times(AtLeast(1));
EXPECT_CALL(*this, OnMetadata(_))
.Times(AtMost(1))
.WillRepeatedly(SaveArg<0>(&metadata_));
@@ -726,7 +727,7 @@ class PipelineIntegrationTest : public PipelineIntegrationTestHost {
void StartPipelineWithEncryptedMedia(MockMediaSource* source,
FakeEncryptedMedia* encrypted_media) {
- EXPECT_CALL(*source, InitSegmentReceived()).Times(AtLeast(1));
+ EXPECT_CALL(*source, InitSegmentReceived(_)).Times(AtLeast(1));
EXPECT_CALL(*this, OnMetadata(_))
.Times(AtMost(1))
.WillRepeatedly(SaveArg<0>(&metadata_));
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698