projects
/
platform
/
upstream
/
opencv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #6762 from maff91:master
[platform/upstream/opencv.git]
/
samples
/
gpu
/
video_writer.cpp
diff --git
a/samples/gpu/video_writer.cpp
b/samples/gpu/video_writer.cpp
index
607f8d3
..
80d2cfc
100644
(file)
--- a/
samples/gpu/video_writer.cpp
+++ b/
samples/gpu/video_writer.cpp
@@
-10,7
+10,6
@@
#include "opencv2/core.hpp"
#include "opencv2/cudacodec.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/core.hpp"
#include "opencv2/cudacodec.hpp"
#include "opencv2/highgui.hpp"
-#include "opencv2/contrib.hpp"
int main(int argc, const char* argv[])
{
int main(int argc, const char* argv[])
{
@@
-40,7
+39,7
@@
int main(int argc, const char* argv[])
std::vector<double> cpu_times;
std::vector<double> gpu_times;
std::vector<double> cpu_times;
std::vector<double> gpu_times;
-
cv::
TickMeter tm;
+ TickMeter tm;
for (int i = 1;; ++i)
{
for (int i = 1;; ++i)
{
@@
-68,7
+67,8
@@
int main(int argc, const char* argv[])
{
std::cout << "Open CUDA Writer" << std::endl;
{
std::cout << "Open CUDA Writer" << std::endl;
- d_writer = cv::cudacodec::createVideoWriter("output_gpu.avi", frame.size(), FPS);
+ const cv::String outputFilename = "output_gpu.avi";
+ d_writer = cv::cudacodec::createVideoWriter(outputFilename, frame.size(), FPS);
}
d_frame.upload(frame);
}
d_frame.upload(frame);