Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: webkit/media/android/media_source_delegate.cc

Issue 13419002: Media Source dispatches inband text tracks (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webkit/media/android/media_source_delegate.h ('k') | webkit/media/texttrack_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "webkit/media/android/media_source_delegate.h" 5 #include "webkit/media/android/media_source_delegate.h"
6 6
7 #include "base/message_loop_proxy.h" 7 #include "base/message_loop_proxy.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "media/base/android/demuxer_stream_player_params.h" 9 #include "media/base/android/demuxer_stream_player_params.h"
10 #include "media/base/bind_to_loop.h" 10 #include "media/base/bind_to_loop.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 void MediaSourceDelegate::Initialize( 93 void MediaSourceDelegate::Initialize(
94 WebKit::WebMediaSource* media_source, 94 WebKit::WebMediaSource* media_source,
95 const UpdateNetworkStateCB& update_network_state_cb) { 95 const UpdateNetworkStateCB& update_network_state_cb) {
96 DCHECK(media_source); 96 DCHECK(media_source);
97 media_source_.reset(media_source); 97 media_source_.reset(media_source);
98 update_network_state_cb_ = update_network_state_cb; 98 update_network_state_cb_ = update_network_state_cb;
99 99
100 chunk_demuxer_.reset(new media::ChunkDemuxer( 100 chunk_demuxer_.reset(new media::ChunkDemuxer(
101 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnDemuxerOpened), 101 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnDemuxerOpened),
102 BIND_TO_RENDER_LOOP_2(&MediaSourceDelegate::OnNeedKey, "", ""), 102 BIND_TO_RENDER_LOOP_2(&MediaSourceDelegate::OnNeedKey, "", ""),
103 base::Bind(&MediaSourceDelegate::OnAddTextTrack,
104 base::Unretained(this)),
103 base::Bind(&LogMediaSourceError, media_log_))); 105 base::Bind(&LogMediaSourceError, media_log_)));
104 chunk_demuxer_->Initialize(this, 106 chunk_demuxer_->Initialize(this,
105 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnDemuxerInitDone)); 107 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnDemuxerInitDone));
106 } 108 }
107 109
108 const WebKit::WebTimeRanges& MediaSourceDelegate::Buffered() { 110 const WebKit::WebTimeRanges& MediaSourceDelegate::Buffered() {
109 buffered_web_time_ranges_ = 111 buffered_web_time_ranges_ =
110 ConvertToWebTimeRanges(buffered_time_ranges_); 112 ConvertToWebTimeRanges(buffered_time_ranges_);
111 return buffered_web_time_ranges_; 113 return buffered_web_time_ranges_;
112 } 114 }
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 init_data_type_ = type; 451 init_data_type_ = type;
450 452
451 client_->keyNeeded(WebString::fromUTF8(key_system), 453 client_->keyNeeded(WebString::fromUTF8(key_system),
452 WebString::fromUTF8(session_id), 454 WebString::fromUTF8(session_id),
453 init_data.get(), 455 init_data.get(),
454 init_data_size); 456 init_data_size);
455 } 457 }
456 458
457 void MediaSourceDelegate::OnDecryptorReady(media::Decryptor* decryptor) {} 459 void MediaSourceDelegate::OnDecryptorReady(media::Decryptor* decryptor) {}
458 460
461 scoped_ptr<media::TextTrack> MediaSourceDelegate::OnAddTextTrack(
462 media::TextKind kind,
463 const std::string& label,
464 const std::string& language) {
465 return scoped_ptr<media::TextTrack>();
466 }
467
459 } // namespace webkit_media 468 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/android/media_source_delegate.h ('k') | webkit/media/texttrack_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698