|
@@ -29,8 +29,8 @@ void cbSaveToLocal(uvc_frame_t *frame, void *ptr)
|
|
static const char *MJPEG_FILE = ".jpeg";
|
|
static const char *MJPEG_FILE = ".jpeg";
|
|
char filename[264];
|
|
char filename[264];
|
|
std::fstream log_file("CallBackLog.txt", std::ios::app);
|
|
std::fstream log_file("CallBackLog.txt", std::ios::app);
|
|
-
|
|
|
|
DataPackagePtr dataPackage = nullptr;
|
|
DataPackagePtr dataPackage = nullptr;
|
|
|
|
+ // static MemoryPool<DataPackage> dataPool(BUFFER_SIZE, 3840, 2160);
|
|
std::shared_ptr<DataPipe<DataPackage>> pipe;
|
|
std::shared_ptr<DataPipe<DataPackage>> pipe;
|
|
|
|
|
|
// std::fstream readImage("./uav1.jpg", std::ios::binary | std::ios::in);
|
|
// std::fstream readImage("./uav1.jpg", std::ios::binary | std::ios::in);
|
|
@@ -51,32 +51,30 @@ void cbSaveToLocal(uvc_frame_t *frame, void *ptr)
|
|
fclose(fp);
|
|
fclose(fp);
|
|
break;
|
|
break;
|
|
case UVC_COLOR_FORMAT_MJPEG:
|
|
case UVC_COLOR_FORMAT_MJPEG:
|
|
|
|
+
|
|
if (!g_gpioExplorer->getFailingStatus(index))
|
|
if (!g_gpioExplorer->getFailingStatus(index))
|
|
{
|
|
{
|
|
- std::cout << "Pass this wave" << std::endl;
|
|
|
|
|
|
+ // std::cout << "Pass this wave" << std::endl;
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
g_gpioExplorer->resetFailingStatus(index);
|
|
g_gpioExplorer->resetFailingStatus(index);
|
|
|
|
|
|
- if (jpeg_count[index] / 12 >= 1)
|
|
|
|
|
|
+ if (jpeg_count[index] / 23 >= 1)
|
|
jpeg_group[index]++;
|
|
jpeg_group[index]++;
|
|
- jpeg_count[index] = jpeg_count[index] % 12;
|
|
|
|
- std::cout << "Current File Device " << index << " Index : " << jpeg_count[index] << std::endl;
|
|
|
|
- sprintf(filename, "./data/%d/%d-%d%s", index, jpeg_group[index], jpeg_count[index]++, MJPEG_FILE);
|
|
|
|
|
|
+ jpeg_count[index] = jpeg_count[index] % 23;
|
|
|
|
+ std::cout << "Current File Device " << index << " UVC Index : " << jpeg_count[index] << std::endl;
|
|
|
|
+ // sprintf(filename, "./data/%d/%d-%d%s", index, jpeg_group[index], jpeg_count[index]++, MJPEG_FILE);
|
|
|
|
|
|
dataPackage = DataManager::getInstance().acquireDataBuffer<DataPackage>();
|
|
dataPackage = DataManager::getInstance().acquireDataBuffer<DataPackage>();
|
|
|
|
|
|
- // readImage.read((char *)dataPackage->pJpegData, fileSize);
|
|
|
|
- // dataPackage->nJpegSize = fileSize;
|
|
|
|
- // dataPackage->nWidth = 3840;
|
|
|
|
- // dataPackage->nHeight = 2160;
|
|
|
|
-
|
|
|
|
memcpy(dataPackage->pJpegData, frame->data, frame->data_bytes);
|
|
memcpy(dataPackage->pJpegData, frame->data, frame->data_bytes);
|
|
|
|
|
|
dataPackage->nJpegSize = frame->data_bytes;
|
|
dataPackage->nJpegSize = frame->data_bytes;
|
|
dataPackage->nWidth = frame->width;
|
|
dataPackage->nWidth = frame->width;
|
|
dataPackage->nHeight = frame->height;
|
|
dataPackage->nHeight = frame->height;
|
|
dataPackage->nTimeStamp = frame->capture_time_finished.tv_sec * 1000 + frame->capture_time_finished.tv_nsec / 1000000;
|
|
dataPackage->nTimeStamp = frame->capture_time_finished.tv_sec * 1000 + frame->capture_time_finished.tv_nsec / 1000000;
|
|
|
|
+ dataPackage->nCameraID = index;
|
|
|
|
+ dataPackage->dDegree = jpeg_count[index]++;
|
|
|
|
|
|
DataManager::getInstance().pushData<DataPackage>("uvc" + std::to_string(index), dataPackage);
|
|
DataManager::getInstance().pushData<DataPackage>("uvc" + std::to_string(index), dataPackage);
|
|
|
|
|