Various work on range setting.

[dcpomatic.git] / src / lib / imagemagick_encoder.cc

diff --git a/src/lib/imagemagick_encoder.cc b/src/lib/imagemagick_encoder.cc
index 9bd8162f89406cf54b446f0d7e290817d223bfbb..e0e2d1cdcdbce1f4d8e86b1bc84a8ac61f7a6858 100644 (file)
--- a/src/lib/imagemagick_encoder.cc
+++ b/src/lib/imagemagick_encoder.cc
@@ -31,70 +31,60 @@
 #include <Magick++/Image.h>
 #include "imagemagick_encoder.h"
 #include "film.h"
-#include "film_state.h"
 #include "options.h"
 #include "exceptions.h"
 #include "image.h"
 #include "subtitle.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::ofstream;
+using boost::shared_ptr;
 
-/** @param s FilmState of the film that we are encoding.
+/** @param f Film that we are encoding.
  *  @param o Options.
- *  @param l Log.
  */
-ImageMagickEncoder::ImageMagickEncoder (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
-       : Encoder (s, o, l)
+ImageMagickEncoder::ImageMagickEncoder (shared_ptr<const Film> f, shared_ptr<const Options> o)
+       : Encoder (f, o)
 {
        
 }
 
 void
-ImageMagickEncoder::process_video (shared_ptr<Image> image, int frame, shared_ptr<Subtitle> sub)
+ImageMagickEncoder::process_video (shared_ptr<const Image> image, SourceFrame frame, shared_ptr<Subtitle> sub)
 {
-       shared_ptr<Image> scaled = image->scale_and_convert_to_rgb (_opt->out_size, _opt->padding, _fs->scaler);
+       shared_ptr<Image> scaled = image->scale_and_convert_to_rgb (_opt->out_size, _opt->padding, _film->scaler());
        shared_ptr<Image> compact (new CompactImage (scaled));
 
        string tmp_file = _opt->frame_out_path (frame, true);
        Magick::Image thumb (compact->size().width, compact->size().height, "RGB", MagickCore::CharPixel, compact->data()[0]);
        thumb.magick ("PNG");
        thumb.write (tmp_file);
-       filesystem::rename (tmp_file, _opt->frame_out_path (frame, false));
+       boost::filesystem::rename (tmp_file, _opt->frame_out_path (frame, false));
 
        if (sub) {
-               float const x_scale = float (_opt->out_size.width) / _fs->size.width;
-               float const y_scale = float (_opt->out_size.height) / _fs->size.height;
+               float const x_scale = float (_opt->out_size.width) / _film->size().width;
+               float const y_scale = float (_opt->out_size.height) / _film->size().height;
 
                string tmp_metadata_file = _opt->frame_out_path (frame, false, ".sub");
                ofstream metadata (tmp_metadata_file.c_str ());
                
-               list<shared_ptr<SubtitleImage> > images = sub->images ();
-               int n = 0;
-               for (list<shared_ptr<SubtitleImage> >::iterator i = images.begin(); i != images.end(); ++i) {
-                       stringstream ext;
-                       ext << ".sub." << n << ".png";
-
-                       Size new_size = (*i)->image()->size ();
-                       new_size.width *= x_scale;
-                       new_size.height *= y_scale;
-                       shared_ptr<Image> scaled = (*i)->image()->scale (new_size, _fs->scaler);
-                       shared_ptr<Image> compact (new CompactImage (scaled));
-                       
-                       string tmp_sub_file = _opt->frame_out_path (frame, true, ext.str ());
-                       Magick::Image sub_thumb (compact->size().width, compact->size().height, "RGBA", MagickCore::CharPixel, compact->data()[0]);
-                       sub_thumb.magick ("PNG");
-                       sub_thumb.write (tmp_sub_file);
-                       filesystem::rename (tmp_sub_file, _opt->frame_out_path (frame, false, ext.str ()));
-
-                       metadata << "image " << n << "\n"
-                                << "x " << (*i)->position().x << "\n"
-                                << "y " << (*i)->position().y << "\n";
+               Size new_size = sub->image()->size ();
+               new_size.width *= x_scale;
+               new_size.height *= y_scale;
+               shared_ptr<Image> scaled = sub->image()->scale (new_size, _film->scaler());
+               shared_ptr<Image> compact (new CompactImage (scaled));
+               
+               string tmp_sub_file = _opt->frame_out_path (frame, true, ".sub.png");
+               Magick::Image sub_thumb (compact->size().width, compact->size().height, "RGBA", MagickCore::CharPixel, compact->data()[0]);
+               sub_thumb.magick ("PNG");
+               sub_thumb.write (tmp_sub_file);
+               boost::filesystem::rename (tmp_sub_file, _opt->frame_out_path (frame, false, ".sub.png"));
 
-                       metadata.close ();
-                       filesystem::rename (tmp_metadata_file, _opt->frame_out_path (frame, false, ".sub"));
-               }
+               metadata << "x " << sub->position().x << "\n"
+                        << "y " << sub->position().y << "\n";
 
+               metadata.close ();
+               boost::filesystem::rename (tmp_metadata_file, _opt->frame_out_path (frame, false, ".sub"));
        }
        
        frame_done (frame);