webkit/media/android/media_source_delegate.cc - Issue 15937016: Update refernces to Blink's Platform API (webkit)

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 15937016: Update refernces to Blink's Platform API (webkit) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « webkit/media/android/audio_decoder_android.cc ('k') | webkit/media/android/webmediaplayer_android.h » ('j') | no next file with comments »

OLD	NEW
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"

11 #include "media/base/demuxer_stream.h"	11 #include "media/base/demuxer_stream.h"

12 #include "media/base/media_log.h"	12 #include "media/base/media_log.h"

13 #include "media/filters/chunk_demuxer.h"	13 #include "media/filters/chunk_demuxer.h"

14 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"	14 #include "third_party/WebKit/public/platform/WebString.h"

15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"	15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"

16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h"	16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h"

17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"	17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"

18 #include "webkit/media/android/webmediaplayer_proxy_android.h"	18 #include "webkit/media/android/webmediaplayer_proxy_android.h"

19 #include "webkit/media/crypto/key_systems.h"	19 #include "webkit/media/crypto/key_systems.h"

20 #include "webkit/media/crypto/proxy_decryptor.h"	20 #include "webkit/media/crypto/proxy_decryptor.h"

21 #include "webkit/media/webmediaplayer_util.h"	21 #include "webkit/media/webmediaplayer_util.h"

22 #include "webkit/media/webmediasourceclient_impl.h"	22 #include "webkit/media/webmediasourceclient_impl.h"

23	23

24 using media::DemuxerStream;	24 using media::DemuxerStream;

(...skipping 480 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
505 void MediaSourceDelegate::OnDecryptorReady(media::Decryptor* decryptor) {}	505 void MediaSourceDelegate::OnDecryptorReady(media::Decryptor* decryptor) {}

506	506

507 scoped_ptr<media::TextTrack> MediaSourceDelegate::OnAddTextTrack(	507 scoped_ptr<media::TextTrack> MediaSourceDelegate::OnAddTextTrack(

508 media::TextKind kind,	508 media::TextKind kind,

509 const std::string& label,	509 const std::string& label,

510 const std::string& language) {	510 const std::string& language) {

511 return scoped_ptr<media::TextTrack>();	511 return scoped_ptr<media::TextTrack>();

512 }	512 }

513	513

514 } // namespace webkit_media	514 } // namespace webkit_media

OLD	NEW