Hu Chunming / village_ascend_arm

Commit 8d319775579ad43bdeb9089adab22b6cdb69dd09

Authored by Hu Chunming
1 parent a2a251bf

添加prob字段

Inline Side-by-side
Showing 1 changed file with 10 additions and 3 deletions
jni/VehicleNativeInterface.cpp
  View file @8d31977
... ... @@ -290,6 +290,7 @@ JNIEXPORT jint JNICALL Java_com_objecteye_nativeinterface_vehicle_VehicleNativeI
290 290 t2 = msecond();
291 291 //printf("va jni info:decode time: %.2f\n", (t2 - t1));
292 292  
  293 + std::cout << "village_pic_analysis " << std::endl;
293 294  
294 295 std::vector<AnalysisResult> vec_result = village_pic_analysis(vaHandle, batch_img, batchSize);
295 296 if (vec_result.size() <= 0)
... ... @@ -361,7 +362,7 @@ JNIEXPORT jint JNICALL Java_com_objecteye_nativeinterface_vehicle_VehicleNativeI
361 362 //getmethodId
362 363 jmethodID mid_vehicleAnalysisResult = env->GetMethodID(cls_vehicleAnalysisResult, "<init>", "([Lcom/objecteye/pojo/vehicle/VehicleInfoParam;com/objecteye/pojo/vehicle/LineInfoParam;com/objecteye/pojo/vehicle/SegInfoParam;I)V");
363 364  
364   - jmethodID mid_VehicleInfo = env->GetMethodID(cls_VehicleInfo, "<init>", "(Lcom/objecteye/pojo/vehicle/VehicleDetectResultParam;Lcom/objecteye/pojo/vehicle/VehicleDetectResultParam;Lcom/objecteye/pojo/vehicle/VehicleDetectResultParam;Lcom/objecteye/pojo/vehicle/VehicleColorResultParam;Lcom/objecteye/pojo/vehicle/VehicleRecognizeResultParam;Lcom/objecteye/pojo/vehicle/VehiclePlateResultParam;Lcom/objecteye/pojo/vehicle/VehiclePendantDetectResultParam;Lcom/objecteye/pojo/vehicle/VehicleIllegalDetectResultParam;Lcom/objecteye/pojo/vehicle/VehicleFeatureResultParam;Lcom/objecteye/pojo/vehicle/MtaResultParam;Lcom/objecteye/pojo/vehicle/MannedResultParam;I;I;I;I;I;I;I;I;I;I;I)V");
  365 + jmethodID mid_VehicleInfo = env->GetMethodID(cls_VehicleInfo, "<init>", "(Lcom/objecteye/pojo/vehicle/VehicleDetectResultParam;Lcom/objecteye/pojo/vehicle/VehicleDetectResultParam;Lcom/objecteye/pojo/vehicle/VehicleDetectResultParam;Lcom/objecteye/pojo/vehicle/VehicleColorResultParam;Lcom/objecteye/pojo/vehicle/VehicleRecognizeResultParam;Lcom/objecteye/pojo/vehicle/VehiclePlateResultParam;Lcom/objecteye/pojo/vehicle/VehiclePendantDetectResultParam;Lcom/objecteye/pojo/vehicle/VehicleIllegalDetectResultParam;Lcom/objecteye/pojo/vehicle/VehicleFeatureResultParam;Lcom/objecteye/pojo/vehicle/MtaResultParam;Lcom/objecteye/pojo/vehicle/MannedResultParam;I;I;I;F;I;I;I;I;I;I;F;I;I)V");
365 366  
366 367 jmethodID mid_VehicleDetectResult = env->GetMethodID(cls_VehicleDetectResult, "<init>", "(Lcom/objecteye/pojo/common/SyRectParam;F)V");
367 368 jmethodID mid_VehicleColorResult = env->GetMethodID(cls_VehicleColorResult, "<init>", "(FI)V");
... ... @@ -392,7 +393,7 @@ JNIEXPORT jint JNICALL Java_com_objecteye_nativeinterface_vehicle_VehicleNativeI
392 393 jmethodID mid_SegInfo = env->GetMethodID(cls_SegInfo, "<init>", "(Lcom/objecteye/pojo/vehicle/SyPointParam;I)V");
393 394  
394 395 //set value to param
395   -
  396 + std::cout << "vehicleInfoArray " << std::endl;
396 397  
397 398 for (size_t i = 0; i < batchSize; i++)
398 399 {
... ... @@ -536,20 +537,24 @@ JNIEXPORT jint JNICALL Java_com_objecteye_nativeinterface_vehicle_VehicleNativeI
536 537 jint type = vehicle_info.type;
537 538 jint vpt_type = vehicle_info.vpt_type;
538 539 jint rainshed = vehicle_info.rainshed; //是否安装雨棚， 0 有雨棚 1 无雨棚
  540 + jfloat rainshed_prob = vehicle_info.rainshed_prob;
539 541 jint truck_manned = vehicle_info.truck_manned;
540 542 jint motor_manned = vehicle_info.motor_manned;
541 543 jint human_upper_color = vehicle_info.human_upper_color;
542 544 jint human_lower_color = vehicle_info.human_lower_color;
543 545 jint reverse_driving = vehicle_info.reverse_driving; // 0 正常行驶 1 逆行 -1 未知
544 546 jint phoning = vehicle_info.phoning; // 骑车打电话
  547 + jfloat phoning_prob = vehicle_info.phoning_prob;
545 548 jint cross_line = vehicle_info.cross_line; // 压实线， 1 黄实线 2 白实线 -1 其他
546 549 jint cross_diversion_line = vehicle_info.cross_diversion_line; // 压导流线 1 压了 -1 未压
547 550  
548   - jobject vehicleInfo = env->NewObject(cls_VehicleInfo, mid_VehicleInfo, vehicleDetectResult, vehicleWinDetectResult, vehicleBodyDetectResult, vehicleColorResult, vehicleRecgResult, vplateResult, vehiclePendantDetResult, vehicleIllegalDetResult, vehicleFeaResult,mtaResult, MannedResult, type, vpt_type, rainshed, truck_manned, motor_manned, human_upper_color, reverse_driving, phoning, cross_line, cross_diversion_line);
  551 + jobject vehicleInfo = env->NewObject(cls_VehicleInfo, mid_VehicleInfo, vehicleDetectResult, vehicleWinDetectResult, vehicleBodyDetectResult, vehicleColorResult, vehicleRecgResult, vplateResult, vehiclePendantDetResult, vehicleIllegalDetResult, vehicleFeaResult,mtaResult, MannedResult, type, vpt_type, rainshed, rainshed_prob, truck_manned, motor_manned, human_upper_color, reverse_driving, phoning, phoning_prob, cross_line, cross_diversion_line);
549 552  
550 553 env->SetObjectArrayElement(vehicleInfoArray, j, vehicleInfo);
551 554 }
552 555  
  556 + std::cout << "line info " << std::endl;
  557 +
553 558 // 道路标志线
554 559 jobjectArray LineInfoArray = env->NewObjectArray(vec_result[i].vec_line.size(), cls_LineInfo, NULL);
555 560 for (int j = 0; j < vec_result[i].vec_line.size(); j++)
... ... @@ -568,6 +573,8 @@ JNIEXPORT jint JNICALL Java_com_objecteye_nativeinterface_vehicle_VehicleNativeI
568 573 env->SetObjectArrayElement(LineInfoArray, j, one_line_info);
569 574 }
570 575  
  576 + std::cout << "road info " << std::endl;
  577 +
571 578 // 道路
572 579 jobjectArray RoadInfoArray = env->NewObjectArray(vec_result[i].vec_road.size(), cls_SegInfo, NULL);
573 580 for (int j = 0; j < vec_result[i].vec_road.size(); j++)
... ...