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

Unified Diff: chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc

Issue 2719883005: Revert of Replace FFmpegDemuxer thread per element with base::TaskScheduler. (Closed)
Patch Set: Created 3 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 | « no previous file | media/base/demuxer_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc
diff --git a/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc b/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc
index ab4028862dab829b848a3c4050bb4516662106c7..7418f1f1b6135054ce5424700d90fa72adebd355 100644
--- a/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc
+++ b/chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc
@@ -21,7 +21,6 @@
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
-#include "base/test/scoped_task_scheduler.h"
#include "base/threading/thread.h"
#include "base/threading/thread_checker.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -233,7 +232,6 @@
void OnPauseCompleted();
- base::test::ScopedTaskScheduler task_scheduler_;
MediaPipelineDeviceParams::MediaSyncType sync_type_;
MediaPipelineDeviceParams::AudioStreamType audio_type_;
std::unique_ptr<TaskRunnerImpl> task_runner_;
@@ -905,6 +903,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, Mp3Playback) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForAudioOnly("sfx.mp3");
PauseBeforeEos();
@@ -913,6 +913,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, AacPlayback) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForAudioOnly("sfx.m4a");
PauseBeforeEos();
@@ -921,6 +923,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, VorbisPlayback) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeIgnorePts);
ConfigureForAudioOnly("sfx.ogg");
Start();
@@ -930,6 +934,8 @@
// TODO(kmackay) FFmpegDemuxForTest can't handle AC3 or EAC3.
TEST_F(AudioVideoPipelineDeviceTest, OpusPlayback_Optional) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForAudioOnly("bear-opus.ogg");
PauseBeforeEos();
@@ -938,6 +944,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, FlacPlayback_Optional) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForAudioOnly("bear.flac");
PauseBeforeEos();
@@ -946,6 +954,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, H264Playback) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForVideoOnly("bear.h264", true /* raw_h264 */);
PauseBeforeEos();
@@ -954,6 +964,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, WebmPlaybackWithPause) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
// Setup to pause for 100ms every 500ms
AddPause(base::TimeDelta::FromMilliseconds(500),
@@ -965,6 +977,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, Vp8Playback) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForVideoOnly("bear-vp8a.webm", false /* raw_h264 */);
Start();
@@ -972,6 +986,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, WebmPlayback) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForFile("bear-640x360.webm");
PauseBeforeEos();
@@ -982,6 +998,7 @@
// TODO(kmackay) FFmpegDemuxForTest can't handle HEVC or VP9.
TEST_F(AudioVideoPipelineDeviceTest, AudioBackendStates) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
Initialize();
MediaPipelineBackend::AudioDecoder* audio_decoder =
backend()->CreateAudioDecoder();
@@ -998,6 +1015,7 @@
}
TEST_F(AudioVideoPipelineDeviceTest, AudioEffectsBackendStates) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
set_audio_type(MediaPipelineDeviceParams::kAudioStreamSoundEffects);
set_sync_type(MediaPipelineDeviceParams::kModeIgnorePts);
Initialize();
@@ -1015,6 +1033,7 @@
}
TEST_F(AudioVideoPipelineDeviceTest, VideoBackendStates) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
Initialize();
MediaPipelineBackend::VideoDecoder* video_decoder =
backend()->CreateVideoDecoder();
@@ -1031,6 +1050,7 @@
}
TEST_F(AudioVideoPipelineDeviceTest, AudioImmediateEos) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
Initialize();
MediaPipelineBackend::AudioDecoder* audio_decoder =
backend()->CreateAudioDecoder();
@@ -1043,10 +1063,10 @@
SetAudioFeeder(std::move(feeder));
StartImmediateEosTest();
- base::RunLoop().RunUntilIdle();
}
TEST_F(AudioVideoPipelineDeviceTest, VideoImmediateEos) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
Initialize();
MediaPipelineBackend::VideoDecoder* video_decoder =
backend()->CreateVideoDecoder();
@@ -1059,10 +1079,11 @@
SetVideoFeeder(std::move(feeder));
StartImmediateEosTest();
- base::RunLoop().RunUntilIdle();
}
TEST_F(AudioVideoPipelineDeviceTest, Mp3Playback_WithEffectsStreams) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForAudioOnly("sfx.mp3");
PauseBeforeEos();
@@ -1072,6 +1093,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, AacPlayback_WithEffectsStreams) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForAudioOnly("sfx.m4a");
PauseBeforeEos();
@@ -1081,6 +1104,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, VorbisPlayback_WithEffectsStreams) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeIgnorePts);
ConfigureForAudioOnly("sfx.ogg");
AddEffectsStreams();
@@ -1091,6 +1116,8 @@
// TODO(kmackay) FFmpegDemuxForTest can't handle AC3 or EAC3.
TEST_F(AudioVideoPipelineDeviceTest, OpusPlayback_WithEffectsStreams_Optional) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForAudioOnly("bear-opus.ogg");
PauseBeforeEos();
@@ -1100,6 +1127,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, FlacPlayback_WithEffectsStreams_Optional) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForAudioOnly("bear.flac");
PauseBeforeEos();
@@ -1109,6 +1138,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, H264Playback_WithEffectsStreams) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForVideoOnly("bear.h264", true /* raw_h264 */);
PauseBeforeEos();
@@ -1118,6 +1149,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, WebmPlaybackWithPause_WithEffectsStreams) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
// Setup to pause for 100ms every 500ms
AddPause(base::TimeDelta::FromMilliseconds(500),
@@ -1130,6 +1163,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, Vp8Playback_WithEffectsStreams) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForVideoOnly("bear-vp8a.webm", false /* raw_h264 */);
AddEffectsStreams();
@@ -1138,6 +1173,8 @@
}
TEST_F(AudioVideoPipelineDeviceTest, WebmPlayback_WithEffectsStreams) {
+ std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
+
set_sync_type(MediaPipelineDeviceParams::kModeSyncPts);
ConfigureForFile("bear-640x360.webm");
PauseBeforeEos();
« no previous file with comments | « no previous file | media/base/demuxer_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698