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

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

Issue 2343543002: MSE: Replace crossfade splicing overlap trimming. (Closed)
Patch Set: Merge and feedback. Created 4 years, 1 month 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/frame_processor_unittest.cc ('k') | media/filters/source_buffer_stream.h » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "media/filters/source_buffer_state.h" 5 #include "media/filters/source_buffer_state.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 void(ChunkDemuxerStream*, const TextTrackConfig&)); 121 void(ChunkDemuxerStream*, const TextTrackConfig&));
122 122
123 MOCK_METHOD1(MediaTracksUpdatedMock, void(std::unique_ptr<MediaTracks>&)); 123 MOCK_METHOD1(MediaTracksUpdatedMock, void(std::unique_ptr<MediaTracks>&));
124 void OnMediaTracksUpdated(std::unique_ptr<MediaTracks> tracks) { 124 void OnMediaTracksUpdated(std::unique_ptr<MediaTracks> tracks) {
125 MediaTracksUpdatedMock(tracks); 125 MediaTracksUpdatedMock(tracks);
126 } 126 }
127 127
128 ChunkDemuxerStream* CreateDemuxerStream(DemuxerStream::Type type) { 128 ChunkDemuxerStream* CreateDemuxerStream(DemuxerStream::Type type) {
129 static unsigned track_id = 0; 129 static unsigned track_id = 0;
130 demuxer_streams_.push_back(base::WrapUnique( 130 demuxer_streams_.push_back(base::WrapUnique(
131 new ChunkDemuxerStream(type, false, base::UintToString(++track_id)))); 131 new ChunkDemuxerStream(type, base::UintToString(++track_id))));
132 return demuxer_streams_.back().get(); 132 return demuxer_streams_.back().get();
133 } 133 }
134 134
135 scoped_refptr<testing::StrictMock<MockMediaLog>> media_log_; 135 scoped_refptr<testing::StrictMock<MockMediaLog>> media_log_;
136 std::vector<std::unique_ptr<ChunkDemuxerStream>> demuxer_streams_; 136 std::vector<std::unique_ptr<ChunkDemuxerStream>> demuxer_streams_;
137 MockStreamParser* mock_stream_parser_; 137 MockStreamParser* mock_stream_parser_;
138 StreamParser::NewConfigCB new_config_cb_; 138 StreamParser::NewConfigCB new_config_cb_;
139 }; 139 };
140 140
141 TEST_F(SourceBufferStateTest, InitSingleAudioTrack) { 141 TEST_F(SourceBufferStateTest, InitSingleAudioTrack) {
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 325
326 // Track ids are swapped in the second init segment. 326 // Track ids are swapped in the second init segment.
327 std::unique_ptr<MediaTracks> tracks2(new MediaTracks()); 327 std::unique_ptr<MediaTracks> tracks2(new MediaTracks());
328 AddAudioTrack(tracks2, kCodecOpus, 2); 328 AddAudioTrack(tracks2, kCodecOpus, 2);
329 AddVideoTrack(tracks2, kCodecVP9, 1); 329 AddVideoTrack(tracks2, kCodecVP9, 1);
330 EXPECT_CALL(*this, MediaTracksUpdatedMock(_)); 330 EXPECT_CALL(*this, MediaTracksUpdatedMock(_));
331 AppendDataAndReportTracks(sbs, std::move(tracks2)); 331 AppendDataAndReportTracks(sbs, std::move(tracks2));
332 } 332 }
333 333
334 } // namespace media 334 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/frame_processor_unittest.cc ('k') | media/filters/source_buffer_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698