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

Side by Side Diff: webkit/media/webmediaplayer_impl.h

Issue 10161017: Revert 133335 - Update MediaSource API implementation to match v0.4 spec. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | « media/filters/pipeline_integration_test.cc ('k') | webkit/media/webmediaplayer_impl.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player. 5 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
6 // It contains Pipeline which is the actual media player pipeline, it glues 6 // It contains Pipeline which is the actual media player pipeline, it glues
7 // the media player pipeline, data source, audio renderer and renderer. 7 // the media player pipeline, data source, audio renderer and renderer.
8 // Pipeline would creates multiple threads and access some public methods 8 // Pipeline would creates multiple threads and access some public methods
9 // of this class, so we need to be extra careful about concurrent access of 9 // of this class, so we need to be extra careful about concurrent access of
10 // methods and members. 10 // methods and members.
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 virtual unsigned decodedFrameCount() const; 174 virtual unsigned decodedFrameCount() const;
175 virtual unsigned droppedFrameCount() const; 175 virtual unsigned droppedFrameCount() const;
176 virtual unsigned audioDecodedByteCount() const; 176 virtual unsigned audioDecodedByteCount() const;
177 virtual unsigned videoDecodedByteCount() const; 177 virtual unsigned videoDecodedByteCount() const;
178 178
179 virtual WebKit::WebVideoFrame* getCurrentFrame(); 179 virtual WebKit::WebVideoFrame* getCurrentFrame();
180 virtual void putCurrentFrame(WebKit::WebVideoFrame* web_video_frame); 180 virtual void putCurrentFrame(WebKit::WebVideoFrame* web_video_frame);
181 181
182 virtual WebKit::WebAudioSourceProvider* audioSourceProvider(); 182 virtual WebKit::WebAudioSourceProvider* audioSourceProvider();
183 183
184 virtual AddIdStatus sourceAddId(const WebKit::WebString& id,
185 const WebKit::WebString& type);
186 virtual bool sourceRemoveId(const WebKit::WebString& id);
187 // TODO(acolwell): Remove non-id version when http://webk.it/83788 fix lands.
188 virtual bool sourceAppend(const unsigned char* data, unsigned length); 184 virtual bool sourceAppend(const unsigned char* data, unsigned length);
189 virtual bool sourceAppend(const WebKit::WebString& id,
190 const unsigned char* data,
191 unsigned length);
192 virtual void sourceEndOfStream(EndOfStreamStatus status); 185 virtual void sourceEndOfStream(EndOfStreamStatus status);
193 186
194 virtual MediaKeyException generateKeyRequest( 187 virtual MediaKeyException generateKeyRequest(
195 const WebKit::WebString& key_system, 188 const WebKit::WebString& key_system,
196 const unsigned char* init_data, 189 const unsigned char* init_data,
197 unsigned init_data_length); 190 unsigned init_data_length);
198 191
199 virtual MediaKeyException addKey(const WebKit::WebString& key_system, 192 virtual MediaKeyException addKey(const WebKit::WebString& key_system,
200 const unsigned char* key, 193 const unsigned char* key,
201 unsigned key_length, 194 unsigned key_length,
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 bool incremented_externally_allocated_memory_; 307 bool incremented_externally_allocated_memory_;
315 308
316 WebKit::WebAudioSourceProvider* audio_source_provider_; 309 WebKit::WebAudioSourceProvider* audio_source_provider_;
317 310
318 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 311 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
319 }; 312 };
320 313
321 } // namespace webkit_media 314 } // namespace webkit_media
322 315
323 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 316 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « media/filters/pipeline_integration_test.cc ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698