Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: talk/app/webrtc/java/jni/surfacetexturehelper_jni.cc

Issue 1441363002: Revert of Android MediaCodecVideoDecoder: Manage lifetime of texture frames (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Manual revert. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 void SurfaceTextureHelper::ReturnTextureFrame() const { 63 void SurfaceTextureHelper::ReturnTextureFrame() const {
64 JNIEnv* jni = AttachCurrentThreadIfNeeded(); 64 JNIEnv* jni = AttachCurrentThreadIfNeeded();
65 jni->CallVoidMethod(*j_surface_texture_helper_, j_return_texture_method_); 65 jni->CallVoidMethod(*j_surface_texture_helper_, j_return_texture_method_);
66 66
67 CHECK_EXCEPTION( 67 CHECK_EXCEPTION(
68 jni) << "error during SurfaceTextureHelper.returnTextureFrame"; 68 jni) << "error during SurfaceTextureHelper.returnTextureFrame";
69 } 69 }
70 70
71 rtc::scoped_refptr<webrtc::VideoFrameBuffer> 71 rtc::scoped_refptr<webrtc::VideoFrameBuffer>
72 SurfaceTextureHelper::CreateTextureFrame(int width, int height, 72 SurfaceTextureHelper::CreateTextureFrame(int width, int height,
73 const NativeHandleImpl& native_handle) { 73 const NativeTextureHandleImpl& native_handle) {
74 return new rtc::RefCountedObject<AndroidTextureBuffer>( 74 return new rtc::RefCountedObject<AndroidTextureBuffer>(
75 width, height, native_handle, 75 width, height, native_handle,
76 rtc::Bind(&SurfaceTextureHelper::ReturnTextureFrame, this)); 76 rtc::Bind(&SurfaceTextureHelper::ReturnTextureFrame, this));
77 } 77 }
78 78
79 } // namespace webrtc_jni 79 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/jni/surfacetexturehelper_jni.h ('k') | talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698