/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 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
#include "lib/film.h"
#include "lib/filter.h"
#include "lib/util.h"
-#include "lib/scaler.h"
#include "lib/server.h"
#include "lib/dcp_video.h"
#include "lib/decoder.h"
#include "lib/exceptions.h"
-#include "lib/scaler.h"
#include "lib/log.h"
#include "lib/video_decoder.h"
#include "lib/player.h"
#include "lib/player_video.h"
-#include "lib/encoded_data.h"
+#include "lib/data.h"
using std::cout;
using std::cerr;
++frame_count;
- shared_ptr<EncodedData> local_encoded = local->encode_locally ();
- shared_ptr<EncodedData> remote_encoded;
+ Data local_encoded = local->encode_locally (boost::bind (&Log::dcp_log, log_.get(), _1, _2));
+ Data remote_encoded;
string remote_error;
try {
return;
}
- if (local_encoded->size() != remote_encoded->size()) {
+ if (local_encoded.size() != remote_encoded.size()) {
cout << "\033[0;31msizes differ\033[0m\n";
return;
}
- uint8_t* p = local_encoded->data();
- uint8_t* q = remote_encoded->data();
- for (int i = 0; i < local_encoded->size(); ++i) {
+ uint8_t* p = local_encoded.data().get ();
+ uint8_t* q = remote_encoded.data().get ();
+ for (int i = 0; i < local_encoded.size(); ++i) {
if (*p++ != *q++) {
cout << "\033[0;31mdata differ\033[0m at byte " << i << "\n";
return;
film.reset (new Film (film_dir));
film->read_metadata ();
- shared_ptr<Player> player = film->make_player ();
+ shared_ptr<Player> player (new Player (film));
DCPTime const frame = DCPTime::from_frames (1, film->video_frame_rate ());
for (DCPTime t; t < film->length(); t += frame) {