Commit 1108d5e1 authored by Felipe Salazar's avatar Felipe Salazar Committed by Commit Bot

Fix errors for cast builds due to -Wunreachable-code

Bug: internal b/152060494
Change-Id: I47d3e4abce88008798a68b0273c4f3d0c60b5f82
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2121428
Commit-Queue: Michael Spang <spang@chromium.org>
Reviewed-by: default avatarKenneth MacKay <kmackay@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753703}
parent 1a9f03b6
......@@ -195,8 +195,7 @@ class AudioVideoPipelineDeviceTest : public testing::Test {
}
void SetUp() override {
CastMediaShlib::Initialize(
base::CommandLine::ForCurrentProcess()->argv());
CastMediaShlib::Initialize(base::CommandLine::ForCurrentProcess()->argv());
VolumeControl::Initialize(base::CommandLine::ForCurrentProcess()->argv());
}
......@@ -328,12 +327,13 @@ void BufferFeeder::ScheduleConfigTest() {
// now.
// TODO(almasrymina): re-enable this. b/110961816.
return;
#endif
#else
if (expecting_buffer_complete_) {
test_config_after_next_push_ = true;
} else {
TestConfigs();
}
#endif
}
void BufferFeeder::FeedBuffer() {
......@@ -581,8 +581,8 @@ std::unique_ptr<BufferFeeder> BufferFeeder::LoadVideo(
if (raw_h264) {
base::FilePath file_path = GetTestDataFilePath(filename);
base::MemoryMappedFile video_stream;
CHECK(video_stream.Initialize(file_path)) << "Couldn't open stream file: "
<< file_path.MaybeAsASCII();
CHECK(video_stream.Initialize(file_path))
<< "Couldn't open stream file: " << file_path.MaybeAsASCII();
buffers = H264SegmenterForTest(video_stream.data(), video_stream.length());
// TODO(erickung): Either pull data from stream or make caller specify value
......@@ -806,15 +806,13 @@ void AudioVideoPipelineDeviceTest::MonitorLoop() {
if (sync_type_ == MediaPipelineDeviceParams::kModeSyncPts) {
// Check that the current PTS is no more than 100ms past the last pushed
// PTS.
if (audio_feeder_ &&
audio_feeder_->last_pushed_pts() !=
std::numeric_limits<int64_t>::min()) {
if (audio_feeder_ && audio_feeder_->last_pushed_pts() !=
std::numeric_limits<int64_t>::min()) {
EXPECT_LE(pts, std::max(kStartPts,
audio_feeder_->last_pushed_pts() + 100 * 1000));
}
if (video_feeder_ &&
video_feeder_->last_pushed_pts() !=
std::numeric_limits<int64_t>::min()) {
if (video_feeder_ && video_feeder_->last_pushed_pts() !=
std::numeric_limits<int64_t>::min()) {
EXPECT_LE(pts, std::max(kStartPts,
video_feeder_->last_pushed_pts() + 100 * 1000));
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment