| Index: content/common/gpu/media/android_copying_backing_strategy.cc
|
| diff --git a/content/common/gpu/media/android_copying_backing_strategy.cc b/content/common/gpu/media/android_copying_backing_strategy.cc
|
| index 912ba4534f331e1eba97954ea9674c45f7283769..30e4bc1aa20798bd78fcc59c9a77a343a063151f 100644
|
| --- a/content/common/gpu/media/android_copying_backing_strategy.cc
|
| +++ b/content/common/gpu/media/android_copying_backing_strategy.cc
|
| @@ -17,13 +17,6 @@
|
|
|
| namespace content {
|
|
|
| -// TODO(liberato): It is unclear if we have an issue with deadlock during
|
| -// playback if we lower this. Previously (crbug.com/176036), a deadlock
|
| -// could occur during preroll. More recent tests have shown some
|
| -// instability with kNumPictureBuffers==2 with similar symptoms
|
| -// during playback. crbug.com/:531588 .
|
| -enum { kNumPictureBuffers = media::limits::kMaxVideoFrames + 1 };
|
| -
|
| const static GLfloat kIdentityMatrix[16] = {1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f,
|
| 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f,
|
| 0.0f, 0.0f, 0.0f, 1.0f};
|
| @@ -48,10 +41,6 @@ void AndroidCopyingBackingStrategy::Cleanup(
|
| glDeleteTextures(1, &surface_texture_id_);
|
| }
|
|
|
| -uint32 AndroidCopyingBackingStrategy::GetNumPictureBuffers() const {
|
| - return kNumPictureBuffers;
|
| -}
|
| -
|
| uint32 AndroidCopyingBackingStrategy::GetTextureTarget() const {
|
| return GL_TEXTURE_2D;
|
| }
|
|
|