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

Side by Side Diff: media/formats/mp2t/es_parser_adts.cc

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: oops Created 4 years, 9 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/cast/sender/h264_vt_encoder_unittest.cc ('k') | no next file » | 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/es_parser_adts.h" 5 #include "media/formats/mp2t/es_parser_adts.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "media/base/audio_timestamp_helper.h" 13 #include "media/base/audio_timestamp_helper.h"
14 #include "media/base/bit_reader.h" 14 #include "media/base/bit_reader.h"
15 #include "media/base/channel_layout.h" 15 #include "media/base/channel_layout.h"
16 #include "media/base/media_util.h"
16 #include "media/base/stream_parser_buffer.h" 17 #include "media/base/stream_parser_buffer.h"
17 #include "media/base/timestamp_constants.h" 18 #include "media/base/timestamp_constants.h"
18 #include "media/formats/common/offset_byte_queue.h" 19 #include "media/formats/common/offset_byte_queue.h"
19 #include "media/formats/mp2t/mp2t_common.h" 20 #include "media/formats/mp2t/mp2t_common.h"
20 #include "media/formats/mpeg/adts_constants.h" 21 #include "media/formats/mpeg/adts_constants.h"
21 #include "media/formats/mpeg/adts_header_parser.h" 22 #include "media/formats/mpeg/adts_header_parser.h"
22 23
23 namespace media { 24 namespace media {
24 25
25 static int ExtractAdtsFrameSize(const uint8_t* adts_header) { 26 static int ExtractAdtsFrameSize(const uint8_t* adts_header) {
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 // Audio config notification. 200 // Audio config notification.
200 last_audio_decoder_config_ = audio_decoder_config; 201 last_audio_decoder_config_ = audio_decoder_config;
201 new_audio_config_cb_.Run(audio_decoder_config); 202 new_audio_config_cb_.Run(audio_decoder_config);
202 } 203 }
203 204
204 return true; 205 return true;
205 } 206 }
206 207
207 } // namespace mp2t 208 } // namespace mp2t
208 } // namespace media 209 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/sender/h264_vt_encoder_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698