Pause EME player whose external surface is stolen by another player

android_webview/native/external_video_surface_container_impl.h

 // 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.
 
 #ifndef ANDROID_WEBVIEW_NATIVE_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_
 #define ANDROID_WEBVIEW_NATIVE_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "content/public/browser/android/external_video_surface_container.h"
 
 namespace android_webview {
 
 class ExternalVideoSurfaceContainerImpl
     : public content::ExternalVideoSurfaceContainer {
  public:
   typedef base::Callback<void(int, jobject)> SurfaceCreatedCB;
   typedef base::Callback<void(int)> SurfaceDestroyedCB;
 
   ExternalVideoSurfaceContainerImpl(content::WebContents* contents);
 
   // ExternalVideoSurfaceContainer implementation.
   virtual void RequestExternalVideoSurface(
       int player_id,
       const SurfaceCreatedCB& surface_created_cb,
       const SurfaceDestroyedCB& surface_destroyed_cb) override;
+  virtual int GetCurrentPlayerId() override;
   virtual void ReleaseExternalVideoSurface(int player_id) override;
+  virtual void ReleaseCurrentExternalVideoSurface() override;

[boliu, 2014/12/04 23:33:26]

Is this always the same as ReleaseExternalVideoSurface(GetCurrentPlayerId())?

Can we just do that from content instead of adding a new method?

[Hugo Holgersson, 2014/12/08 16:41:08]

Yes. That is true. Actually, ReleaseCurrentExternalVideoSurface() is just a
helper. Since it is not really needed for this bugfix I removed it from this CL.
Done.

   virtual void OnFrameInfoUpdated() override;
   virtual void OnExternalVideoSurfacePositionChanged(
       int player_id, const gfx::RectF& rect) override;
 
   // Methods called from Java.
   void SurfaceCreated(
       JNIEnv* env, jobject obj, jint player_id, jobject jsurface);
   void SurfaceDestroyed(JNIEnv* env, jobject obj, jint player_id);
 
  private:
   virtual ~ExternalVideoSurfaceContainerImpl();
 
   base::android::ScopedJavaGlobalRef<jobject> jobject_;
 
   SurfaceCreatedCB surface_created_cb_;
   SurfaceDestroyedCB surface_destroyed_cb_;
 
  DISALLOW_COPY_AND_ASSIGN(ExternalVideoSurfaceContainerImpl);
 };
 
 bool RegisterExternalVideoSurfaceContainer(JNIEnv* env);
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_NATIVE_EXTERNAL_VIDEO_SURFACE_CONTAINER_IMPL_H_