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

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

Issue 2239013002: Assign correct track ids to buffers emitted from StreamParsers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « no previous file | media/formats/common/stream_parser_test_base.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 #ifndef MEDIA_FORMATS_COMMON_STREAM_PARSER_TEST_BASE_H_ 5 #ifndef MEDIA_FORMATS_COMMON_STREAM_PARSER_TEST_BASE_H_
6 #define MEDIA_FORMATS_COMMON_STREAM_PARSER_TEST_BASE_H_ 6 #define MEDIA_FORMATS_COMMON_STREAM_PARSER_TEST_BASE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 bool OnNewBuffers(const StreamParser::BufferQueue& audio_buffers, 63 bool OnNewBuffers(const StreamParser::BufferQueue& audio_buffers,
64 const StreamParser::BufferQueue& video_buffers, 64 const StreamParser::BufferQueue& video_buffers,
65 const StreamParser::TextBufferQueueMap& text_map); 65 const StreamParser::TextBufferQueueMap& text_map);
66 void OnKeyNeeded(EmeInitDataType type, const std::vector<uint8_t>& init_data); 66 void OnKeyNeeded(EmeInitDataType type, const std::vector<uint8_t>& init_data);
67 void OnNewSegment(); 67 void OnNewSegment();
68 void OnEndOfSegment(); 68 void OnEndOfSegment();
69 69
70 std::unique_ptr<StreamParser> parser_; 70 std::unique_ptr<StreamParser> parser_;
71 std::stringstream results_stream_; 71 std::stringstream results_stream_;
72 AudioDecoderConfig last_audio_config_; 72 AudioDecoderConfig last_audio_config_;
73 StreamParser::TrackId audio_track_id_;
73 74
74 DISALLOW_COPY_AND_ASSIGN(StreamParserTestBase); 75 DISALLOW_COPY_AND_ASSIGN(StreamParserTestBase);
75 }; 76 };
76 77
77 } // namespace media 78 } // namespace media
78 79
79 #endif // MEDIA_FORMATS_COMMON_STREAM_PARSER_TEST_BASE_H_ 80 #endif // MEDIA_FORMATS_COMMON_STREAM_PARSER_TEST_BASE_H_
OLDNEW
« no previous file with comments | « no previous file | media/formats/common/stream_parser_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698