| 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_MUXERS_WEBM_MUXER_H_ | 5 #ifndef MEDIA_MUXERS_WEBM_MUXER_H_ |
| 6 #define MEDIA_MUXERS_WEBM_MUXER_H_ | 6 #define MEDIA_MUXERS_WEBM_MUXER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <deque> | 10 #include <deque> |
| 11 | 11 |
| 12 #include "base/callback.h" | 12 #include "base/callback.h" |
| 13 #include "base/macros.h" | 13 #include "base/macros.h" |
| 14 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/numerics/safe_math.h" | 15 #include "base/numerics/safe_math.h" |
| 15 #include "base/strings/string_piece.h" | 16 #include "base/strings/string_piece.h" |
| 16 #include "base/threading/thread_checker.h" | 17 #include "base/threading/thread_checker.h" |
| 17 #include "base/time/time.h" | 18 #include "base/time/time.h" |
| 18 #include "base/timer/elapsed_timer.h" | 19 #include "base/timer/elapsed_timer.h" |
| 19 #include "media/base/media_export.h" | 20 #include "media/base/media_export.h" |
| 20 #include "media/base/video_codecs.h" | 21 #include "media/base/video_codecs.h" |
| 21 #include "third_party/libwebm/source/mkvmuxer.hpp" | 22 #include "third_party/libwebm/source/mkvmuxer.hpp" |
| 22 | 23 |
| 23 namespace gfx { | 24 namespace gfx { |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 DISALLOW_IMPLICIT_CONSTRUCTORS(EncodedVideoFrame); | 142 DISALLOW_IMPLICIT_CONSTRUCTORS(EncodedVideoFrame); |
| 142 }; | 143 }; |
| 143 std::deque<scoped_ptr<EncodedVideoFrame>> encoded_frames_queue_; | 144 std::deque<scoped_ptr<EncodedVideoFrame>> encoded_frames_queue_; |
| 144 | 145 |
| 145 DISALLOW_COPY_AND_ASSIGN(WebmMuxer); | 146 DISALLOW_COPY_AND_ASSIGN(WebmMuxer); |
| 146 }; | 147 }; |
| 147 | 148 |
| 148 } // namespace media | 149 } // namespace media |
| 149 | 150 |
| 150 #endif // MEDIA_MUXERS_WEBM_MUXER_H_ | 151 #endif // MEDIA_MUXERS_WEBM_MUXER_H_ |
| OLD | NEW |