Chromium Code Reviews| Index: talk/app/webrtc/java/jni/native_handle_impl.cc |
| diff --git a/talk/app/webrtc/objc/RTCPeerConnectionFactory+Internal.h b/talk/app/webrtc/java/jni/native_handle_impl.cc |
| similarity index 68% |
| copy from talk/app/webrtc/objc/RTCPeerConnectionFactory+Internal.h |
| copy to talk/app/webrtc/java/jni/native_handle_impl.cc |
| index 5d6fa12711a1515d3183208bd415bf3c11120c6c..df675203dc1d7f949e28f77212295e242c505d86 100644 |
| --- a/talk/app/webrtc/objc/RTCPeerConnectionFactory+Internal.h |
| +++ b/talk/app/webrtc/java/jni/native_handle_impl.cc |
| @@ -23,16 +23,26 @@ |
| * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
| * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
| * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| + * |
| */ |
| -#import "RTCPeerConnectionFactory.h" |
| +#include "talk/app/webrtc/java/jni/native_handle_impl.h" |
|
magjed_webrtc
2015/09/21 18:29:13
This is a new file. The diff is screwed up.
|
| -#include "talk/app/webrtc/peerconnectionfactory.h" |
| -#include "webrtc/base/scoped_ptr.h" |
| +#include "webrtc/base/checks.h" |
| -@interface RTCPeerConnectionFactory () |
| +namespace webrtc_jni { |
| -@property(nonatomic, assign) rtc::scoped_refptr< |
| - webrtc::PeerConnectionFactoryInterface> nativeFactory; |
| +NativeHandleImpl::NativeHandleImpl(JNIEnv* jni, |
| + jint j_oes_texture_id, |
| + jfloatArray j_transform_matrix) |
| + : oes_texture_id(j_oes_texture_id) { |
| + RTC_CHECK_EQ(16, jni->GetArrayLength(j_transform_matrix)); |
| + jfloat* transform_matrix_ptr = |
| + jni->GetFloatArrayElements(j_transform_matrix, nullptr); |
| + for (int i = 0; i < 16; ++i) { |
| + sampling_matrix[i] = transform_matrix_ptr[i]; |
| + } |
| + jni->ReleaseFloatArrayElements(j_transform_matrix, transform_matrix_ptr, 0); |
| +} |
| -@end |
| +} // namespace webrtc_jni |