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

Side by Side Diff: media/formats/mp2t/es_adapter_video.h

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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/common/stream_parser_test_base.h ('k') | media/formats/mp2t/es_adapter_video.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_MP2T_ES_ADAPTER_VIDEO_H_ 5 #ifndef MEDIA_FORMATS_MP2T_ES_ADAPTER_VIDEO_H_
6 #define MEDIA_FORMATS_MP2T_ES_ADAPTER_VIDEO_H_ 6 #define MEDIA_FORMATS_MP2T_ES_ADAPTER_VIDEO_H_
7 7
8 #include <stdint.h>
9
8 #include <deque> 10 #include <deque>
9 #include <list> 11 #include <list>
10 #include <utility> 12 #include <utility>
11 13
12 #include "base/callback.h" 14 #include "base/callback.h"
13 #include "base/macros.h" 15 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 16 #include "base/memory/ref_counted.h"
15 #include "base/time/time.h" 17 #include "base/time/time.h"
16 #include "media/base/media_export.h" 18 #include "media/base/media_export.h"
17 #include "media/base/stream_parser_buffer.h" 19 #include "media/base/stream_parser_buffer.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 // Number of frames to replace with the first valid key frame. 97 // Number of frames to replace with the first valid key frame.
96 int discarded_frame_count_; 98 int discarded_frame_count_;
97 99
98 DISALLOW_COPY_AND_ASSIGN(EsAdapterVideo); 100 DISALLOW_COPY_AND_ASSIGN(EsAdapterVideo);
99 }; 101 };
100 102
101 } // namespace mp2t 103 } // namespace mp2t
102 } // namespace media 104 } // namespace media
103 105
104 #endif // MEDIA_FORMATS_MP2T_ES_ADAPTER_VIDEO_H_ 106 #endif // MEDIA_FORMATS_MP2T_ES_ADAPTER_VIDEO_H_
OLDNEW
« no previous file with comments | « media/formats/common/stream_parser_test_base.h ('k') | media/formats/mp2t/es_adapter_video.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698