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

Side by Side Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 1526303004: Fix buffered range updates in media::Pipeline (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android buildfix Created 4 years, 11 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 unified diff | Download patch
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <deque> 9 #include <deque>
10 #include <string> 10 #include <string>
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 FFmpegDemuxerTest() {} 77 FFmpegDemuxerTest() {}
78 78
79 virtual ~FFmpegDemuxerTest() { 79 virtual ~FFmpegDemuxerTest() {
80 if (demuxer_) 80 if (demuxer_)
81 demuxer_->Stop(); 81 demuxer_->Stop();
82 } 82 }
83 83
84 void CreateDemuxer(const std::string& name) { 84 void CreateDemuxer(const std::string& name) {
85 CHECK(!demuxer_); 85 CHECK(!demuxer_);
86 86
87 EXPECT_CALL(host_, AddBufferedTimeRange(_, _)).Times(AnyNumber()); 87 EXPECT_CALL(host_, OnBufferedTimeRangesChanged(_)).Times(AnyNumber());
88 88
89 CreateDataSource(name); 89 CreateDataSource(name);
90 90
91 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb = base::Bind( 91 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb = base::Bind(
92 &FFmpegDemuxerTest::OnEncryptedMediaInitData, base::Unretained(this)); 92 &FFmpegDemuxerTest::OnEncryptedMediaInitData, base::Unretained(this));
93 93
94 demuxer_.reset(new FFmpegDemuxer( 94 demuxer_.reset(new FFmpegDemuxer(
95 message_loop_.task_runner(), data_source_.get(), 95 message_loop_.task_runner(), data_source_.get(),
96 encrypted_media_init_data_cb, new MediaLog())); 96 encrypted_media_init_data_cb, new MediaLog()));
97 } 97 }
(...skipping 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after
1159 // Read the first two frames and check that we are getting expected data 1159 // Read the first two frames and check that we are getting expected data
1160 audio->Read(NewReadCB(FROM_HERE, 870, 0, true)); 1160 audio->Read(NewReadCB(FROM_HERE, 870, 0, true));
1161 message_loop_.Run(); 1161 message_loop_.Run();
1162 1162
1163 audio->Read(NewReadCB(FROM_HERE, 872, 34830, true)); 1163 audio->Read(NewReadCB(FROM_HERE, 872, 34830, true));
1164 message_loop_.Run(); 1164 message_loop_.Run();
1165 } 1165 }
1166 #endif // ENABLE_AC3_EAC3_AUDIO_DEMUXING 1166 #endif // ENABLE_AC3_EAC3_AUDIO_DEMUXING
1167 1167
1168 } // namespace media 1168 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698