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

Side by Side Diff: media/formats/mpeg/adts_stream_parser.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
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/mpeg/adts_stream_parser.h" 5 #include "media/formats/mpeg/adts_stream_parser.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "media/base/media_log.h"
9 #include "media/formats/mpeg/adts_constants.h" 10 #include "media/formats/mpeg/adts_constants.h"
10 11
11 namespace media { 12 namespace media {
12 13
13 static const uint32_t kADTSStartCodeMask = 0xfff00000; 14 static const uint32_t kADTSStartCodeMask = 0xfff00000;
14 15
15 ADTSStreamParser::ADTSStreamParser() 16 ADTSStreamParser::ADTSStreamParser()
16 : MPEGAudioStreamParserBase(kADTSStartCodeMask, kCodecAAC, 0) {} 17 : MPEGAudioStreamParserBase(kADTSStartCodeMask, kCodecAAC, 0) {}
17 18
18 ADTSStreamParser::~ADTSStreamParser() {} 19 ADTSStreamParser::~ADTSStreamParser() {}
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 if (channel_layout) 92 if (channel_layout)
92 *channel_layout = kADTSChannelLayoutTable[channel_layout_index]; 93 *channel_layout = kADTSChannelLayoutTable[channel_layout_index];
93 94
94 if (metadata_frame) 95 if (metadata_frame)
95 *metadata_frame = false; 96 *metadata_frame = false;
96 97
97 return bytes_read; 98 return bytes_read;
98 } 99 }
99 100
100 } // namespace media 101 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/mp4/mp4_stream_parser_unittest.cc ('k') | media/formats/mpeg/mpeg1_audio_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698