1.调整进度条

This commit is contained in:
payton 2023-11-10 10:24:31 +08:00
parent 03563c0c5d
commit a629ed443e

View File

@ -671,7 +671,7 @@ int nvt_display_decode_string(void)
} }
jpeg_getdim(&img_width, &img_height); jpeg_getdim(&img_width, &img_height);
_Y_LOG("str6: image size: %d x %d\n", img_width, img_height); _Y_LOG("str6: image size: %d x %d\n", img_width, img_height);
printf("str6: image size: %d x %d\n", img_width, img_height); //printf("str6: image size: %d x %d\n", img_width, img_height);
if(g_uiStrYBufSize*2 < img_width*img_height*2) { if(g_uiStrYBufSize*2 < img_width*img_height*2) {
printf("(%d,%d) size small 0x%x\r\n",img_width,img_height,g_uiStrYBufSize*2); printf("(%d,%d) size small 0x%x\r\n",img_width,img_height,g_uiStrYBufSize*2);
return -1; return -1;
@ -865,7 +865,7 @@ void nvt_display_draw(UINT32 u32Id)
if (!g_uiVDO2_YAddr) { if (!g_uiVDO2_YAddr) {
g_uiPinPongIdx = 0; g_uiPinPongIdx = 0;
} }
printf("u32Id:%lu\r\n", u32Id); //printf("u32Id:%lu\r\n", u32Id);
switch (u32Id) { switch (u32Id) {
case DISP_DRAW_INIT: case DISP_DRAW_INIT:
@ -948,67 +948,61 @@ void nvt_display_draw(UINT32 u32Id)
case DISP_DRAW_UPDATING_BAR: case DISP_DRAW_UPDATING_BAR:
// j = g_uiXBarStep*g_uiBarW + g_uiBarW; // j = g_uiXBarStep*g_uiBarW + g_uiBarW;
printf("g_uiPinPongIdx:%lu g_uiXBarStep:%lu g_uiBarWtmp:%lu tmp:%lu\r\n", g_uiPinPongIdx,g_uiXBarStep,g_uiBarWtmp, (g_uiStr6_h - g_uiBarW)); //printf("g_uiPinPongIdx:%lu g_uiXBarStep:%lu g_uiBarWtmp:%lu tmp:%lu\r\n", g_uiPinPongIdx,g_uiXBarStep,g_uiBarWtmp, (g_uiStr6_h - g_uiBarW));
g_uiXBarStep++;
if(g_uiBarWtmp < (g_uiStr6_h - g_uiBarW)) g_uiBarWtmp = g_uiXBarStep*g_uiBarW;
if(g_uiBarWtmp > g_uiStr6_h)
{ {
g_uiBarWtmp = g_uiXBarStep*g_uiBarW + g_uiBarW; g_uiBarWtmp = g_uiStr6_h;
g_uiXBarStep++; }
for (i=1; i <= g_uiBarWtmp; i++) {
if (g_uiRotateDir == DISP_ROTATE_0) {
g_uiPixelOffset = g_uiImgLineoffset*g_uiBarY + g_uiBarX + i*g_uiImgLineoffset;
} else if (g_uiRotateDir == DISP_ROTATE_90) {
g_uiPixelOffset = g_uiImgLineoffset*g_uiBarY + g_uiBarX + i*g_uiImgLineoffset;
} else if (g_uiRotateDir == DISP_ROTATE_270) {
g_uiPixelOffset = g_uiImgLineoffset*g_uiBarY + g_uiBarX + i*g_uiImgLineoffset;
}
for (i=1; i <= g_uiXBarStep; i++) { switch (g_uiPinPongIdx){
for (j = 0; j < g_uiBarWtmp; j++) { case 0:
if (g_uiRotateDir == DISP_ROTATE_0) { memset((void *)(g_uiVDO_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH);
g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX + (i-1)*g_uiBarH /*offset for next bar*/ + j*g_uiImgLineoffset; memset((void *)(g_uiVDO_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH);
} else if (g_uiRotateDir == DISP_ROTATE_90) { break;
g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX - (i-1)*g_uiBarH*g_uiImgLineoffset - j*g_uiImgLineoffset; case 1:
} else if (g_uiRotateDir == DISP_ROTATE_270) { memset((void *)(g_uiVDO2_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH);
g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX + (i-1)*g_uiBarH*g_uiImgLineoffset + j*g_uiImgLineoffset; memset((void *)(g_uiVDO2_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH);
} break;
switch (g_uiPinPongIdx){
case 0:
memset((void *)(g_uiVDO_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH);
memset((void *)(g_uiVDO_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH);
break;
case 1:
memset((void *)(g_uiVDO2_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH);
memset((void *)(g_uiVDO2_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH);
break;
}
}
} }
} }
break; break;
case DISP_DRAW_UPDATEFW_OK: case DISP_DRAW_UPDATEFW_OK:
printf("g_uiPinPongIdx:%lu g_uiXBarStep:%lu j:%lu\r\n", g_uiPinPongIdx,g_uiXBarStep,g_uiBarWtmp); //printf("g_uiPinPongIdx:%lu g_uiXBarStep:%lu j:%lu g_uiTotalBarNum:%lu\r\n", g_uiPinPongIdx,g_uiXBarStep,g_uiBarWtmp, g_uiTotalBarNum);
for (i=1; i <= g_uiXBarStep; i++) { for (i=1; i <= g_uiBarWtmp; i++) {
for (j = 0; j < g_uiBarWtmp; j++) { if (g_uiRotateDir == DISP_ROTATE_0) {
if (g_uiRotateDir == DISP_ROTATE_0) { g_uiPixelOffset = g_uiImgLineoffset*g_uiBarY + g_uiBarX + i*g_uiImgLineoffset;
g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX + (i-1)*g_uiBarH + j*g_uiImgLineoffset; } else if (g_uiRotateDir == DISP_ROTATE_90) {
} else if (g_uiRotateDir == DISP_ROTATE_90) { g_uiPixelOffset = g_uiImgLineoffset*g_uiBarY + g_uiBarX + i*g_uiImgLineoffset;
g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX - (i-1)*g_uiBarH*g_uiImgLineoffset - j*g_uiImgLineoffset; } else if (g_uiRotateDir == DISP_ROTATE_270) {
} else if (g_uiRotateDir == DISP_ROTATE_270) { g_uiPixelOffset = g_uiImgLineoffset*g_uiBarY + g_uiBarX + i*g_uiImgLineoffset;
g_uiPixelOffset = g_uiBarY*g_uiImgLineoffset + g_uiBarX + (i-1)*g_uiBarH*g_uiImgLineoffset + j*g_uiImgLineoffset; }
}
switch (g_uiPinPongIdx){ switch (g_uiPinPongIdx){
case 0: case 0:
memset((void *)(g_uiVDO_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH); memset((void *)(g_uiVDO_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH);
memset((void *)(g_uiVDO_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH); memset((void *)(g_uiVDO_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH);
break; break;
case 1: case 1:
memset((void *)(g_uiVDO2_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH); memset((void *)(g_uiVDO2_YAddr + g_uiPixelOffset), 0x4C, g_uiBarH);
memset((void *)(g_uiVDO2_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH); memset((void *)(g_uiVDO2_UVAddr + g_uiPixelOffset) , 0x4C, g_uiBarH);
break; break;
}
} }
} }
break; break;
case DISP_DRAW_UPDATEFW_PROMPT: case DISP_DRAW_UPDATEFW_PROMPT:
printf("g_uiPinPongIdx:%lu\r\n", g_uiPinPongIdx); //printf("g_uiPinPongIdx:%lu\r\n", g_uiPinPongIdx);
for (i=0 ;i < g_uiStr4_h; i++) { for (i=0 ;i < g_uiStr4_h; i++) {
if (g_uiRotateDir == DISP_ROTATE_0) { if (g_uiRotateDir == DISP_ROTATE_0) {
@ -1318,7 +1312,7 @@ void nvt_display_config(UINT32 config_id, UINT32 vlaue)
g_uiTotalBarNum = vlaue*2; //wrtie partition + read back partition g_uiTotalBarNum = vlaue*2; //wrtie partition + read back partition
g_uiBarW = g_uiStr6_h/(vlaue*2); g_uiBarW = g_uiStr6_h/(vlaue*2);
g_uiBarH = g_uiStr6_w; g_uiBarH = g_uiStr6_w;
printf("g_uiBarW:%lu\r\n", g_uiBarW); //printf("g_uiBarW:%lu\r\n", g_uiBarW);
break; break;
} }
} }