/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#include "lib/ratio.h"
-#include "lib/film.h"
-#include "lib/filter.h"
-#include "lib/util.h"
-#include "lib/encode_server.h"
+
#include "lib/dcp_video.h"
#include "lib/decoder.h"
+#include "lib/encode_server.h"
+#include "lib/encode_server_description.h"
#include "lib/exceptions.h"
#include "lib/file_log.h"
-#include "lib/video_decoder.h"
+#include "lib/film.h"
+#include "lib/filter.h"
#include "lib/player.h"
#include "lib/player_video.h"
-#include "lib/encode_server_description.h"
+#include "lib/ratio.h"
+#include "lib/util.h"
+#include "lib/video_decoder.h"
#include <getopt.h>
-#include <iostream>
-#include <iomanip>
#include <exception>
+#include <iomanip>
+#include <iostream>
+
-using std::cout;
using std::cerr;
-using std::string;
+using std::cout;
+using std::make_shared;
using std::pair;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::string;
using boost::optional;
using boost::bind;
-using dcp::Data;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using dcp::ArrayData;
+
static shared_ptr<Film> film;
static EncodeServerDescription* server;
static int frame_count = 0;
+
void
process_video (shared_ptr<PlayerVideo> pvf)
{
- shared_ptr<DCPVideo> local (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K));
- shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K));
+ auto local = make_shared<DCPVideo>(pvf, frame_count, film->video_frame_rate(), 250000000, Resolution::TWO_K);
+ auto remote = make_shared<DCPVideo>(pvf, frame_count, film->video_frame_rate(), 250000000, Resolution::TWO_K);
cout << "Frame " << frame_count << ": ";
cout.flush ();
++frame_count;
- Data local_encoded = local->encode_locally ();
- Data remote_encoded;
+ auto local_encoded = local->encode_locally ();
+ ArrayData remote_encoded;
string remote_error;
try {
remote_error = e.what ();
}
- if (!remote_error.empty ()) {
+ if (!remote_error.empty()) {
cout << "\033[0;31mnetwork problem: " << remote_error << "\033[0m\n";
return;
}
return;
}
- uint8_t* p = local_encoded.data().get ();
- uint8_t* q = remote_encoded.data().get ();
+ auto p = local_encoded.data();
+ auto q = remote_encoded.data();
for (int i = 0; i < local_encoded.size(); ++i) {
if (*p++ != *q++) {
cout << "\033[0;31mdata differ\033[0m at byte " << i << "\n";
cout << "\033[0;32mgood\033[0m\n";
}
+
static void
help (string n)
{
exit (EXIT_FAILURE);
}
+
int
main (int argc, char* argv[])
{
try {
server = new EncodeServerDescription (server_host, 1, SERVER_LINK_VERSION);
- film.reset (new Film (film_dir));
+ film = make_shared<Film>(film_dir);
film->read_metadata ();
- shared_ptr<Player> player (new Player (film, film->playlist ()));
- player->Video.connect (bind (&process_video, _1));
+ auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+ player->Video.connect (bind(&process_video, _1));
while (!player->pass ()) {}
} catch (std::exception& e) {
cerr << "Error: " << e.what() << "\n";