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

Unified Diff: content/common/gpu/media/gpu_video_decode_accelerator.cc

Issue 1490333005: Don't require VDAs to return all PictureBuffers at once. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
Index: content/common/gpu/media/gpu_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc
index ed4d1799a300409632e35d1f38635e63c6c06be2..8b26bd65d5a301752e1d55a6753dfb642666ddf0 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
@@ -46,8 +46,6 @@
#elif defined(USE_OZONE)
#include "media/ozone/media_ozone_platform.h"
#elif defined(OS_ANDROID)
-#include "content/common/gpu/media/android_copying_backing_strategy.h"
-#include "content/common/gpu/media/android_deferred_rendering_backing_strategy.h"
#include "content/common/gpu/media/android_video_decode_accelerator.h"
#endif
@@ -472,15 +470,8 @@ scoped_ptr<media::VideoDecodeAccelerator>
GpuVideoDecodeAccelerator::CreateAndroidVDA() {
scoped_ptr<media::VideoDecodeAccelerator> decoder;
#if defined(OS_ANDROID)
- decoder.reset(new AndroidVideoDecodeAccelerator(
- stub_->decoder()->AsWeakPtr(), make_context_current_,
- make_scoped_ptr(
-#if defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
- new AndroidDeferredRenderingBackingStrategy()
-#else
- new AndroidCopyingBackingStrategy()
-#endif
- )));
+ decoder.reset(new AndroidVideoDecodeAccelerator(stub_->decoder()->AsWeakPtr(),
+ make_context_current_));
#endif
return decoder.Pass();
}

Powered by Google App Engine
This is Rietveld 408576698