Android media: VideoFrame should not store so many sync points.

content/renderer/media/webmediaplayer_impl.cc

 // Copyright 2013 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/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 100 matching lines @@
 //
 // Also our timers are not very accurate (especially for ogg), which becomes
 // evident at low speeds and on Vista. Since other speeds are risky and outside
 // the norms, we think 1/16x to 16x is a safe and useful range for now.
 const double kMinRate = 0.0625;
 const double kMaxRate = 16.0;
 
 // Prefix for histograms related to Encrypted Media Extensions.
 const char* kMediaEme = "Media.EME.";
 
+class SyncPointProviderImpl : public media::VideoFrame::SyncPointProvider {
+ public:
+  explicit SyncPointProviderImpl(
+      blink::WebGraphicsContext3D* web_graphics_context)
+      : web_graphics_context_(web_graphics_context) {}
+  virtual ~SyncPointProviderImpl();
+  virtual uint32 InsertSyncPoint();
+  virtual void WaitSyncPoint(uint32 sync_point);
+
+ private:
+  blink::WebGraphicsContext3D* web_graphics_context_;
+};
+
+SyncPointProviderImpl::~SyncPointProviderImpl() {
+}
+
+uint32 SyncPointProviderImpl::InsertSyncPoint() {
+  return web_graphics_context_->insertSyncPoint();
+}
+
+void SyncPointProviderImpl::WaitSyncPoint(uint32 sync_point) {
+  web_graphics_context_->waitSyncPoint(sync_point);
+}
+
 }  // namespace
 
 namespace content {
 
 class BufferedDataSourceHostImpl;
 
 #define COMPILE_ASSERT_MATCHING_ENUM(name) \
   COMPILE_ASSERT(static_cast<int>(WebMediaPlayer::CORSMode ## name) == \
                  static_cast<int>(BufferedResourceLoader::k ## name), \
                  mismatching_enums)
@@ skipping 510 matching lines @@
                                             type);
   web_graphics_context->pixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, false);
   web_graphics_context->pixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM,
                                     false);
 
   // Restore the state for TEXTURE_2D binding point as mentioned above.
   web_graphics_context->bindTexture(GL_TEXTURE_2D, texture);
 
   web_graphics_context->deleteTexture(source_texture);
   web_graphics_context->flush();
-  video_frame->AppendReleaseSyncPoint(web_graphics_context->insertSyncPoint());
+
+  SyncPointProviderImpl provider(web_graphics_context);
+  video_frame->UpdateReleaseSyncPoint(provider);
   return true;
 }
 
 // Helper functions to report media EME related stats to UMA. They follow the
 // convention of more commonly used macros UMA_HISTOGRAM_ENUMERATION and
 // UMA_HISTOGRAM_COUNTS. The reason that we cannot use those macros directly is
 // that UMA_* macros require the names to be constant throughout the process'
 // lifetime.
 static void EmeUMAHistogramEnumeration(const std::string& key_system,
                                        const std::string& method,
@@ skipping 685 matching lines @@
   compositor_task_runner_->PostTask(FROM_HERE,
                                     base::Bind(&GetCurrentFrameAndSignal,
                                                base::Unretained(compositor_),
                                                &video_frame,
                                                &event));
   event.Wait();
   return video_frame;
 }
 
 }  // namespace content