diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-14 19:27:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-14 19:27:04 +0100 |
| commit | 21e8238484af35ac207b01defe406e73445632be (patch) | |
| tree | 8985d03f7b5641fd4e160d5ca4cac253976d51ff /test | |
| parent | 5c09a82e483593fb37da0cad20679be735887613 (diff) | |
Make DCPVideoFrame use PlayerVideoFrame to store its image.
Diffstat (limited to 'test')
| -rw-r--r-- | test/client_server_test.cc | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 1ad156ae3..2b0e96775 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,6 +23,8 @@ #include "lib/image.h" #include "lib/cross.h" #include "lib/dcp_video_frame.h" +#include "lib/scaler.h" +#include "lib/player_video_frame.h" using std::list; using boost::shared_ptr; @@ -67,16 +69,26 @@ BOOST_AUTO_TEST_CASE (client_server_test) p += sub_image->stride()[0]; } -// shared_ptr<Subtitle> subtitle (new Subtitle (Position<int> (50, 60), sub_image)); + shared_ptr<PlayerVideoFrame> pvf ( + new PlayerVideoFrame ( + image, + Crop (), + libdcp::Size (1998, 1080), + libdcp::Size (1998, 1080), + Scaler::from_id ("bicubic"), + EYES_BOTH, + ColourConversion () + ) + ); + + pvf->set_subtitle (sub_image, Position<int> (50, 60)); shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log")); shared_ptr<DCPVideoFrame> frame ( new DCPVideoFrame ( - image, + pvf, 0, - EYES_BOTH, - ColourConversion (), 24, 200000000, RESOLUTION_2K, |