/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "lib/film.h"
#include "lib/filter.h"
#include "lib/util.h"
-#include "lib/server.h"
+#include "lib/encode_server.h"
#include "lib/dcp_video.h"
#include "lib/decoder.h"
#include "lib/exceptions.h"
-#include "lib/log.h"
+#include "lib/file_log.h"
#include "lib/video_decoder.h"
#include "lib/player.h"
#include "lib/player_video.h"
-#include "lib/data.h"
-#include "lib/server_description.h"
+#include "lib/encode_server_description.h"
#include <getopt.h>
#include <iostream>
#include <iomanip>
using std::string;
using std::pair;
using boost::shared_ptr;
+using boost::optional;
+using boost::bind;
+using dcp::Data;
static shared_ptr<Film> film;
-static ServerDescription* server;
-static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
+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, log_));
- shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
+ 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));
cout << "Frame " << frame_count << ": ";
cout.flush ();
++frame_count;
- Data local_encoded = local->encode_locally (boost::bind (&Log::dcp_log, log_.get(), _1, _2));
+ Data local_encoded = local->encode_locally ();
Data remote_encoded;
string remote_error;
int
main (int argc, char* argv[])
{
- string film_dir;
+ boost::filesystem::path film_dir;
string server_host;
while (true) {
}
}
- if (server_host.empty() || film_dir.empty()) {
+ if (server_host.empty() || film_dir.string().empty()) {
help (argv[0]);
exit (EXIT_FAILURE);
}
dcpomatic_setup ();
try {
- server = new ServerDescription (server_host, 1);
+ server = new EncodeServerDescription (server_host, 1, SERVER_LINK_VERSION);
film.reset (new Film (film_dir));
film->read_metadata ();
shared_ptr<Player> player (new Player (film, film->playlist ()));
-
- DCPTime const frame = DCPTime::from_frames (1, film->video_frame_rate ());
- for (DCPTime t; t < film->length(); t += frame) {
- process_video (player->get_video(t, true).front ());
- }
+ player->Video.connect (bind (&process_video, _1));
+ while (!player->pass ()) {}
} catch (std::exception& e) {
cerr << "Error: " << e.what() << "\n";
}