X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=1acb70fde020f62d11606a61dc7cee3adcfe4e54;hb=714ad7e26b9860360fb8098613f8b4887d851e12;hp=da80fd3644ece1f733778c6887e9cc8a6bf7df90;hpb=5573029323801248c5ba7f88df6e594ec4b79af0;p=apps%2Fcamera-gstreamer.git diff --git a/app/main.cpp b/app/main.cpp index da80fd3..1acb70f 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -158,6 +158,8 @@ get_next_buffer(struct window *window) * the 'old' one and force creation of the buffer with the newer * dimensions */ if (window->wait_for_configure && window->maximized) { + /* The 'old' buffer might not exist if maximized is received + * from the start. */ if (window->buffers[0].buffer && !window->buffers[0].busy) { wl_buffer_destroy(window->buffers[0].buffer); window->buffers[0].buffer = NULL; @@ -667,7 +669,7 @@ int main(int argc, char *argv[]) memset(pipeline_str, 0, sizeof(pipeline_str)); snprintf(pipeline_str, sizeof(pipeline_str), "v4l2src device=%s ! video/x-raw,width=%d,height=%d ! waylandsink", - get_camera_device(), WINDOW_WIDTH_SIZE, WINDOW_HEIGHT_SIZE); + get_first_camera_device(), WINDOW_WIDTH_SIZE, WINDOW_HEIGHT_SIZE); gst_init(&gargc, &gargv); setbuf(stdout, NULL);