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

Side by Side Diff: media/formats/mp2t/mp2t_stream_parser_unittest.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/formats/mp2t/mp2t_stream_parser.cc ('k') | media/formats/mp4/mp4_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/mp2t/mp2t_stream_parser.h" 5 #include "media/formats/mp2t/mp2t_stream_parser.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 13
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/bind_helpers.h" 15 #include "base/bind_helpers.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/memory/ref_counted.h" 17 #include "base/memory/ref_counted.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "media/base/audio_decoder_config.h" 19 #include "media/base/audio_decoder_config.h"
20 #include "media/base/decoder_buffer.h" 20 #include "media/base/decoder_buffer.h"
21 #include "media/base/media_log.h"
21 #include "media/base/media_track.h" 22 #include "media/base/media_track.h"
22 #include "media/base/media_tracks.h" 23 #include "media/base/media_tracks.h"
23 #include "media/base/stream_parser_buffer.h" 24 #include "media/base/stream_parser_buffer.h"
24 #include "media/base/test_data_util.h" 25 #include "media/base/test_data_util.h"
25 #include "media/base/text_track_config.h" 26 #include "media/base/text_track_config.h"
26 #include "media/base/video_decoder_config.h" 27 #include "media/base/video_decoder_config.h"
27 #include "testing/gtest/include/gtest/gtest.h" 28 #include "testing/gtest/include/gtest/gtest.h"
28 29
29 namespace media { 30 namespace media {
30 namespace mp2t { 31 namespace mp2t {
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 parser_->Flush(); 297 parser_->Flush();
297 EXPECT_EQ(audio_frame_count_, 40); 298 EXPECT_EQ(audio_frame_count_, 40);
298 EXPECT_EQ(video_frame_count_, 0); 299 EXPECT_EQ(video_frame_count_, 0);
299 // This stream has no mid-stream configuration change. 300 // This stream has no mid-stream configuration change.
300 EXPECT_EQ(config_count_, 1); 301 EXPECT_EQ(config_count_, 1);
301 EXPECT_EQ(segment_count_, 1); 302 EXPECT_EQ(segment_count_, 1);
302 } 303 }
303 304
304 } // namespace mp2t 305 } // namespace mp2t
305 } // namespace media 306 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/mp2t/mp2t_stream_parser.cc ('k') | media/formats/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698