OLD | NEW |
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 "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/macros.h" |
9 #include "base/numerics/safe_math.h" | 10 #include "base/numerics/safe_math.h" |
10 #include "base/strings/string_piece.h" | 11 #include "base/strings/string_piece.h" |
11 #include "base/threading/thread_checker.h" | 12 #include "base/threading/thread_checker.h" |
12 #include "base/time/time.h" | 13 #include "base/time/time.h" |
13 #include "media/base/media_export.h" | 14 #include "media/base/media_export.h" |
14 #include "media/base/video_codecs.h" | 15 #include "media/base/video_codecs.h" |
15 #include "third_party/libwebm/source/mkvmuxer.hpp" | 16 #include "third_party/libwebm/source/mkvmuxer.hpp" |
16 | 17 |
17 namespace gfx { | 18 namespace gfx { |
18 class Size; | 19 class Size; |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 // Save the most recent video keyframe if we're waiting for audio to come in. | 116 // Save the most recent video keyframe if we're waiting for audio to come in. |
116 scoped_ptr<std::string> most_recent_encoded_video_keyframe_; | 117 scoped_ptr<std::string> most_recent_encoded_video_keyframe_; |
117 base::TimeTicks saved_keyframe_timestamp_; | 118 base::TimeTicks saved_keyframe_timestamp_; |
118 | 119 |
119 DISALLOW_COPY_AND_ASSIGN(WebmMuxer); | 120 DISALLOW_COPY_AND_ASSIGN(WebmMuxer); |
120 }; | 121 }; |
121 | 122 |
122 } // namespace media | 123 } // namespace media |
123 | 124 |
124 #endif // MEDIA_FILTERS_LIBWEBM_MUXER_H_ | 125 #endif // MEDIA_FILTERS_LIBWEBM_MUXER_H_ |
OLD | NEW |