fix bug that visionstream_destroy may be called twice (#1999)

old-commit-hash: cccb63229d
commatwo_master
Dean Lee 5 years ago committed by GitHub
parent 755c21f05c
commit 735f84089c
  1. 5
      selfdrive/modeld/dmonitoringmodeld.cc
  2. 4
      selfdrive/modeld/modeld.cc

@ -56,7 +56,6 @@ int main(int argc, char **argv) {
buf = visionstream_get(&stream, &extra); buf = visionstream_get(&stream, &extra);
if (buf == NULL) { if (buf == NULL) {
printf("visionstream get failed\n"); printf("visionstream get failed\n");
visionstream_destroy(&stream);
break; break;
} }
//printf("frame_id: %d %dx%d\n", extra.frame_id, buf_info.width, buf_info.height); //printf("frame_id: %d %dx%d\n", extra.frame_id, buf_info.width, buf_info.height);
@ -84,11 +83,9 @@ int main(int argc, char **argv) {
LOGD("dmonitoring process: %.2fms, from last %.2fms", t2-t1, t1-last); LOGD("dmonitoring process: %.2fms, from last %.2fms", t2-t1, t1-last);
last = t1; last = t1;
} }
visionstream_destroy(&stream);
} }
visionstream_destroy(&stream);
dmonitoring_free(&dmonitoringmodel); dmonitoring_free(&dmonitoringmodel);
return 0; return 0;

@ -190,7 +190,6 @@ int main(int argc, char **argv) {
buf = visionstream_get(&stream, &extra); buf = visionstream_get(&stream, &extra);
if (buf == NULL) { if (buf == NULL) {
LOGW("visionstream get failed"); LOGW("visionstream get failed");
visionstream_destroy(&stream);
break; break;
} }
@ -239,10 +238,9 @@ int main(int argc, char **argv) {
} }
visionbuf_free(&yuv_ion); visionbuf_free(&yuv_ion);
visionstream_destroy(&stream);
} }
visionstream_destroy(&stream);
model_free(&model); model_free(&model);
LOG("joining live_thread"); LOG("joining live_thread");

Loading…
Cancel
Save