Revert of Made EglBase an abstract class and cleaned up.

talk/app/webrtc/java/jni/peerconnection_jni.cc

 /*
  * libjingle
  * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 1347 matching lines @@
   }
 }
 
 JOW(void, PeerConnectionFactory_nativeSetVideoHwAccelerationOptions)(
     JNIEnv* jni, jclass, jlong native_factory, jobject local_egl_context,
     jobject remote_egl_context) {
 #if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)
   OwnedFactoryAndThreads* owned_factory =
       reinterpret_cast<OwnedFactoryAndThreads*>(native_factory);
 
+  // TODO(perkj): In order to not break existing applications we need to
+  // check if |local_egl_context| or |remote_egl_context| is an
+  // EGL10 context. If so, create an EGLBase10.EGL10Context instead.
+  // Remove this once existing applications has been updated.
+  jobject local_eglbase_context = local_egl_context;
+  jobject remote_eglbase_context = remote_egl_context;
+
+  jclass j_egl10_context_class =
+      FindClass(jni, "javax/microedition/khronos/egl/EGLContext");
+  jclass j_eglbase_context_class =
+      FindClass(jni, "org/webrtc/EglBase$Context");
+
+  jmethodID j_eglbase_context_ctor = GetMethodID(
+      jni, j_eglbase_context_class,
+      "<init>", "(Ljavax/microedition/khronos/egl/EGLContext;)V");
+  if (local_egl_context != nullptr &&
+      jni->IsInstanceOf(local_egl_context, j_egl10_context_class)) {
+    local_eglbase_context = jni->NewObject(
+        j_eglbase_context_class, j_eglbase_context_ctor,
+        local_egl_context);
+  }
+  if (remote_egl_context != nullptr &&
+      jni->IsInstanceOf(remote_egl_context, j_egl10_context_class)) {
+    remote_eglbase_context = jni->NewObject(
+        j_eglbase_context_class, j_eglbase_context_ctor,
+        remote_egl_context);
+  }
+
   MediaCodecVideoEncoderFactory* encoder_factory =
       static_cast<MediaCodecVideoEncoderFactory*>
           (owned_factory->encoder_factory());
   if (encoder_factory) {
     LOG(LS_INFO) << "Set EGL context for HW encoding.";
-    encoder_factory->SetEGLContext(jni, local_egl_context);
+    encoder_factory->SetEGLContext(jni, local_eglbase_context);
   }
 
   MediaCodecVideoDecoderFactory* decoder_factory =
       static_cast<MediaCodecVideoDecoderFactory*>
           (owned_factory->decoder_factory());
   if (decoder_factory) {
     LOG(LS_INFO) << "Set EGL context for HW decoding.";
-    decoder_factory->SetEGLContext(jni, remote_egl_context);
+    decoder_factory->SetEGLContext(jni, remote_eglbase_context);
   }
 #endif
 }
 
 static std::string
 GetJavaEnumName(JNIEnv* jni, const std::string& className, jobject j_enum) {
   jclass enumClass = FindClass(jni, className.c_str());
   jmethodID nameMethod =
       GetMethodID(jni, enumClass, "name", "()Ljava/lang/String;");
   jstring name =
@@ skipping 764 matching lines @@
   return JavaStringFromStdString(
       jni,
       reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id());
 }
 
 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
   reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release();
 }
 
 }  // namespace webrtc_jni