Make Android StreamTexture implement GLStreamTextureImage

content/renderer/media/android/stream_texture_factory_synchronous_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/android/stream_texture_factory_synchronous_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 36 matching lines @@
   // Protects access to |client_| and |loop_|.
   base::Lock lock_;
   cc::VideoFrameProvider::Client* client_;
   scoped_refptr<base::SingleThreadTaskRunner> loop_;
 
   // Accessed on the |loop_| thread only.
   base::Closure callback_;
   scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider>
       context_provider_;
   scoped_refptr<gfx::SurfaceTexture> surface_texture_;
-  float current_matrix_[16];
-  bool has_updated_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StreamTextureProxyImpl);
 };
 
 StreamTextureProxyImpl::StreamTextureProxyImpl(
     StreamTextureFactorySynchronousImpl::ContextProvider* provider)
-    : client_(NULL), context_provider_(provider), has_updated_(false) {
-  std::fill(current_matrix_, current_matrix_ + 16, 0);
+    : client_(NULL), context_provider_(provider) {
 }
 
 StreamTextureProxyImpl::~StreamTextureProxyImpl() {}
 
 void StreamTextureProxyImpl::Release() {
   {
     // Cannot call into |client_| anymore (from any thread) after returning
     // from here.
     base::AutoLock lock(lock_);
     client_ = NULL;
@@ skipping 38 matching lines @@
     LOG(ERROR) << "Failed to get SurfaceTexture for stream.";
     return;
   }
 
   callback_ =
       base::Bind(&StreamTextureProxyImpl::OnFrameAvailable, AsWeakPtr());
   surface_texture_->SetFrameAvailableCallback(callback_);
 }
 
 void StreamTextureProxyImpl::OnFrameAvailable() {
-  // GetTransformMatrix only returns something valid after both is true:
-  // - OnFrameAvailable was called
-  // - we called UpdateTexImage
-  if (has_updated_) {
-    float matrix[16];
-    surface_texture_->GetTransformMatrix(matrix);
-
-    if (memcmp(current_matrix_, matrix, sizeof(matrix)) != 0) {
-      memcpy(current_matrix_, matrix, sizeof(matrix));
-
-      base::AutoLock lock(lock_);
-      if (client_)
-        client_->DidUpdateMatrix(current_matrix_);
-    }
-  }
-  // OnFrameAvailable being called a second time implies that we called
-  // updateTexImage since after we received the first frame.
-  has_updated_ = true;
-
   base::AutoLock lock(lock_);
   if (client_)
     client_->DidReceiveFrame();
 }
 
 }  // namespace
 
 // static
 scoped_refptr<StreamTextureFactorySynchronousImpl>
 StreamTextureFactorySynchronousImpl::Create(
@@ skipping 69 matching lines @@
 
 void StreamTextureFactorySynchronousImpl::RemoveObserver(
     StreamTextureFactoryContextObserver* obs) {
   DCHECK(observers_.find(obs) != observers_.end());
   observers_.erase(obs);
   if (context_provider_.get())
     context_provider_->RemoveObserver(obs);
 }
 
 }  // namespace content