projects
/
rtmpclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add auto Update
[rtmpclient.git]
/
app
/
src
/
main
/
java
/
ai
/
suanzi
/
rtmpclient
/
MyService.java
diff --git
a/app/src/main/java/ai/suanzi/rtmpclient/MyService.java
b/app/src/main/java/ai/suanzi/rtmpclient/MyService.java
index
ff2c182
..
ae41a41
100644
(file)
--- a/
app/src/main/java/ai/suanzi/rtmpclient/MyService.java
+++ b/
app/src/main/java/ai/suanzi/rtmpclient/MyService.java
@@
-41,7
+41,7
@@
public class MyService extends Service implements Camera.PreviewCallback, Camer
public Camera getCameraInstance() {
if (mCamera == null) {
public Camera getCameraInstance() {
if (mCamera == null) {
- CameraHandlerThread mThread = new CameraHandlerThread("
camera thread
");
+ CameraHandlerThread mThread = new CameraHandlerThread("
ThreadCamera
");
synchronized (mThread) {
mThread.openCamera();
}
synchronized (mThread) {
mThread.openCamera();
}
@@
-151,6
+151,7
@@
public class MyService extends Service implements Camera.PreviewCallback, Camer
if(mCamera != null){
try {
mCamera.stopPreview();
if(mCamera != null){
try {
mCamera.stopPreview();
+ mCamera.setPreviewCallback(null);
mCamera.release();
mCamera = null;
} catch (Exception e){
mCamera.release();
mCamera = null;
} catch (Exception e){
@@
-228,7
+229,7
@@
public class MyService extends Service implements Camera.PreviewCallback, Camer
if(ret != 0){
gLogger.error("setRtmpUrl, initEncoder error");
}
if(ret != 0){
gLogger.error("setRtmpUrl, initEncoder error");
}
- return ret == 0
? true : false
;
+ return ret == 0;
}
private void configCamera(Camera camera){
}
private void configCamera(Camera camera){