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 895 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
906 } else { | 906 } else { |
907 DCHECK(!chunk_demuxer_); | 907 DCHECK(!chunk_demuxer_); |
908 DCHECK(!data_source_); | 908 DCHECK(!data_source_); |
909 | 909 |
910 mse_log_cb = base::Bind(&LogMediaSourceError, media_log_); | 910 mse_log_cb = base::Bind(&LogMediaSourceError, media_log_); |
911 | 911 |
912 chunk_demuxer_ = new ChunkDemuxer( | 912 chunk_demuxer_ = new ChunkDemuxer( |
913 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened), | 913 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened), |
914 need_key_cb, | 914 need_key_cb, |
915 mse_log_cb, | 915 mse_log_cb, |
| 916 media_log_, |
916 true); | 917 true); |
917 demuxer_.reset(chunk_demuxer_); | 918 demuxer_.reset(chunk_demuxer_); |
918 } | 919 } |
919 | 920 |
920 // ... and we're ready to go! | 921 // ... and we're ready to go! |
921 seeking_ = true; | 922 seeking_ = true; |
922 | 923 |
923 if (!renderer_) | 924 if (!renderer_) |
924 renderer_ = CreateRenderer(); | 925 renderer_ = CreateRenderer(); |
925 | 926 |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1032 compositor_task_runner_->PostTask(FROM_HERE, | 1033 compositor_task_runner_->PostTask(FROM_HERE, |
1033 base::Bind(&GetCurrentFrameAndSignal, | 1034 base::Bind(&GetCurrentFrameAndSignal, |
1034 base::Unretained(compositor_), | 1035 base::Unretained(compositor_), |
1035 &video_frame, | 1036 &video_frame, |
1036 &event)); | 1037 &event)); |
1037 event.Wait(); | 1038 event.Wait(); |
1038 return video_frame; | 1039 return video_frame; |
1039 } | 1040 } |
1040 | 1041 |
1041 } // namespace media | 1042 } // namespace media |
OLD | NEW |