李勇

音视频模块增加 optionJsonData字段,这个是推流的时候带入的可选参数,参数是一个json字符串,用来设置一些和音视频相关的属性

... ... @@ -58,7 +58,7 @@ export default class MessageEntrance extends Emiter {
constructor() {
super();
//sdk 信息
GlobalConfig.sdkVersion = "v1.79.3.20170821";
GlobalConfig.sdkVersion = "v1.79.4.20170821";
loger.warn("sdkVersion:" + GlobalConfig.sdkVersion);
//设置
... ... @@ -1796,6 +1796,7 @@ export default class MessageEntrance extends Emiter {
return {"code": ApeConsts.RETURN_FAILED, "data": ""};
}
if (_video_ape) {
GlobalConfig.optionJsonData=_param.optionJsonData||"";
return _video_ape.publishVideo(_param);
}
}
... ... @@ -1852,6 +1853,7 @@ export default class MessageEntrance extends Emiter {
return {"code": ApeConsts.RETURN_FAILED, "data": ""};
}
if (_audio_ape) {
GlobalConfig.optionJsonData=_param.optionJsonData||"";
return _audio_ape.publishAudio(_param);
}
}
... ...
... ... @@ -482,6 +482,7 @@ GlobalConfig.autoGain = false; //自动调节麦克风音量
GlobalConfig.speakerVolume = 80; //扬声器音量(0-80)
GlobalConfig.micCode = 0; //麦克风模式
GlobalConfig.optionJsonData="";//音视频模块推流时的可选参数,这个由外部传入
GlobalConfig.audioRecords = [];
GlobalConfig.videoRecords = [];
GlobalConfig.status = 0
... ...
... ... @@ -374,6 +374,7 @@ class AudioApe extends Ape {
receiveChannelInfo.screenWidth=unpackChannelInfo.screenWidth||GlobalConfig.screenWidth;
receiveChannelInfo.screenHeight=unpackChannelInfo.screenHeight||GlobalConfig.screenHeight;
receiveChannelInfo.deviceType=unpackChannelInfo.deviceType||0;
receiveChannelInfo.optionJsonData=unpackChannelInfo.optionJsonData||"";
//消息不是自己同步的,需要处理
if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){
... ... @@ -472,6 +473,7 @@ class AudioApe extends Ape {
packPduModel.screenWidth=_param.screenWidth||GlobalConfig.screenWidth;
packPduModel.screenHeight=_param.screenHeight||GlobalConfig.screenHeight;
packPduModel.deviceType=_param.deviceType||GlobalConfig.deviceType;
packPduModel.optionJsonData=_param.optionJsonData||GlobalConfig.optionJsonData;
loger.log("packPdu->",packPduModel);
return packPduModel;
}
... ...
... ... @@ -465,6 +465,7 @@ class VideoApe extends Ape {
receiveChannelInfo.screenWidth=unpackChannelInfo.screenWidth||GlobalConfig.screenWidth;
receiveChannelInfo.screenHeight=unpackChannelInfo.screenHeight||GlobalConfig.screenHeight;
receiveChannelInfo.deviceType=unpackChannelInfo.deviceType||0;
receiveChannelInfo.optionJsonData=unpackChannelInfo.optionJsonData||"";
//消息不是自己同步的,需要处理
if(unpackChannelInfo.status==ApeConsts.CHANNEL_STATUS_OPENING){
//正在推流
... ... @@ -596,6 +597,7 @@ class VideoApe extends Ape {
packPduModel.screenWidth=_param.screenWidth||GlobalConfig.screenWidth;
packPduModel.screenHeight=_param.screenHeight||GlobalConfig.screenHeight;
packPduModel.deviceType=_param.deviceType||GlobalConfig.deviceType;
packPduModel.optionJsonData=_param.optionJsonData||GlobalConfig.optionJsonData;
loger.log('packPdu->',packPduModel);
return packPduModel;
}
... ...
... ... @@ -832,6 +832,7 @@ message RCAudioChannelInfoPdu {
optional uint32 screenWidth = 13;//屏幕分辨率宽
optional uint32 screenHeight = 14;//屏幕分辨率高
optional uint32 deviceType = 15;//设备类型
optional string optionJsonData =16;//其他参数的json对象
}
message RCVideoChannelInfoPdu {
... ... @@ -850,6 +851,7 @@ message RCVideoChannelInfoPdu {
optional uint32 screenWidth = 13;//屏幕分辨率宽
optional uint32 screenHeight = 14;//屏幕分辨率高
optional uint32 deviceType = 15;//设备类型
optional string optionJsonData =16;//其他参数的json对象
}
message RCVideoChannelInfoRecordPdu {
... ...