Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xuexiangjys
XVideo
提交
795e7356
X
XVideo
项目概览
xuexiangjys
/
XVideo
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
XVideo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
795e7356
编写于
6月 14, 2018
作者:
xuexiangjys
😊
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复在录制过程中,点击home键返回出现黑屏
上级
04df0634
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
32 addition
and
30 deletion
+32
-30
.idea/caches/build_file_checksums.ser
.idea/caches/build_file_checksums.ser
+0
-0
xvideo-demo/build.gradle
xvideo-demo/build.gradle
+2
-2
xvideo-lib/src/main/java/com/xuexiang/xvideo/MediaRecorderBase.java
.../src/main/java/com/xuexiang/xvideo/MediaRecorderBase.java
+22
-26
xvideo-lib/src/main/java/com/xuexiang/xvideo/MediaRecorderFragment.java
.../main/java/com/xuexiang/xvideo/MediaRecorderFragment.java
+4
-2
xvideo-lib/src/main/java/com/xuexiang/xvideo/MediaRecorderNative.java
...rc/main/java/com/xuexiang/xvideo/MediaRecorderNative.java
+4
-0
未找到文件。
.idea/caches/build_file_checksums.ser
浏览文件 @
795e7356
无法预览此类型文件
xvideo-demo/build.gradle
浏览文件 @
795e7356
...
@@ -74,9 +74,9 @@ dependencies {
...
@@ -74,9 +74,9 @@ dependencies {
//butterknife的sdk
//butterknife的sdk
implementation
'com.jakewharton:butterknife:8.8.1'
implementation
'com.jakewharton:butterknife:8.8.1'
annotationProcessor
'com.jakewharton:butterknife-compiler:8.8.1'
annotationProcessor
'com.jakewharton:butterknife-compiler:8.8.1'
//
implementation project(':xvideo-lib')
implementation
project
(
':xvideo-lib'
)
implementation
'com.github.xuexiangjys:XVideo:1.0.1'
//
implementation 'com.github.xuexiangjys:XVideo:1.0.1'
implementation
'com.github.xuexiangjys:NiceVieoPlayer:3.0.1'
implementation
'com.github.xuexiangjys:NiceVieoPlayer:3.0.1'
implementation
deps
.
glide
implementation
deps
.
glide
}
}
xvideo-lib/src/main/java/com/xuexiang/xvideo/MediaRecorderBase.java
浏览文件 @
795e7356
...
@@ -260,12 +260,19 @@ public abstract class MediaRecorderBase implements Callback, PreviewCallback, IM
...
@@ -260,12 +260,19 @@ public abstract class MediaRecorderBase implements Callback, PreviewCallback, IM
case
Camera
.
CameraInfo
.
CAMERA_FACING_FRONT
:
case
Camera
.
CameraInfo
.
CAMERA_FACING_FRONT
:
case
Camera
.
CameraInfo
.
CAMERA_FACING_BACK
:
case
Camera
.
CameraInfo
.
CAMERA_FACING_BACK
:
mCameraId
=
cameraFacingFront
;
mCameraId
=
cameraFacingFront
;
stopPreview
();
resetPreview
();
startPreview
();
break
;
break
;
}
}
}
}
/**
* 重置预览显示
*/
private
void
resetPreview
()
{
stopPreview
();
startPreview
();
}
/**
/**
* 切换前置/后置摄像头
* 切换前置/后置摄像头
*/
*/
...
@@ -415,8 +422,9 @@ public abstract class MediaRecorderBase implements Callback, PreviewCallback, IM
...
@@ -415,8 +422,9 @@ public abstract class MediaRecorderBase implements Callback, PreviewCallback, IM
*/
*/
public
void
prepare
()
{
public
void
prepare
()
{
mPrepared
=
true
;
mPrepared
=
true
;
if
(
mSurfaceCreated
)
if
(
mSurfaceCreated
)
{
startPreview
();
startPreview
();
}
}
}
/**
/**
...
@@ -712,17 +720,25 @@ public abstract class MediaRecorderBase implements Callback, PreviewCallback, IM
...
@@ -712,17 +720,25 @@ public abstract class MediaRecorderBase implements Callback, PreviewCallback, IM
public
void
surfaceCreated
(
SurfaceHolder
holder
)
{
public
void
surfaceCreated
(
SurfaceHolder
holder
)
{
this
.
mSurfaceHolder
=
holder
;
this
.
mSurfaceHolder
=
holder
;
this
.
mSurfaceCreated
=
true
;
this
.
mSurfaceCreated
=
true
;
if
(
mPrepared
&&
!
mStartPreview
)
if
(
mPrepared
)
{
startPreview
();
if
(!
mStartPreview
)
{
startPreview
();
}
else
{
resetPreview
();
}
}
}
}
@Override
@Override
public
void
surfaceChanged
(
SurfaceHolder
holder
,
int
format
,
int
width
,
int
height
)
{
public
void
surfaceChanged
(
SurfaceHolder
holder
,
int
format
,
int
width
,
int
height
)
{
this
.
mSurfaceHolder
=
holder
;
mSurfaceHolder
=
holder
;
}
}
@Override
@Override
public
void
surfaceDestroyed
(
SurfaceHolder
holder
)
{
public
void
surfaceDestroyed
(
SurfaceHolder
holder
)
{
if
(
mRecording
)
{
setStopDate
();
}
mSurfaceHolder
=
null
;
mSurfaceHolder
=
null
;
mSurfaceCreated
=
false
;
mSurfaceCreated
=
false
;
}
}
...
@@ -738,26 +754,6 @@ public abstract class MediaRecorderBase implements Callback, PreviewCallback, IM
...
@@ -738,26 +754,6 @@ public abstract class MediaRecorderBase implements Callback, PreviewCallback, IM
camera
.
addCallbackBuffer
(
data
);
camera
.
addCallbackBuffer
(
data
);
}
}
/**
* 测试PreviewFrame回调次数,时间1分钟
*/
public
void
testPreviewFrameCallCount
()
{
new
CountDownTimer
(
1
*
60
*
1000
,
1000
)
{
@Override
public
void
onTick
(
long
millisUntilFinished
)
{
Log
.
e
(
"[Vitamio Recorder]"
,
"testFrameRate..."
+
mPreviewFrameCallCount
);
mPreviewFrameCallCount
=
0
;
}
@Override
public
void
onFinish
()
{
}
}.
start
();
}
/**
/**
* 接收音频数据
* 接收音频数据
*/
*/
...
...
xvideo-lib/src/main/java/com/xuexiang/xvideo/MediaRecorderFragment.java
浏览文件 @
795e7356
...
@@ -349,10 +349,13 @@ public class MediaRecorderFragment extends Fragment implements
...
@@ -349,10 +349,13 @@ public class MediaRecorderFragment extends Fragment implements
super
.
onResume
();
super
.
onResume
();
if
(
mMediaRecorder
==
null
)
{
if
(
mMediaRecorder
==
null
)
{
initMediaRecorder
();
initMediaRecorder
();
}
else
{
}
else
{
//回到页面
mRecordLed
.
setChecked
(
false
);
mRecordLed
.
setChecked
(
false
);
mMediaRecorder
.
prepare
();
mMediaRecorder
.
prepare
();
mProgressView
.
setData
(
mMediaObject
);
mProgressView
.
setData
(
mMediaObject
);
if
(
mMediaRecorder
instanceof
MediaRecorderNative
)
{
((
MediaRecorderNative
)
mMediaRecorder
).
activityResume
();
}
}
}
}
}
...
@@ -378,7 +381,6 @@ public class MediaRecorderFragment extends Fragment implements
...
@@ -378,7 +381,6 @@ public class MediaRecorderFragment extends Fragment implements
// TODO 开始录制的图标
// TODO 开始录制的图标
mRecordController
.
animate
().
scaleX
(
0.8f
).
scaleY
(
0.8f
).
setDuration
(
500
).
start
();
mRecordController
.
animate
().
scaleX
(
0.8f
).
scaleY
(
0.8f
).
setDuration
(
500
).
start
();
if
(
mHandler
!=
null
)
{
if
(
mHandler
!=
null
)
{
mHandler
.
removeMessages
(
HANDLE_INVALIDATE_PROGRESS
);
mHandler
.
removeMessages
(
HANDLE_INVALIDATE_PROGRESS
);
mHandler
.
sendEmptyMessage
(
HANDLE_INVALIDATE_PROGRESS
);
mHandler
.
sendEmptyMessage
(
HANDLE_INVALIDATE_PROGRESS
);
...
...
xvideo-lib/src/main/java/com/xuexiang/xvideo/MediaRecorderNative.java
浏览文件 @
795e7356
...
@@ -140,4 +140,8 @@ public class MediaRecorderNative extends MediaRecorderBase implements MediaRecor
...
@@ -140,4 +140,8 @@ public class MediaRecorderNative extends MediaRecorderBase implements MediaRecor
public
void
activityStop
()
{
public
void
activityStop
()
{
FFmpegBridge
.
unRegisterFFmpegStateListener
(
this
);
FFmpegBridge
.
unRegisterFFmpegStateListener
(
this
);
}
}
public
void
activityResume
()
{
FFmpegBridge
.
registerFFmpegStateListener
(
this
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录