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

Side by Side Diff: media/capture/webm_muxer.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/capture/video/win/video_capture_device_win.cc ('k') | media/capture/webm_muxer.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_FILTERS_LIBWEBM_MUXER_H_ 5 #ifndef MEDIA_FILTERS_LIBWEBM_MUXER_H_
6 #define MEDIA_FILTERS_LIBWEBM_MUXER_H_ 6 #define MEDIA_FILTERS_LIBWEBM_MUXER_H_
7 7
8 #include <stdint.h>
9
8 #include "base/callback.h" 10 #include "base/callback.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/numerics/safe_math.h" 12 #include "base/numerics/safe_math.h"
11 #include "base/strings/string_piece.h" 13 #include "base/strings/string_piece.h"
12 #include "base/threading/thread_checker.h" 14 #include "base/threading/thread_checker.h"
13 #include "base/time/time.h" 15 #include "base/time/time.h"
14 #include "media/base/media_export.h" 16 #include "media/base/media_export.h"
15 #include "media/base/video_codecs.h" 17 #include "media/base/video_codecs.h"
16 #include "third_party/libwebm/source/mkvmuxer.hpp" 18 #include "third_party/libwebm/source/mkvmuxer.hpp"
17 19
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 // Save the most recent video keyframe if we're waiting for audio to come in. 118 // Save the most recent video keyframe if we're waiting for audio to come in.
117 scoped_ptr<std::string> most_recent_encoded_video_keyframe_; 119 scoped_ptr<std::string> most_recent_encoded_video_keyframe_;
118 base::TimeTicks saved_keyframe_timestamp_; 120 base::TimeTicks saved_keyframe_timestamp_;
119 121
120 DISALLOW_COPY_AND_ASSIGN(WebmMuxer); 122 DISALLOW_COPY_AND_ASSIGN(WebmMuxer);
121 }; 123 };
122 124
123 } // namespace media 125 } // namespace media
124 126
125 #endif // MEDIA_FILTERS_LIBWEBM_MUXER_H_ 127 #endif // MEDIA_FILTERS_LIBWEBM_MUXER_H_
OLDNEW
« no previous file with comments | « media/capture/video/win/video_capture_device_win.cc ('k') | media/capture/webm_muxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698