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

Side by Side Diff: media/formats/common/stream_parser_test_base.cc

Issue 1861963008: Use StreamParser::TrackId instead of string for MediaTrack::byteStreamTrackId (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include <algorithm> into stream_parser_buffer.cc Created 4 years, 6 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/media_source_state.cc ('k') | media/formats/mp2t/mp2t_stream_parser.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/formats/common/stream_parser_test_base.h" 5 #include "media/formats/common/stream_parser_test_base.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "media/base/media_log.h"
11 #include "media/base/media_track.h" 12 #include "media/base/media_track.h"
12 #include "media/base/media_tracks.h" 13 #include "media/base/media_tracks.h"
13 #include "media/base/test_data_util.h" 14 #include "media/base/test_data_util.h"
14 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
15 16
16 namespace media { 17 namespace media {
17 18
18 static std::string BufferQueueToString( 19 static std::string BufferQueueToString(
19 const StreamParser::BufferQueue& buffers) { 20 const StreamParser::BufferQueue& buffers) {
20 std::stringstream ss; 21 std::stringstream ss;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 DVLOG(1) << __FUNCTION__; 124 DVLOG(1) << __FUNCTION__;
124 results_stream_ << "NewSegment"; 125 results_stream_ << "NewSegment";
125 } 126 }
126 127
127 void StreamParserTestBase::OnEndOfSegment() { 128 void StreamParserTestBase::OnEndOfSegment() {
128 DVLOG(1) << __FUNCTION__; 129 DVLOG(1) << __FUNCTION__;
129 results_stream_ << "EndOfSegment"; 130 results_stream_ << "EndOfSegment";
130 } 131 }
131 132
132 } // namespace media 133 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/media_source_state.cc ('k') | media/formats/mp2t/mp2t_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698