| 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> |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 | 89 |
| 90 // Helper to simplify saving frames. | 90 // Helper to simplify saving frames. |
| 91 void AddFrame(scoped_ptr<std::string> encoded_data, | 91 void AddFrame(scoped_ptr<std::string> encoded_data, |
| 92 uint8_t track_index, | 92 uint8_t track_index, |
| 93 base::TimeDelta timestamp, | 93 base::TimeDelta timestamp, |
| 94 bool is_key_frame); | 94 bool is_key_frame); |
| 95 | 95 |
| 96 // Used to DCHECK that we are called on the correct thread. | 96 // Used to DCHECK that we are called on the correct thread. |
| 97 base::ThreadChecker thread_checker_; | 97 base::ThreadChecker thread_checker_; |
| 98 | 98 |
| 99 // Video Codec configured: VP9 if true, otherwise VP8 is used by default. | 99 // Video Codec configured on construction. |
| 100 const bool use_vp9_; | 100 const VideoCodec codec_; |
| 101 | 101 |
| 102 // Caller-side identifiers to interact with |segment_|, initialised upon | 102 // Caller-side identifiers to interact with |segment_|, initialised upon |
| 103 // first frame arrival to Add{Video, Audio}Track(). | 103 // first frame arrival to Add{Video, Audio}Track(). |
| 104 uint8_t video_track_index_; | 104 uint8_t video_track_index_; |
| 105 uint8_t audio_track_index_; | 105 uint8_t audio_track_index_; |
| 106 | 106 |
| 107 // Origin of times for frame timestamps. | 107 // Origin of times for frame timestamps. |
| 108 base::TimeTicks first_frame_timestamp_video_; | 108 base::TimeTicks first_frame_timestamp_video_; |
| 109 base::TimeTicks first_frame_timestamp_audio_; | 109 base::TimeTicks first_frame_timestamp_audio_; |
| 110 base::TimeDelta most_recent_timestamp_; | 110 base::TimeDelta most_recent_timestamp_; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 DISALLOW_IMPLICIT_CONSTRUCTORS(EncodedVideoFrame); | 143 DISALLOW_IMPLICIT_CONSTRUCTORS(EncodedVideoFrame); |
| 144 }; | 144 }; |
| 145 std::deque<scoped_ptr<EncodedVideoFrame>> encoded_frames_queue_; | 145 std::deque<scoped_ptr<EncodedVideoFrame>> encoded_frames_queue_; |
| 146 | 146 |
| 147 DISALLOW_COPY_AND_ASSIGN(WebmMuxer); | 147 DISALLOW_COPY_AND_ASSIGN(WebmMuxer); |
| 148 }; | 148 }; |
| 149 | 149 |
| 150 } // namespace media | 150 } // namespace media |
| 151 | 151 |
| 152 #endif // MEDIA_MUXERS_WEBM_MUXER_H_ | 152 #endif // MEDIA_MUXERS_WEBM_MUXER_H_ |
| OLD | NEW |