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

Unified Diff: media/test/pipeline_integration_test_base.h

Issue 1761603002: media: Handle "encrypted" event in pipeline_integration_fuzzertest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed 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/test/pipeline_integration_fuzzertest.cc ('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_base.h
diff --git a/media/test/pipeline_integration_test_base.h b/media/test/pipeline_integration_test_base.h
index bd31e42d9c7e9c8674618f29fffbe57ac531dff4..4bcca00b1350f17f8d423a325e6ef76b3e220bc8 100644
--- a/media/test/pipeline_integration_test_base.h
+++ b/media/test/pipeline_integration_test_base.h
@@ -85,11 +85,14 @@ class PipelineIntegrationTestBase {
bool Suspend();
bool Resume(base::TimeDelta seek_time);
void Stop();
- bool WaitUntilCurrentTimeIsAfter(const base::TimeDelta& wait_time);
+ bool WaitUntilCurrentTimeIsAfter(const base::TimeDelta& wait_time);
bool WaitUntilOnEnded();
PipelineStatus WaitUntilEndedOrError();
+ // Sets |pipeline_status_| to an error status and stops the message loop.
+ void OnError(PipelineStatus status);
+
xhwang 2016/03/03 06:23:42 I moved these to "public" so that they can be call
// Returns the MD5 hash of all video frames seen. Should only be called once
// after playback completes. First time hashes should be generated with
// --video-threads=1 to ensure correctness. Pipeline must have been started
@@ -105,6 +108,11 @@ class PipelineIntegrationTestBase {
// Pipeline must have been started with clockless playback enabled.
base::TimeDelta GetAudioTime();
+ void set_encrypted_media_init_data_cb(
+ const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb) {
+ encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
+ }
+
protected:
base::MessageLoop message_loop_;
base::MD5Context md5_context_;
@@ -137,13 +145,8 @@ class PipelineIntegrationTestBase {
void OnStatusCallback(PipelineStatus status);
void DemuxerEncryptedMediaInitDataCB(EmeInitDataType type,
const std::vector<uint8_t>& init_data);
- void set_encrypted_media_init_data_cb(
- const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb) {
- encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
- }
void OnEnded();
- void OnError(PipelineStatus status);
void QuitAfterCurrentTimeTask(const base::TimeDelta& quit_time);
// Creates Demuxer and sets |demuxer_|.
« no previous file with comments | « media/test/pipeline_integration_fuzzertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698