third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #977 from jet47:gpucodec-refactoring

Browse Source
This commit is contained in:
Roman Donchenko
2013-06-14 16:24:23 +04:00
committed by OpenCV Buildbot
parent 2fc49ac564 76211709a3
commit 71db862dc2
26 changed files with 1381 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/gpu/video_reader.cpp
+2 -3
View File
@@ -30,8 +30,7 @@ int main(int argc, const char* argv[])
cv::VideoCapture reader(fname);
cv::gpu::GpuMat d_frame;
cv::gpu::VideoReader_GPU d_reader(fname);
d_reader.dumpFormat(std::cout);
cv::Ptr<cv::gpucodec::VideoReader> d_reader = cv::gpucodec::createVideoReader(fname);
cv::TickMeter tm;
std::vector<double> cpu_times;
@@ -46,7 +45,7 @@ int main(int argc, const char* argv[])
cpu_times.push_back(tm.getTimeMilli());
tm.reset(); tm.start();
if (!d_reader.read(d_frame))
if (!d_reader->nextFrame(d_frame))
break;
tm.stop();
gpu_times.push_back(tm.getTimeMilli());
samples/gpu/video_writer.cpp
+4 -4
View File
@@ -33,7 +33,7 @@ int main(int argc, const char* argv[])
cv::gpu::printShortCudaDeviceInfo(cv::gpu::getDevice());
cv::VideoWriter writer;
cv::gpu::VideoWriter_GPU d_writer;
cv::Ptr<cv::gpucodec::VideoWriter> d_writer;
cv::Mat frame;
cv::gpu::GpuMat d_frame;
@@ -64,11 +64,11 @@ int main(int argc, const char* argv[])
return -1;
}
if (!d_writer.isOpened())
if (d_writer.empty())
{
std::cout << "Open GPU Writer" << std::endl;
d_writer.open("output_gpu.avi", frame.size(), FPS);
d_writer = cv::gpucodec::createVideoWriter("output_gpu.avi", frame.size(), FPS);
}
d_frame.upload(frame);
@@ -81,7 +81,7 @@ int main(int argc, const char* argv[])
cpu_times.push_back(tm.getTimeMilli());
tm.reset(); tm.start();
d_writer.write(d_frame);
d_writer->write(d_frame);
tm.stop();
gpu_times.push_back(tm.getTimeMilli());
}