summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-05-14 10:05:56 +0100
committerCarl Hetherington <cth@carlh.net>2014-05-14 10:05:56 +0100
commit8f7d0cf115980cb357bc3da410842503930e66b8 (patch)
treec555292c0d7b2096f80c89c586137dd57f923e57 /src/tools
parentefc8654faceec410649901ee534861904d11e432 (diff)
Rename PlayerImage to PlayerVideoFrame and give it its own file.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/server_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 039088862..48d817cfe 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -34,6 +34,7 @@
#include "lib/log.h"
#include "lib/video_decoder.h"
#include "lib/player.h"
+#include "lib/player_video_frame.h"
using std::cout;
using std::cerr;
@@ -47,7 +48,7 @@ static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
static int frame = 0;
void
-process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, Time)
+process_video (shared_ptr<PlayerVideoFrame> image, Eyes eyes, ColourConversion conversion, Time)
{
shared_ptr<DCPVideoFrame> local (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));