提交 1c5277d3 编写于 作者: J jiao_yanlin

Update device descriptor, focus type and sample format, sample code modification

Signed-off-by: Njiao_yanlin <jiaoyanlin@huawei.com>
上级 3c258b58
...@@ -1907,7 +1907,6 @@ audioStreamManager.getCurrentAudioRendererInfoArray(async (err, AudioRendererCha ...@@ -1907,7 +1907,6 @@ audioStreamManager.getCurrentAudioRendererInfoArray(async (err, AudioRendererCha
console.info('Stream'+i+' is:'+AudioRendererChangeInfo.rendererInfo.usage); console.info('Stream'+i+' is:'+AudioRendererChangeInfo.rendererInfo.usage);
console.info('Flag'+i+' is:'+AudioRendererChangeInfo.rendererInfo.rendererFlags); console.info('Flag'+i+' is:'+AudioRendererChangeInfo.rendererInfo.rendererFlags);
console.info('State for '+i+' is:'+AudioRendererChangeInfo.rendererState); console.info('State for '+i+' is:'+AudioRendererChangeInfo.rendererState);
var devDescriptor = AudioRendererChangeInfo.deviceDescriptors; var devDescriptor = AudioRendererChangeInfo.deviceDescriptors;
for (let j=0;j<AudioRendererChangeInfo.deviceDescriptors.length; j++) { for (let j=0;j<AudioRendererChangeInfo.deviceDescriptors.length; j++) {
console.info('Id:'+i+':'+AudioRendererChangeInfo.deviceDescriptors[j].id); console.info('Id:'+i+':'+AudioRendererChangeInfo.deviceDescriptors[j].id);
...@@ -1952,7 +1951,6 @@ await audioStreamManager.getCurrentAudioRendererInfoArray().then( function (Audi ...@@ -1952,7 +1951,6 @@ await audioStreamManager.getCurrentAudioRendererInfoArray().then( function (Audi
console.info('Stream'+i+' is:'+AudioRendererChangeInfo.rendererInfo.usage); console.info('Stream'+i+' is:'+AudioRendererChangeInfo.rendererInfo.usage);
console.info('Flag'+i+' is:'+AudioRendererChangeInfo.rendererInfo.rendererFlags); console.info('Flag'+i+' is:'+AudioRendererChangeInfo.rendererInfo.rendererFlags);
console.info('State for '+i+' is:'+AudioRendererChangeInfo.rendererState); console.info('State for '+i+' is:'+AudioRendererChangeInfo.rendererState);
var devDescriptor = AudioRendererChangeInfo.deviceDescriptors; var devDescriptor = AudioRendererChangeInfo.deviceDescriptors;
for (let j=0;j<AudioRendererChangeInfo.deviceDescriptors.length; j++) { for (let j=0;j<AudioRendererChangeInfo.deviceDescriptors.length; j++) {
console.info('Id:'+i+':'+AudioRendererChangeInfo.deviceDescriptors[j].id); console.info('Id:'+i+':'+AudioRendererChangeInfo.deviceDescriptors[j].id);
...@@ -2002,7 +2000,6 @@ audioStreamManager.getCurrentAudioCapturerInfoArray(async (err, AudioCapturerCha ...@@ -2002,7 +2000,6 @@ audioStreamManager.getCurrentAudioCapturerInfoArray(async (err, AudioCapturerCha
console.info('Source for '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerInfo.source); console.info('Source for '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerInfo.source);
console.info('Flag '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerInfo.capturerFlags); console.info('Flag '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerInfo.capturerFlags);
console.info('State for '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerState); console.info('State for '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerState);
var devDescriptor = AudioCapturerChangeInfoArray[i].deviceDescriptors; var devDescriptor = AudioCapturerChangeInfoArray[i].deviceDescriptors;
for (let j=0;j<AudioCapturerChangeInfoArray[i].deviceDescriptors.length; j++) { for (let j=0;j<AudioCapturerChangeInfoArray[i].deviceDescriptors.length; j++) {
console.info('Id:'+i+':'+AudioCapturerChangeInfoArray[i].deviceDescriptors[j].id); console.info('Id:'+i+':'+AudioCapturerChangeInfoArray[i].deviceDescriptors[j].id);
...@@ -2045,7 +2042,6 @@ await audioStreamManagerCB.getCurrentAudioCapturerInfoArray().then( function (Au ...@@ -2045,7 +2042,6 @@ await audioStreamManagerCB.getCurrentAudioCapturerInfoArray().then( function (Au
console.info('Source for '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerInfo.source); console.info('Source for '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerInfo.source);
console.info('Flag '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerInfo.capturerFlags); console.info('Flag '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerInfo.capturerFlags);
console.info('State for '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerState); console.info('State for '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerState);
var devDescriptor = AudioCapturerChangeInfoArray[i].deviceDescriptors; var devDescriptor = AudioCapturerChangeInfoArray[i].deviceDescriptors;
for (let j=0;j<AudioCapturerChangeInfoArray[i].deviceDescriptors.length; j++) { for (let j=0;j<AudioCapturerChangeInfoArray[i].deviceDescriptors.length; j++) {
console.info('Id:'+i+':'+AudioCapturerChangeInfoArray[i].deviceDescriptors[j].id); console.info('Id:'+i+':'+AudioCapturerChangeInfoArray[i].deviceDescriptors[j].id);
...@@ -2092,7 +2088,6 @@ audioStreamManagerCB.on('audioRendererChange', (AudioRendererChangeInfoArray) = ...@@ -2092,7 +2088,6 @@ audioStreamManagerCB.on('audioRendererChange', (AudioRendererChangeInfoArray) =
console.info('Stream for '+i+' is:'+AudioRendererChangeInfo.rendererInfo.usage); console.info('Stream for '+i+' is:'+AudioRendererChangeInfo.rendererInfo.usage);
console.info('Flag '+i+' is:'+AudioRendererChangeInfo.rendererInfo.rendererFlags); console.info('Flag '+i+' is:'+AudioRendererChangeInfo.rendererInfo.rendererFlags);
console.info('State for '+i+' is:'+AudioRendererChangeInfo.rendererState); console.info('State for '+i+' is:'+AudioRendererChangeInfo.rendererState);
var devDescriptor = AudioRendererChangeInfo.deviceDescriptors; var devDescriptor = AudioRendererChangeInfo.deviceDescriptors;
for (let j=0;j<AudioRendererChangeInfo.deviceDescriptors.length; j++) { for (let j=0;j<AudioRendererChangeInfo.deviceDescriptors.length; j++) {
console.info('Id:'+i+':'+AudioRendererChangeInfo.deviceDescriptors[j].id); console.info('Id:'+i+':'+AudioRendererChangeInfo.deviceDescriptors[j].id);
...@@ -2153,7 +2148,6 @@ audioStreamManager.on('audioCapturerChange', (AudioCapturerChangeInfoArray) => ...@@ -2153,7 +2148,6 @@ audioStreamManager.on('audioCapturerChange', (AudioCapturerChangeInfoArray) =>
console.info('Source for '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerInfo.source); console.info('Source for '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerInfo.source);
console.info('Flag '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerInfo.capturerFlags); console.info('Flag '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerInfo.capturerFlags);
console.info('State for '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerState); console.info('State for '+i+'is:'+AudioCapturerChangeInfoArray[i].capturerState);
for (let j=0;j<AudioCapturerChangeInfoArray[i].deviceDescriptors.length; j++) { for (let j=0;j<AudioCapturerChangeInfoArray[i].deviceDescriptors.length; j++) {
console.info('Id:'+i+':'+AudioCapturerChangeInfoArray[i].deviceDescriptors[j].id); console.info('Id:'+i+':'+AudioCapturerChangeInfoArray[i].deviceDescriptors[j].id);
console.info('Type:'+i+':'+AudioCapturerChangeInfoArray[i].deviceDescriptors[j].deviceType); console.info('Type:'+i+':'+AudioCapturerChangeInfoArray[i].deviceDescriptors[j].deviceType);
...@@ -2215,6 +2209,7 @@ import audio from '@ohos.multimedia.audio'; ...@@ -2215,6 +2209,7 @@ import audio from '@ohos.multimedia.audio';
var audioStreamManager; var audioStreamManager;
var audioStreamManagerCB; var audioStreamManagerCB;
var Tag = "AFCapLog : ";
await audioManager.getStreamManager().then(async function (data) { await audioManager.getStreamManager().then(async function (data) {
audioStreamManager = data; audioStreamManager = data;
...@@ -2231,7 +2226,7 @@ audioManager.getStreamManager((err, data) => { ...@@ -2231,7 +2226,7 @@ audioManager.getStreamManager((err, data) => {
audioStreamManagerCB = data; audioStreamManagerCB = data;
console.info(Tag+'Get AudioStream Manager : Success '); console.info(Tag+'Get AudioStream Manager : Success ');
} }
}); });
audioStreamManagerCB.on('audioRendererChange', (AudioRendererChangeInfoArray) => { audioStreamManagerCB.on('audioRendererChange', (AudioRendererChangeInfoArray) => {
for (let i=0;i<AudioRendererChangeInfoArray.length;i++) { for (let i=0;i<AudioRendererChangeInfoArray.length;i++) {
...@@ -2342,7 +2337,6 @@ import audio from '@ohos.multimedia.audio'; ...@@ -2342,7 +2337,6 @@ import audio from '@ohos.multimedia.audio';
function displayDeviceProp(value) { function displayDeviceProp(value) {
deviceRoleValue = value.deviceRole; deviceRoleValue = value.deviceRole;
deviceTypeValue = value.deviceType; deviceTypeValue = value.deviceType;
} }
var deviceRoleValue = null; var deviceRoleValue = null;
...@@ -2769,7 +2763,6 @@ var audioRendererInfo = { ...@@ -2769,7 +2763,6 @@ var audioRendererInfo = {
content: audio.ContentType.CONTENT_TYPE_SPEECH, content: audio.ContentType.CONTENT_TYPE_SPEECH,
usage: audio.StreamUsage.STREAM_USAGE_VOICE_COMMUNICATION usage: audio.StreamUsage.STREAM_USAGE_VOICE_COMMUNICATION
rendererFlags: 1 rendererFlags: 1
}
var audioRendererOptions = { var audioRendererOptions = {
streamInfo: audioStreamInfo, streamInfo: audioStreamInfo,
...@@ -3243,15 +3236,14 @@ audioRenderer.on('interrupt', async(interruptEvent) => { ...@@ -3243,15 +3236,14 @@ audioRenderer.on('interrupt', async(interruptEvent) => {
if (isPlay == true) { if (isPlay == true) {
isPlay == false; isPlay == false;
console.info('AudioInterruptMusic: Media PAUSE : TRUE'); console.info('AudioInterruptMusic: Media PAUSE : TRUE');
} }else {
else {
isPlay = true; isPlay = true;
console.info('AudioInterruptMusic: Media PLAY : TRUE'); console.info('AudioInterruptMusic: Media PLAY : TRUE');
} }
break; break;
} }
} }
}); });
``` ```
### on('markReach')<sup>8+</sup> ### on('markReach')<sup>8+</sup>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册