提交 4cbc580f authored 作者: autulin's avatar autulin

添加注释

上级 589587a8
...@@ -400,7 +400,6 @@ int GB28181Muxer::mux(GB28181Muxer *gb28181Muxer) { ...@@ -400,7 +400,6 @@ int GB28181Muxer::mux(GB28181Muxer *gb28181Muxer) {
// 如果是I帧的话,则添加系统头 // 如果是I帧的话,则添加系统头
gb28181_make_sys_header(szTempPacketHead + nSizePos, audioCnt); gb28181_make_sys_header(szTempPacketHead + nSizePos, audioCnt);
nSizePos += SYS_HDR_LEN; nSizePos += SYS_HDR_LEN;
//这个地方我是不管是I帧还是p帧都加上了map的,貌似只是I帧加也没有问题
gb28181_make_psm_header(szTempPacketHead + nSizePos); gb28181_make_psm_header(szTempPacketHead + nSizePos);
nSizePos += PSM_HDR_LEN; nSizePos += PSM_HDR_LEN;
} }
......
...@@ -51,6 +51,7 @@ public class DemoActivity extends AppCompatActivity implements ...@@ -51,6 +51,7 @@ public class DemoActivity extends AppCompatActivity implements
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
//初始化
if (mMediaRecorder == null) { if (mMediaRecorder == null) {
initMediaRecorder(); initMediaRecorder();
} else { } else {
...@@ -61,9 +62,11 @@ public class DemoActivity extends AppCompatActivity implements ...@@ -61,9 +62,11 @@ public class DemoActivity extends AppCompatActivity implements
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
// 释放资源
mMediaRecorder.release(); mMediaRecorder.release();
} }
//初始化视频参数用的
private void initData() { private void initData() {
// 设置视频的宽高,比特率等 // 设置视频的宽高,比特率等
// MediaRecorderBase.SMALL_VIDEO_HEIGHT = mediaRecorderConfig.getSmallVideoHeight(); // MediaRecorderBase.SMALL_VIDEO_HEIGHT = mediaRecorderConfig.getSmallVideoHeight();
...@@ -89,7 +92,7 @@ public class DemoActivity extends AppCompatActivity implements ...@@ -89,7 +92,7 @@ public class DemoActivity extends AppCompatActivity implements
// 设置输出 // 设置输出
// String fileName = String.valueOf(System.currentTimeMillis()); // String fileName = String.valueOf(System.currentTimeMillis());
String fileName = "tttttt"; String fileName = "tttttt";
mediaOutput = mMediaRecorder.setFileOutPut(fileName); mediaOutput = mMediaRecorder.setFileOutPut(fileName); //输出到文件,这里demo是/sdcard/DCIM/pstest/tttttt.ps
// mediaOutput = mMediaRecorder.setUdpOutPut("10.112.181.160", 8888); // mediaOutput = mMediaRecorder.setUdpOutPut("10.112.181.160", 8888);
mMediaRecorder.setSurfaceHolder(mSurfaceView.getHolder()); mMediaRecorder.setSurfaceHolder(mSurfaceView.getHolder());
...@@ -111,6 +114,9 @@ public class DemoActivity extends AppCompatActivity implements ...@@ -111,6 +114,9 @@ public class DemoActivity extends AppCompatActivity implements
mSurfaceView.setLayoutParams(lp); mSurfaceView.setLayoutParams(lp);
} }
/**
* 摄像头初始化完毕,初始化显示
*/
@Override @Override
public void onPrepared() { public void onPrepared() {
initSurfaceView(); initSurfaceView();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论