Skip to content

Commit 6e2e223

Browse files
committed
增加调试需要的函数和属性
1 parent 45d76d0 commit 6e2e223

File tree

4 files changed

+56
-7
lines changed

4 files changed

+56
-7
lines changed

apps/player/SettingsView.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,17 @@ namespace mango
3737
system("setprop persist.sys.usb.config hifi");
3838
system("start usbd");
3939
}else{
40-
log_i("------------>set usb storage");
41-
system("setprop persist.usb.debug 0");
42-
system("setprop persist.sys.usb.config mass_storage");
40+
char board[PROP_VALUE_MAX]={0};
41+
__system_property_get("persist.mango.storage.fun",board);
42+
43+
if(strcmp(board,"adb")==0){
44+
log_i("------------>set usb adb");
45+
system("openadb");
46+
}else{
47+
log_i("------------>set usb storage");
48+
system("setprop persist.usb.debug 0");
49+
system("setprop persist.sys.usb.config mass_storage");
50+
}
4351
}
4452
}
4553
enum

apps/player/USBHiFi.cpp

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,31 @@ void PcmWrite::start(){
548548
log_i("PcmWrite start-.");
549549
for(i=0;i<50;i++)
550550
pcm_write(mHiFiOut, data, HIFI_PACKET_SIZE - 4);
551-
551+
552+
#if 1
553+
if(FileAttr::FileExist("/mnt/pcmdata")){
554+
FILE *file = NULL;
555+
char buf[1000];
556+
int len = 0;
557+
long offset = 0;
558+
log_i("----->enter play /mnt/pcmdata");
559+
file = fopen("/mnt/pcmdata","r");
560+
561+
if(file!=NULL){
562+
while(1){
563+
fseek(file,offset,SEEK_SET);
564+
len = fread(buf,1,1000,file);
565+
if(len>0){
566+
pcm_write(mHiFiOut,buf,len);
567+
offset = offset + len;
568+
}else{
569+
break;
570+
}
571+
}
572+
}
573+
}
574+
#endif
575+
552576
hifi_pcm_close(mHiFiOut);
553577
log_i("PcmWrite end.");
554578
}

apps/player/audiousb.cpp

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ void sendAudioMsg(int rate,int bit){
294294
unsigned char *dataPos = (unsigned char *)data;
295295
int count = dataSize;
296296

297-
logi("WriteRingBuffer %s",dataPos);
298297

299298
while (count > 0)
300299
{
@@ -571,7 +570,22 @@ int gSendingCount = 0;
571570
#define PCM_PERIOD_SZ_SHIFT 12
572571
#define PCM_PERIOD_SZ_MASK (0xF << PCM_PERIOD_SZ_SHIFT)
573572

573+
void writePcm(unsigned char* buf,int size){
574+
FILE *fp = NULL;
575+
int offset = 0;
576+
const char* pcmPath = "/mnt/pcmdata";
574577

578+
if(access(pcmPath,F_OK) != 0)
579+
fp = fopen(pcmPath,"wb");
580+
else
581+
fp = fopen(pcmPath,"rb+");
582+
583+
if(fp!=NULL){
584+
fseek(fp,0L,SEEK_END);
585+
offset = fwrite(buf,1,size,fp);
586+
fclose(fp);
587+
}
588+
}
575589

576590

577591
unsigned int USBHiFiSending(void *parameter)
@@ -621,8 +635,11 @@ int gSendingCount = 0;
621635
if (packet->mType == HIFI_PACKET_TYPE_STOP)
622636
break;
623637

624-
if (packet->mType == HIFI_PACKET_TYPE_DATA)
638+
if (packet->mType == HIFI_PACKET_TYPE_DATA){
639+
//memset(packet->data,0,packet->mSize - 4);
640+
//writePcm(packet->data,packet->mSize - 4);
625641
pcm_write(mHiFiOut, packet->data, packet->mSize - 4);
642+
}
626643
}
627644

628645
hifi_pcm_close(mHiFiOut);

apps/player/resource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Module Name:
2121
2222
Revision History:
2323
24-
2014-4-2 18:44:7 Created by Fibo Lu
24+
2014-4-8 17:47:19 Created by Fibo Lu
2525
2626
--*/
2727

0 commit comments

Comments
 (0)