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 "content/renderer/media/webmediaplayer_impl.h" | 5 #include "content/renderer/media/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> |
11 | 11 |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/callback.h" | 13 #include "base/callback.h" |
14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
15 #include "base/debug/crash_logging.h" | 15 #include "base/debug/crash_logging.h" |
16 #include "base/message_loop/message_loop_proxy.h" | 16 #include "base/message_loop/message_loop_proxy.h" |
17 #include "base/metrics/histogram.h" | 17 #include "base/metrics/histogram.h" |
18 #include "base/stl_util.h" | |
18 #include "base/strings/string_number_conversions.h" | 19 #include "base/strings/string_number_conversions.h" |
19 #include "base/synchronization/waitable_event.h" | 20 #include "base/synchronization/waitable_event.h" |
20 #include "cc/layers/video_layer.h" | 21 #include "cc/layers/video_layer.h" |
21 #include "content/public/common/content_switches.h" | 22 #include "content/public/common/content_switches.h" |
22 #include "content/renderer/media/buffered_data_source.h" | 23 #include "content/renderer/media/buffered_data_source.h" |
23 #include "content/renderer/media/crypto/key_systems.h" | 24 #include "content/renderer/media/crypto/key_systems.h" |
24 #include "content/renderer/media/texttrack_impl.h" | 25 #include "content/renderer/media/texttrack_impl.h" |
25 #include "content/renderer/media/webaudiosourceprovider_impl.h" | 26 #include "content/renderer/media/webaudiosourceprovider_impl.h" |
26 #include "content/renderer/media/webinbandtexttrack_impl.h" | 27 #include "content/renderer/media/webinbandtexttrack_impl.h" |
27 #include "content/renderer/media/webmediaplayer_delegate.h" | 28 #include "content/renderer/media/webmediaplayer_delegate.h" |
28 #include "content/renderer/media/webmediaplayer_params.h" | 29 #include "content/renderer/media/webmediaplayer_params.h" |
29 #include "content/renderer/media/webmediaplayer_util.h" | 30 #include "content/renderer/media/webmediaplayer_util.h" |
30 #include "content/renderer/media/webmediasource_impl.h" | 31 #include "content/renderer/media/webmediasource_impl.h" |
31 #include "content/renderer/pepper/pepper_webplugin_impl.h" | 32 #include "content/renderer/pepper/pepper_webplugin_impl.h" |
32 #include "gpu/GLES2/gl2extchromium.h" | 33 #include "gpu/GLES2/gl2extchromium.h" |
33 #include "media/audio/null_audio_sink.h" | 34 #include "media/audio/null_audio_sink.h" |
34 #include "media/base/bind_to_loop.h" | 35 #include "media/base/bind_to_loop.h" |
35 #include "media/base/filter_collection.h" | 36 #include "media/base/filter_collection.h" |
36 #include "media/base/limits.h" | 37 #include "media/base/limits.h" |
37 #include "media/base/media_log.h" | 38 #include "media/base/media_log.h" |
38 #include "media/base/media_switches.h" | 39 #include "media/base/media_switches.h" |
39 #include "media/base/pipeline.h" | 40 #include "media/base/pipeline.h" |
41 #include "media/base/text_buffer.h" | |
40 #include "media/base/video_frame.h" | 42 #include "media/base/video_frame.h" |
41 #include "media/filters/audio_renderer_impl.h" | 43 #include "media/filters/audio_renderer_impl.h" |
42 #include "media/filters/chunk_demuxer.h" | 44 #include "media/filters/chunk_demuxer.h" |
43 #include "media/filters/ffmpeg_audio_decoder.h" | 45 #include "media/filters/ffmpeg_audio_decoder.h" |
44 #include "media/filters/ffmpeg_demuxer.h" | 46 #include "media/filters/ffmpeg_demuxer.h" |
47 #include "media/filters/ffmpeg_text_decoder.h" | |
45 #include "media/filters/ffmpeg_video_decoder.h" | 48 #include "media/filters/ffmpeg_video_decoder.h" |
46 #include "media/filters/gpu_video_accelerator_factories.h" | 49 #include "media/filters/gpu_video_accelerator_factories.h" |
47 #include "media/filters/gpu_video_decoder.h" | 50 #include "media/filters/gpu_video_decoder.h" |
48 #include "media/filters/opus_audio_decoder.h" | 51 #include "media/filters/opus_audio_decoder.h" |
52 #include "media/filters/text_renderer_impl.h" | |
49 #include "media/filters/video_renderer_base.h" | 53 #include "media/filters/video_renderer_base.h" |
50 #include "media/filters/vpx_video_decoder.h" | 54 #include "media/filters/vpx_video_decoder.h" |
51 #include "third_party/WebKit/public/platform/WebMediaSource.h" | 55 #include "third_party/WebKit/public/platform/WebMediaSource.h" |
52 #include "third_party/WebKit/public/platform/WebRect.h" | 56 #include "third_party/WebKit/public/platform/WebRect.h" |
53 #include "third_party/WebKit/public/platform/WebSize.h" | 57 #include "third_party/WebKit/public/platform/WebSize.h" |
54 #include "third_party/WebKit/public/platform/WebString.h" | 58 #include "third_party/WebKit/public/platform/WebString.h" |
55 #include "third_party/WebKit/public/platform/WebURL.h" | 59 #include "third_party/WebKit/public/platform/WebURL.h" |
56 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" | 60 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" |
57 #include "third_party/WebKit/public/web/WebView.h" | 61 #include "third_party/WebKit/public/web/WebView.h" |
58 #include "v8/include/v8.h" | 62 #include "v8/include/v8.h" |
(...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
953 const WebKit::WebString weblanguage = WebKit::WebString::fromUTF8(language); | 957 const WebKit::WebString weblanguage = WebKit::WebString::fromUTF8(language); |
954 | 958 |
955 WebInbandTextTrackImpl* const text_track = | 959 WebInbandTextTrackImpl* const text_track = |
956 new WebInbandTextTrackImpl(webkind, weblabel, weblanguage, | 960 new WebInbandTextTrackImpl(webkind, weblabel, weblanguage, |
957 text_track_index_++); | 961 text_track_index_++); |
958 | 962 |
959 return scoped_ptr<media::TextTrack>(new TextTrackImpl(GetClient(), | 963 return scoped_ptr<media::TextTrack>(new TextTrackImpl(GetClient(), |
960 text_track)); | 964 text_track)); |
961 } | 965 } |
962 | 966 |
967 void WebMediaPlayerImpl::OnFFmpegTextTrack(media::TextKind kind, | |
968 const std::string& label, | |
969 const std::string& language, | |
970 int index) { | |
971 DCHECK(main_loop_->BelongsToCurrentThread()); | |
972 if (ffmpeg_text_track_map_.find(index) == ffmpeg_text_track_map_.end()) { | |
acolwell GONE FROM CHROMIUM
2013/09/12 00:15:15
nit: It seems like we should DCHECK instead. It wo
Matthew Heaney (Chromium)
2013/09/13 19:51:54
Done.
| |
973 scoped_ptr<media::TextTrack> text_track = | |
974 OnTextTrack(kind, label, language); | |
975 ffmpeg_text_track_map_.insert(std::make_pair(index, text_track.release())); | |
976 } | |
977 } | |
978 | |
963 void WebMediaPlayerImpl::OnKeyError(const std::string& session_id, | 979 void WebMediaPlayerImpl::OnKeyError(const std::string& session_id, |
964 media::MediaKeys::KeyError error_code, | 980 media::MediaKeys::KeyError error_code, |
965 int system_code) { | 981 int system_code) { |
966 DCHECK(main_loop_->BelongsToCurrentThread()); | 982 DCHECK(main_loop_->BelongsToCurrentThread()); |
967 | 983 |
968 EmeUMAHistogramEnumeration(current_key_system_, "KeyError", | 984 EmeUMAHistogramEnumeration(current_key_system_, "KeyError", |
969 error_code, media::MediaKeys::kMaxKeyError); | 985 error_code, media::MediaKeys::kMaxKeyError); |
970 | 986 |
971 GetClient()->keyError( | 987 GetClient()->keyError( |
972 current_key_system_, | 988 current_key_system_, |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1026 | 1042 |
1027 // Keep track if this is a MSE or non-MSE playback. | 1043 // Keep track if this is a MSE or non-MSE playback. |
1028 UMA_HISTOGRAM_BOOLEAN("Media.MSE.Playback", | 1044 UMA_HISTOGRAM_BOOLEAN("Media.MSE.Playback", |
1029 (load_type_ == LoadTypeMediaSource)); | 1045 (load_type_ == LoadTypeMediaSource)); |
1030 | 1046 |
1031 // Figure out which demuxer to use. | 1047 // Figure out which demuxer to use. |
1032 if (load_type_ != LoadTypeMediaSource) { | 1048 if (load_type_ != LoadTypeMediaSource) { |
1033 DCHECK(!chunk_demuxer_); | 1049 DCHECK(!chunk_demuxer_); |
1034 DCHECK(data_source_); | 1050 DCHECK(data_source_); |
1035 | 1051 |
1052 media::FFmpegAddTextTrackCB add_text_track_cb; | |
1053 | |
1054 if (cmd_line->HasSwitch(switches::kEnableInbandTextTracks)) { | |
1055 add_text_track_cb = | |
1056 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnFFmpegTextTrack); | |
1057 } | |
1058 | |
1036 demuxer_.reset(new media::FFmpegDemuxer( | 1059 demuxer_.reset(new media::FFmpegDemuxer( |
1037 media_loop_, data_source_.get(), | 1060 media_loop_, data_source_.get(), |
1038 BIND_TO_RENDER_LOOP_1(&WebMediaPlayerImpl::OnNeedKey, ""), | 1061 BIND_TO_RENDER_LOOP_1(&WebMediaPlayerImpl::OnNeedKey, ""), |
1062 add_text_track_cb, | |
acolwell GONE FROM CHROMIUM
2013/09/12 00:15:15
This doesn't seem right to me. It seems like Demux
Matthew Heaney (Chromium)
2013/09/13 19:51:54
OK, just to make sure I understand. The FFmpegDem
acolwell GONE FROM CHROMIUM
2013/09/13 20:57:30
Yes. The demuxers already hold a reference to the
Matthew Heaney (Chromium)
2013/09/20 23:53:54
The ffmpeg demuxer now forwards the AddTextStream
| |
1039 media_log_)); | 1063 media_log_)); |
1040 } else { | 1064 } else { |
1041 DCHECK(!chunk_demuxer_); | 1065 DCHECK(!chunk_demuxer_); |
1042 DCHECK(!data_source_); | 1066 DCHECK(!data_source_); |
1043 | 1067 |
1044 media::AddTextTrackCB add_text_track_cb; | 1068 media::AddTextTrackCB add_text_track_cb; |
1045 | 1069 |
1046 if (cmd_line->HasSwitch(switches::kEnableInbandTextTracks)) { | 1070 if (cmd_line->HasSwitch(switches::kEnableInbandTextTracks)) { |
1047 add_text_track_cb = | 1071 add_text_track_cb = |
1048 base::Bind(&WebMediaPlayerImpl::OnTextTrack, base::Unretained(this)); | 1072 base::Bind(&WebMediaPlayerImpl::OnTextTrack, base::Unretained(this)); |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1114 scoped_ptr<media::VideoRenderer> video_renderer( | 1138 scoped_ptr<media::VideoRenderer> video_renderer( |
1115 new media::VideoRendererBase( | 1139 new media::VideoRendererBase( |
1116 media_loop_, | 1140 media_loop_, |
1117 video_decoders.Pass(), | 1141 video_decoders.Pass(), |
1118 set_decryptor_ready_cb, | 1142 set_decryptor_ready_cb, |
1119 base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)), | 1143 base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)), |
1120 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque), | 1144 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque), |
1121 true)); | 1145 true)); |
1122 filter_collection->SetVideoRenderer(video_renderer.Pass()); | 1146 filter_collection->SetVideoRenderer(video_renderer.Pass()); |
1123 | 1147 |
1148 if (load_type_ != LoadTypeMediaSource && | |
acolwell GONE FROM CHROMIUM
2013/09/12 00:15:15
This should be load_type_ independent. ChunkDemuxe
Matthew Heaney (Chromium)
2013/09/13 19:51:54
Agreed. I figure I can make changes to DemuxerHos
| |
1149 cmd_line->HasSwitch(switches::kEnableInbandTextTracks)) { | |
1150 scoped_ptr<media::TextDecoder> text_decoder( | |
1151 new media::FFmpegTextDecoder(media_loop_)); | |
1152 | |
1153 scoped_ptr<media::TextRenderer> text_renderer( | |
1154 new media::TextRendererImpl( | |
1155 media_loop_, | |
1156 text_decoder.Pass(), | |
1157 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::CueReady))); | |
1158 filter_collection->SetTextRenderer(text_renderer.Pass()); | |
1159 } | |
1160 | |
1124 // ... and we're ready to go! | 1161 // ... and we're ready to go! |
1125 starting_ = true; | 1162 starting_ = true; |
1126 pipeline_->Start( | 1163 pipeline_->Start( |
1127 filter_collection.Pass(), | 1164 filter_collection.Pass(), |
1128 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineEnded), | 1165 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineEnded), |
1129 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineError), | 1166 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineError), |
1130 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineSeek), | 1167 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineSeek), |
1131 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineBufferingState), | 1168 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineBufferingState), |
1132 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDurationChange)); | 1169 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDurationChange)); |
1133 } | 1170 } |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1180 // Let V8 know we are not using extra resources anymore. | 1217 // Let V8 know we are not using extra resources anymore. |
1181 if (incremented_externally_allocated_memory_) { | 1218 if (incremented_externally_allocated_memory_) { |
1182 v8::V8::AdjustAmountOfExternalAllocatedMemory(-kPlayerExtraMemory); | 1219 v8::V8::AdjustAmountOfExternalAllocatedMemory(-kPlayerExtraMemory); |
1183 incremented_externally_allocated_memory_ = false; | 1220 incremented_externally_allocated_memory_ = false; |
1184 } | 1221 } |
1185 | 1222 |
1186 // Release any final references now that everything has stopped. | 1223 // Release any final references now that everything has stopped. |
1187 pipeline_.reset(); | 1224 pipeline_.reset(); |
1188 demuxer_.reset(); | 1225 demuxer_.reset(); |
1189 data_source_.reset(); | 1226 data_source_.reset(); |
1227 | |
1228 STLDeleteValues(&ffmpeg_text_track_map_); | |
1190 } | 1229 } |
1191 | 1230 |
1192 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { | 1231 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { |
1193 DCHECK(main_loop_->BelongsToCurrentThread()); | 1232 DCHECK(main_loop_->BelongsToCurrentThread()); |
1194 DCHECK(client_); | 1233 DCHECK(client_); |
1195 return client_; | 1234 return client_; |
1196 } | 1235 } |
1197 | 1236 |
1198 WebKit::WebAudioSourceProvider* WebMediaPlayerImpl::audioSourceProvider() { | 1237 WebKit::WebAudioSourceProvider* WebMediaPlayerImpl::audioSourceProvider() { |
1199 return audio_source_provider_.get(); | 1238 return audio_source_provider_.get(); |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1236 current_frame_ = frame; | 1275 current_frame_ = frame; |
1237 | 1276 |
1238 if (pending_repaint_) | 1277 if (pending_repaint_) |
1239 return; | 1278 return; |
1240 | 1279 |
1241 pending_repaint_ = true; | 1280 pending_repaint_ = true; |
1242 main_loop_->PostTask(FROM_HERE, base::Bind( | 1281 main_loop_->PostTask(FROM_HERE, base::Bind( |
1243 &WebMediaPlayerImpl::Repaint, AsWeakPtr())); | 1282 &WebMediaPlayerImpl::Repaint, AsWeakPtr())); |
1244 } | 1283 } |
1245 | 1284 |
1285 void WebMediaPlayerImpl::CueReady( | |
1286 int index, | |
1287 const scoped_refptr<media::TextBuffer>& buf) { | |
1288 DCHECK(main_loop_->BelongsToCurrentThread()); | |
1289 | |
1290 if (buf == NULL || buf->text().empty()) | |
acolwell GONE FROM CHROMIUM
2013/09/12 00:15:15
nit: These should be DCHECKS.
Matthew Heaney (Chromium)
2013/09/13 19:51:54
Done.
| |
1291 return; | |
1292 | |
1293 TextTrackMap::iterator it = ffmpeg_text_track_map_.find(index); | |
acolwell GONE FROM CHROMIUM
2013/09/12 00:15:15
The TextRenderer seems like a better home for this
Matthew Heaney (Chromium)
2013/09/13 19:51:54
Agreed. I think this will go away once I make the
Matthew Heaney (Chromium)
2013/09/20 23:53:54
Actually, I had to leave this here, so that it cou
| |
1294 if (it == ffmpeg_text_track_map_.end()) | |
acolwell GONE FROM CHROMIUM
2013/09/12 00:15:15
nit: Shouldn't this be a DCHECK? It seems like thi
Matthew Heaney (Chromium)
2013/09/13 19:51:54
Done.
| |
1295 return; | |
1296 | |
1297 media::TextTrack* track = it->second; | |
1298 base::TimeDelta start = buf->timestamp(); | |
1299 base::TimeDelta end = start + buf->duration(); | |
1300 | |
1301 track->addWebVTTCue(start, end, | |
1302 buf->id(), buf->text(), buf->settings()); | |
1303 } | |
1304 | |
1246 } // namespace content | 1305 } // namespace content |
OLD | NEW |