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

Side by Side Diff: talk/app/webrtc/java/android/org/webrtc/SurfaceTextureHelper.java

Issue 1418563005: SurfaceTextureHelper: Remove use of quitSafely() because it's API lvl 18 (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 throw new IllegalStateException("Wrong thread."); 216 throw new IllegalStateException("Wrong thread.");
217 } 217 }
218 if (isTextureInUse || !isQuitting) { 218 if (isTextureInUse || !isQuitting) {
219 throw new IllegalStateException("Unexpected release."); 219 throw new IllegalStateException("Unexpected release.");
220 } 220 }
221 eglBase.makeCurrent(); 221 eglBase.makeCurrent();
222 GLES20.glDeleteTextures(1, new int[] {oesTextureId}, 0); 222 GLES20.glDeleteTextures(1, new int[] {oesTextureId}, 0);
223 surfaceTexture.release(); 223 surfaceTexture.release();
224 eglBase.release(); 224 eglBase.release();
225 if (isOwningThread) { 225 if (isOwningThread) {
226 handler.getLooper().quitSafely(); 226 handler.getLooper().quit();
227 } 227 }
228 } 228 }
229 } 229 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698