diff -r 5Mpixel_new/application/ipnc/multimedia/av_server/inc/avserver_ui.h 5Mpixel_orig/application/ipnc/multimedia/av_server/inc/avserver_ui.h 17d16 < #define AVSERVER_UI_CAPTURE_MODE_5_MEGA 8 //Added by DBian diff -r 5Mpixel_new/application/ipnc/multimedia/av_server/src/common/avServerMain.c 5Mpixel_orig/application/ipnc/multimedia/av_server/src/common/avServerMain.c 116,117d115 < if(strcmp(argv[i], "5MP")==0) // Added by DBian < gAVSERVER_UI_config.mode = AVSERVER_UI_CAPTURE_MODE_5_MEGA; // Added by DBian diff -r 5Mpixel_new/application/ipnc/multimedia/av_server/src/common/avServerUi.c 5Mpixel_orig/application/ipnc/multimedia/av_server/src/common/avServerUi.c 959,1029d958 < // Added by DBian < case AVSERVER_UI_CAPTURE_MODE_5_MEGA: < < gAVSERVER_UI_config.ldcEnable = FALSE; < gAVSERVER_UI_config.vsEnable = FALSE; < gAVSERVER_UI_config.snfEnable = FALSE; < gAVSERVER_UI_config.tnfEnable = FALSE; < < config->sensorMode = DRV_IMGS_SENSOR_MODE_2592x1944; < config->sensorFps = 5; < < config->vstabTskEnable = gAVSERVER_UI_config.vsEnable; < config->ldcTskEnable = gAVSERVER_UI_config.ldcEnable; < config->vnfTskEnable = gAVSERVER_UI_config.snfEnable|gAVSERVER_UI_config.tnfEnable; < config->encryptTskEnable = FALSE; < < config->captureRawInMode = AVSERVER_CAPTURE_RAW_IN_MODE_DDR_IN; < config->captureSingleResize = FALSE; < config->captureYuvFormat = DRV_DATA_FORMAT_YUV420; < < config->numCaptureStream = 1; < < if(numEncodes > config->numCaptureStream) < numEncodes = config->numCaptureStream; < < config->numEncodeStream = numEncodes; < < config->faceDetectConfig.captureStreamId = 0; < config->faceDetectConfig.fdEnable = gAVSERVER_UI_config.fdEnable; < < config->displayConfig.captureStreamId = 1; < config->displayConfig.width = 640; < config->displayConfig.height = 480; < config->displayConfig.expandH = TRUE; < < config->audioConfig.captureEnable = FALSE; < config->audioConfig.samplingRate = 8000; < config->audioConfig.codecType = ALG_AUD_CODEC_G711; < config->audioConfig.fileSaveEnable = FALSE; < < i=0; < < k=0; < config->captureConfig[i].width = 2592; < config->captureConfig[i].height = 1944; < config->captureConfig[i].ldcEnable = gAVSERVER_UI_config.ldcEnable; < config->captureConfig[i].snfEnable = gAVSERVER_UI_config.snfEnable; < config->captureConfig[i].tnfEnable = gAVSERVER_UI_config.tnfEnable; < config->captureConfig[i].vsEnable = config->vstabTskEnable; < < if(numEncodes>0) < config->captureConfig[i].numEncodes = 1; < < config->captureConfig[i].encodeStreamId[k++]= 0; < config->captureConfig[i].frameSkipMask = 0xFFFFFFFF; < < i=0; < config->encodeConfig[i].captureStreamId = 0; < config->encodeConfig[i].cropWidth = ALIGN_ENCODE(640); < config->encodeConfig[i].cropHeight = ALIGN_ENCODE(480); < config->encodeConfig[i].frameRateBase = 5000; < config->encodeConfig[i].frameSkipMask = 0xFFFFFFFF; < config->encodeConfig[i].codecType = gAVSERVER_UI_config.codecType[i]; < config->encodeConfig[i].codecBitrate = gAVSERVER_UI_config.codecBitrate[i]; < config->encodeConfig[i].encryptEnable = FALSE; < config->encodeConfig[i].fileSaveEnable = FALSE; < config->encodeConfig[i].motionVectorOutputEnable = FALSE; < config->encodeConfig[i].qValue = gAVSERVER_UI_config.codecBitrate[i]; < < break; < // Added by DBian end diff -r 5Mpixel_new/application/ipnc/multimedia/av_server/src/video/videoCaptureThr.c 5Mpixel_orig/application/ipnc/multimedia/av_server/src/video/videoCaptureThr.c 429,476d428 < // DBIAN < if (reszOutPrm[0].outWidth > 2176) < { < reszPrm.inWidth = gVIDEO_ctrl.captureInfo.isifInfo.ddrOutDataWidth/2; < reszOutPrm[0].outWidth = gVIDEO_ctrl.captureStream[0].captureOutWidth/2; < < status = DRV_reszRun(&reszPrm); < < reszPrm.inType = DRV_DATA_FORMAT_RAW; < reszPrm.inVirtAddr = pRawBufInfo->virtAddr; < reszPrm.inPhysAddr = pRawBufInfo->physAddr; < reszPrm.inStartX = gVIDEO_ctrl.captureInfo.isifInfo.ddrOutDataWidth/2; < reszPrm.inStartY = 1; < reszPrm.inWidth = gVIDEO_ctrl.captureInfo.isifInfo.ddrOutDataWidth/2; < reszPrm.inHeight = gVIDEO_ctrl.captureInfo.isifInfo.ddrOutDataHeight; < < if(gVIDEO_ctrl.alawEnable) < reszPrm.inOffsetH= gVIDEO_ctrl.captureInfo.isifInfo.ddrOutDataOffsetH; < else < reszPrm.inOffsetH= gVIDEO_ctrl.captureInfo.isifInfo.ddrOutDataOffsetH/2; < < reszPrm.inOffsetV= reszPrm.inHeight; < reszPrm.enableInvAlaw = gVIDEO_ctrl.alawEnable; < reszPrm.enableInvDpcm = FALSE; < reszPrm.clkDivM = 10; < reszPrm.clkDivN = 70; < < reszPrm.pOut[0] = NULL; < reszPrm.pOut[1] = NULL; < < reszPrm.pOut[0] = &reszOutPrm[0]; < < reszOutPrm[0].outType = gAVSERVER_config.captureYuvFormat; < reszOutPrm[0].flipH = gAVSERVER_config.captureConfig[0].flipH; < reszOutPrm[0].flipV = gAVSERVER_config.captureConfig[0].flipV; < reszOutPrm[0].outVirtAddr = pOutBufInfo[0]->virtAddr + VIDEO_BUF_HEADER_SIZE < + gVIDEO_ctrl.captureStream[0].captureOutOffsetH/2; < reszOutPrm[0].outPhysAddr = pOutBufInfo[0]->physAddr + VIDEO_BUF_HEADER_SIZE < + gVIDEO_ctrl.captureStream[0].captureOutOffsetH/2; < reszOutPrm[0].outWidth = gVIDEO_ctrl.captureStream[0].captureOutWidth/2; < reszOutPrm[0].outHeight = gVIDEO_ctrl.captureStream[0].captureOutHeight; < reszOutPrm[0].outOffsetH = gVIDEO_ctrl.captureStream[0].captureOutOffsetH; < reszOutPrm[0].outOffsetV = gVIDEO_ctrl.captureStream[0].captureOutOffsetV; < < status = DRV_reszRun(&reszPrm); < } < else < { 486d437 < } // DBIAN diff -r 5Mpixel_new/av_capture/application/ipnc/multimedia/av_server/inc/avserver_ui.h 5Mpixel_orig/av_capture/application/ipnc/multimedia/av_server/inc/avserver_ui.h 17d16 < #define AVSERVER_UI_CAPTURE_MODE_5_MEGA 8 //Added by DBian diff -r 5Mpixel_new/av_capture/application/ipnc/multimedia/av_server/src/common/avServerMain.c 5Mpixel_orig/av_capture/application/ipnc/multimedia/av_server/src/common/avServerMain.c 116,117d115 < if(strcmp(argv[i], "5MP")==0) // Added by DBian < gAVSERVER_UI_config.mode = AVSERVER_UI_CAPTURE_MODE_5_MEGA; // Added by DBian diff -r 5Mpixel_new/av_capture/application/ipnc/multimedia/av_server/src/common/avServerUi.c 5Mpixel_orig/av_capture/application/ipnc/multimedia/av_server/src/common/avServerUi.c 959,1029d958 < // Added by DBian < case AVSERVER_UI_CAPTURE_MODE_5_MEGA: < < gAVSERVER_UI_config.ldcEnable = FALSE; < gAVSERVER_UI_config.vsEnable = FALSE; < gAVSERVER_UI_config.snfEnable = FALSE; < gAVSERVER_UI_config.tnfEnable = FALSE; < < config->sensorMode = DRV_IMGS_SENSOR_MODE_2592x1944; < config->sensorFps = 5; < < config->vstabTskEnable = gAVSERVER_UI_config.vsEnable; < config->ldcTskEnable = gAVSERVER_UI_config.ldcEnable; < config->vnfTskEnable = gAVSERVER_UI_config.snfEnable|gAVSERVER_UI_config.tnfEnable; < config->encryptTskEnable = FALSE; < < config->captureRawInMode = AVSERVER_CAPTURE_RAW_IN_MODE_DDR_IN; < config->captureSingleResize = TRUE; < config->captureYuvFormat = DRV_DATA_FORMAT_YUV420; < < config->numCaptureStream = 1; < < if(numEncodes > config->numCaptureStream) < numEncodes = config->numCaptureStream; < < config->numEncodeStream = numEncodes; < < config->faceDetectConfig.captureStreamId = 0; < config->faceDetectConfig.fdEnable = gAVSERVER_UI_config.fdEnable; < < config->displayConfig.captureStreamId = 0; < config->displayConfig.width = 640; < config->displayConfig.height = 480; < config->displayConfig.expandH = TRUE; < < config->audioConfig.captureEnable = FALSE; < config->audioConfig.samplingRate = 8000; < config->audioConfig.codecType = ALG_AUD_CODEC_G711; < config->audioConfig.fileSaveEnable = FALSE; < < i=0; < < k=0; < config->captureConfig[i].width = 2592; < config->captureConfig[i].height = 1944; < config->captureConfig[i].ldcEnable = gAVSERVER_UI_config.ldcEnable; < config->captureConfig[i].snfEnable = gAVSERVER_UI_config.snfEnable; < config->captureConfig[i].tnfEnable = gAVSERVER_UI_config.tnfEnable; < config->captureConfig[i].vsEnable = config->vstabTskEnable; < < if(numEncodes>0) < config->captureConfig[i].numEncodes = 1; < < config->captureConfig[i].encodeStreamId[k++]= 0; < config->captureConfig[i].frameSkipMask = 0xFFFFFFFF; < < i=0; < config->encodeConfig[i].captureStreamId = 0; < config->encodeConfig[i].cropWidth = ALIGN_ENCODE(2592); < config->encodeConfig[i].cropHeight = ALIGN_ENCODE(1944); < config->encodeConfig[i].frameRateBase = 5000; < config->encodeConfig[i].frameSkipMask = 0xFFFFFFFF; < config->encodeConfig[i].codecType = gAVSERVER_UI_config.codecType[i]; < config->encodeConfig[i].codecBitrate = gAVSERVER_UI_config.codecBitrate[i]; < config->encodeConfig[i].encryptEnable = FALSE; < config->encodeConfig[i].fileSaveEnable = FALSE; < config->encodeConfig[i].motionVectorOutputEnable = FALSE; < config->encodeConfig[i].qValue = gAVSERVER_UI_config.codecBitrate[i]; < < break; < // Added by DBian end diff -r 5Mpixel_new/av_capture/application/ipnc/multimedia/av_server/src/video/videoCaptureThr.c 5Mpixel_orig/av_capture/application/ipnc/multimedia/av_server/src/video/videoCaptureThr.c 429,476d428 < // DBIAN < if (reszOutPrm[0].outWidth > 2176) < { < reszPrm.inWidth = gVIDEO_ctrl.captureInfo.isifInfo.ddrOutDataWidth/2; < reszOutPrm[0].outWidth = gVIDEO_ctrl.captureStream[0].captureOutWidth/2; < < status = DRV_reszRun(&reszPrm); < < reszPrm.inType = DRV_DATA_FORMAT_RAW; < reszPrm.inVirtAddr = pRawBufInfo->virtAddr; < reszPrm.inPhysAddr = pRawBufInfo->physAddr; < reszPrm.inStartX = gVIDEO_ctrl.captureInfo.isifInfo.ddrOutDataWidth/2; < reszPrm.inStartY = 1; < reszPrm.inWidth = gVIDEO_ctrl.captureInfo.isifInfo.ddrOutDataWidth/2; < reszPrm.inHeight = gVIDEO_ctrl.captureInfo.isifInfo.ddrOutDataHeight; < < if(gVIDEO_ctrl.alawEnable) < reszPrm.inOffsetH= gVIDEO_ctrl.captureInfo.isifInfo.ddrOutDataOffsetH; < else < reszPrm.inOffsetH= gVIDEO_ctrl.captureInfo.isifInfo.ddrOutDataOffsetH/2; < < reszPrm.inOffsetV= reszPrm.inHeight; < reszPrm.enableInvAlaw = gVIDEO_ctrl.alawEnable; < reszPrm.enableInvDpcm = FALSE; < reszPrm.clkDivM = 10; < reszPrm.clkDivN = 70; < < reszPrm.pOut[0] = NULL; < reszPrm.pOut[1] = NULL; < < reszPrm.pOut[0] = &reszOutPrm[0]; < < reszOutPrm[0].outType = gAVSERVER_config.captureYuvFormat; < reszOutPrm[0].flipH = gAVSERVER_config.captureConfig[0].flipH; < reszOutPrm[0].flipV = gAVSERVER_config.captureConfig[0].flipV; < reszOutPrm[0].outVirtAddr = pOutBufInfo[0]->virtAddr + VIDEO_BUF_HEADER_SIZE < + gVIDEO_ctrl.captureStream[0].captureOutOffsetH/2; < reszOutPrm[0].outPhysAddr = pOutBufInfo[0]->physAddr + VIDEO_BUF_HEADER_SIZE < + gVIDEO_ctrl.captureStream[0].captureOutOffsetH/2; < reszOutPrm[0].outWidth = gVIDEO_ctrl.captureStream[0].captureOutWidth/2; < reszOutPrm[0].outHeight = gVIDEO_ctrl.captureStream[0].captureOutHeight; < reszOutPrm[0].outOffsetH = gVIDEO_ctrl.captureStream[0].captureOutOffsetH; < reszOutPrm[0].outOffsetV = gVIDEO_ctrl.captureStream[0].captureOutOffsetV; < < status = DRV_reszRun(&reszPrm); < } < else < { 486d437 < } // DBIAN diff -r 5Mpixel_new/av_capture/framework/drv/inc/drv_imgs.h 5Mpixel_orig/av_capture/framework/drv/inc/drv_imgs.h 20d19 < #define DRV_IMGS_SENSOR_MODE_2592x1944 (11) // Added by DBian diff -r 5Mpixel_new/av_capture/framework/drv/usermod/src/drv.c 5Mpixel_orig/av_capture/framework/drv/usermod/src/drv.c 207,213d206 < // Added by DBian < case DRV_IMGS_SENSOR_MODE_2592x1944: < *width = 2592; < *height = 1944; < break; < // Added by DBian end < diff -r 5Mpixel_new/av_capture/framework/drv/usermod/src/drv_h3a.c 5Mpixel_orig/av_capture/framework/drv/usermod/src/drv_h3a.c 310,312c310 < printf("*******************inc = %d %d\n", inc, __LINE__); < inc = 32; // added by Dbian for hardcoded hack, else can not pass the H3A init < --- > diff -r 5Mpixel_new/framework/drv/inc/drv_imgs.h 5Mpixel_orig/framework/drv/inc/drv_imgs.h 20d19 < #define DRV_IMGS_SENSOR_MODE_2592x1944 (11) // Added by DBian diff -r 5Mpixel_new/framework/drv/usermod/src/drv.c 5Mpixel_orig/framework/drv/usermod/src/drv.c 207,213d206 < // Added by DBian < case DRV_IMGS_SENSOR_MODE_2592x1944: < *width = 2592; < *height = 1944; < break; < // Added by DBian end < diff -r 5Mpixel_new/framework/drv/usermod/src/drv_h3a.c 5Mpixel_orig/framework/drv/usermod/src/drv_h3a.c 310,312c310 < printf("*******************inc = %d %d\n", inc, __LINE__); < inc = 32; // added by Dbian for hardcoded hack, else can not pass the H3A init < --- > diff -r 5Mpixel_new/ipnc_app/network/boa-0.94.13/src/web_translate.c 5Mpixel_orig/ipnc_app/network/boa-0.94.13/src/web_translate.c 1119c1119 < "H264:720;H264:D1;H264:1080", "MPEG4:720;MPEG4:SXVGA;MPEG4:D1;MPEG4:1080", "JPG:1600x1200;JPG:2048x1536;JPG:2592x1944", --- > "H264:720;H264:D1;H264:1080", "MPEG4:720;MPEG4:SXVGA;MPEG4:D1;MPEG4:1080", "JPG:1600x1200;JPG:2048x1536", diff -r 5Mpixel_new/ipnc_app/sys_adm/system_server/av_server_ctrl.c 5Mpixel_orig/ipnc_app/sys_adm/system_server/av_server_ctrl.c 406,414d405 < // added by DBian < if (pConfig -> nVideocodecres == 2) < { < sprintf(cmd, "./av_server.out %s 5MP MJPEG %d MENUOFF &\n", < cmdopt, pConfig -> nJpegQuality); < fSetVideoSize(1, 2592, 1944); < } < else < // Added end