OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "media/blink/webmediaplayer_impl.h" | 5 #include "media/blink/webmediaplayer_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
944 encrypted_media_init_data_cb, media_log_)); | 944 encrypted_media_init_data_cb, media_log_)); |
945 } else { | 945 } else { |
946 DCHECK(!chunk_demuxer_); | 946 DCHECK(!chunk_demuxer_); |
947 DCHECK(!data_source_); | 947 DCHECK(!data_source_); |
948 | 948 |
949 mse_log_cb = base::Bind(&LogMediaSourceError, media_log_); | 949 mse_log_cb = base::Bind(&LogMediaSourceError, media_log_); |
950 | 950 |
951 chunk_demuxer_ = new ChunkDemuxer( | 951 chunk_demuxer_ = new ChunkDemuxer( |
952 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened), | 952 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened), |
953 encrypted_media_init_data_cb, mse_log_cb, media_log_, true); | 953 encrypted_media_init_data_cb, mse_log_cb, media_log_, true); |
| 954 chunk_demuxer_->SetMediaTimeProvider( |
| 955 base::Bind(&media::Pipeline::GetMediaTime, |
| 956 base::Unretained(&pipeline_))); |
954 demuxer_.reset(chunk_demuxer_); | 957 demuxer_.reset(chunk_demuxer_); |
955 } | 958 } |
956 | 959 |
957 // ... and we're ready to go! | 960 // ... and we're ready to go! |
958 seeking_ = true; | 961 seeking_ = true; |
959 | 962 |
960 if (!renderer_) | 963 if (!renderer_) |
961 renderer_ = CreateRenderer(); | 964 renderer_ = CreateRenderer(); |
962 | 965 |
963 pipeline_.Start( | 966 pipeline_.Start( |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1069 compositor_task_runner_->PostTask(FROM_HERE, | 1072 compositor_task_runner_->PostTask(FROM_HERE, |
1070 base::Bind(&GetCurrentFrameAndSignal, | 1073 base::Bind(&GetCurrentFrameAndSignal, |
1071 base::Unretained(compositor_), | 1074 base::Unretained(compositor_), |
1072 &video_frame, | 1075 &video_frame, |
1073 &event)); | 1076 &event)); |
1074 event.Wait(); | 1077 event.Wait(); |
1075 return video_frame; | 1078 return video_frame; |
1076 } | 1079 } |
1077 | 1080 |
1078 } // namespace media | 1081 } // namespace media |
OLD | NEW |