| Index: media/muxers/webm_muxer.h
|
| diff --git a/media/muxers/webm_muxer.h b/media/muxers/webm_muxer.h
|
| index 47141844978f5697cf8037cbd4b2ede9d3360f27..016f484e2503c4eb9b5c98bff611464417d0cbce 100644
|
| --- a/media/muxers/webm_muxer.h
|
| +++ b/media/muxers/webm_muxer.h
|
| @@ -89,7 +89,7 @@ class MEDIA_EXPORT WebmMuxer : public NON_EXPORTED_BASE(mkvmuxer::IMkvWriter) {
|
| // Helper to simplify saving frames.
|
| void AddFrame(scoped_ptr<std::string> encoded_data,
|
| uint8_t track_index,
|
| - base::TimeTicks timestamp,
|
| + base::TimeDelta timestamp,
|
| bool is_key_frame);
|
|
|
| // Used to DCHECK that we are called on the correct thread.
|
| @@ -104,7 +104,8 @@ class MEDIA_EXPORT WebmMuxer : public NON_EXPORTED_BASE(mkvmuxer::IMkvWriter) {
|
| uint8_t audio_track_index_;
|
|
|
| // Origin of times for frame timestamps.
|
| - base::TimeTicks first_frame_timestamp_;
|
| + base::TimeTicks first_frame_timestamp_video_;
|
| + base::TimeTicks first_frame_timestamp_audio_;
|
| base::TimeDelta most_recent_timestamp_;
|
|
|
| // Variables to measure and accumulate, respectively, the time in pause state.
|
|
|