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

Unified Diff: webkit/media/webmediaplayer_impl.cc

Issue 12902002: Remove WebVideoFrame, WebVideoFrameProvider, and WebVideoLayer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just removing code Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/media/webmediaplayer_impl.h ('k') | webkit/media/webmediaplayer_ms.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/webmediaplayer_impl.cc
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 37af4aaafb512d68d0aaa4cef6fdc49f457c8387..0b7698508366aa5fcba92aa04c423e25fa59e0ee 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -43,7 +43,6 @@
#include "webkit/media/webmediaplayer_params.h"
#include "webkit/media/webmediaplayer_util.h"
#include "webkit/media/webmediasourceclient_impl.h"
-#include "webkit/media/webvideoframe_impl.h"
#include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
using WebKit::WebCanvas;
@@ -219,10 +218,8 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
}
WebMediaPlayerImpl::~WebMediaPlayerImpl() {
-#ifdef REMOVE_WEBVIDEOFRAME
SetVideoFrameProviderClient(NULL);
GetClient()->setWebLayer(NULL);
-#endif
DCHECK(main_loop_->BelongsToCurrentThread());
Destroy();
@@ -669,24 +666,6 @@ unsigned WebMediaPlayerImpl::videoDecodedByteCount() const {
return stats.video_bytes_decoded;
}
-#ifndef REMOVE_WEBVIDEOFRAME
-WebKit::WebVideoFrame* WebMediaPlayerImpl::getCurrentFrame() {
- base::AutoLock auto_lock(lock_);
- if (current_frame_)
- return new WebVideoFrameImpl(current_frame_);
- return NULL;
-}
-
-void WebMediaPlayerImpl::putCurrentFrame(
- WebKit::WebVideoFrame* web_video_frame) {
- if (!accelerated_compositing_reported_) {
- accelerated_compositing_reported_ = true;
- DCHECK(frame_->view()->isAcceleratedCompositingActive());
- UMA_HISTOGRAM_BOOLEAN("Media.AcceleratedCompositingActive", true);
- }
- delete web_video_frame;
-}
-#else
void WebMediaPlayerImpl::SetVideoFrameProviderClient(
cc::VideoFrameProvider::Client* client) {
// This is called from both the main renderer thread and the compositor
@@ -709,7 +688,6 @@ void WebMediaPlayerImpl::PutCurrentFrame(
UMA_HISTOGRAM_BOOLEAN("Media.AcceleratedCompositingActive", true);
}
}
-#endif
bool WebMediaPlayerImpl::copyVideoTextureToPlatformTexture(
WebKit::WebGraphicsContext3D* web_graphics_context,
@@ -1001,14 +979,12 @@ void WebMediaPlayerImpl::OnPipelineBufferingState(
case media::Pipeline::kHaveMetadata:
SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata);
-#ifdef REMOVE_WEBVIDEOFRAME
if (hasVideo() && GetClient()->needsWebLayerForVideo()) {
DCHECK(!video_weblayer_);
video_weblayer_.reset(
new webkit::WebLayerImpl(cc::VideoLayer::Create(this)));
GetClient()->setWebLayer(video_weblayer_.get());
}
-#endif
break;
case media::Pipeline::kPrerollCompleted:
SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);
@@ -1161,13 +1137,6 @@ void WebMediaPlayerImpl::SetReadyState(WebMediaPlayer::ReadyState state) {
DCHECK(main_loop_->BelongsToCurrentThread());
DVLOG(1) << "SetReadyState: " << state;
-#ifndef REMOVE_WEBVIDEOFRAME
- if (ready_state_ == WebMediaPlayer::ReadyStateHaveNothing &&
- state >= WebMediaPlayer::ReadyStateHaveMetadata) {
- if (!hasVideo())
- GetClient()->disableAcceleratedCompositing();
- } else
-#endif
if (state == WebMediaPlayer::ReadyStateHaveEnoughData &&
is_local_source_ &&
network_state_ == WebMediaPlayer::NetworkStateLoading)
« no previous file with comments | « webkit/media/webmediaplayer_impl.h ('k') | webkit/media/webmediaplayer_ms.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698