Unholy melange of stuff; setup a standard test config; send / receive subs to / from...

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

diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc
index 040a057fcf3ee040af1767db95eadfa519de2e88..2e9a890880ac9239dcd06f7b3ee12ab742feeaed 100644 (file)
--- a/src/lib/subtitle.cc
+++ b/src/lib/subtitle.cc
@@ -34,25 +34,18 @@ Subtitle::Subtitle (AVSubtitle const & sub)
        _from = packet_time + (double (sub.start_display_time) / 1e3);
        _to = packet_time + (double (sub.end_display_time) / 1e3);
 
-       for (unsigned int i = 0; i < sub.num_rects; ++i) {
-               _images.push_back (shared_ptr<SubtitleImage> (new SubtitleImage (sub.rects[i])));
+       if (sub.num_rects > 1) {
+               throw DecodeError ("multi-part subtitles not yet supported");
        }
-}
 
-/** @param t Time in seconds from the start of the film */
-bool
-Subtitle::displayed_at (double t)
-{
-       return t >= _from && t <= _to;
-}
+       AVSubtitleRect const * rect = sub.rects[0];
 
-SubtitleImage::SubtitleImage (AVSubtitleRect const * rect)
-       : _position (rect->x, rect->y)
-       , _image (new SimpleImage (PIX_FMT_RGBA, Size (rect->w, rect->h)))
-{
        if (rect->type != SUBTITLE_BITMAP) {
                throw DecodeError ("non-bitmap subtitles not yet supported");
        }
+       
+       _position = Position (rect->x, rect->y);
+       _image.reset (new AlignedImage (PIX_FMT_RGBA, Size (rect->w, rect->h)));
 
        /* Start of the first line in the subtitle */
        uint8_t* sub_p = rect->pict.data[0];
@@ -63,63 +56,67 @@ SubtitleImage::SubtitleImage (AVSubtitleRect const * rect)
        
        for (int y = 0; y < rect->h; ++y) {
                uint8_t* sub_line_p = sub_p;
+               uint32_t* out_line_p = out_p;
                for (int x = 0; x < rect->w; ++x) {
-                       *out_p++ = palette[*sub_line_p++];
+                       *out_line_p++ = palette[*sub_line_p++];
                }
                sub_p += rect->pict.linesize[0];
+               out_p += _image->stride()[0] / sizeof (uint32_t);
        }
 }
 
-SubtitleTransform
-subtitle_transform (
-       int target_base_width, int target_base_height,
-       float target_x_scale, float target_y_scale,
-       Position sub_pos, int sub_width, int sub_height,
-       shared_ptr<FilmState> fs
-       )
+Subtitle::Subtitle (Position p, shared_ptr<Image> i)
+       : _from (0)
+       , _to (0)
+       , _position (p)
+       , _image (i)
 {
-       SubtitleTransform tx;
-
-       /* The area of the original subtitle, in the coordinate space of the source video frame */
-       Rectangle sub_area (sub_pos.x, sub_pos.y + fs->subtitle_offset, sub_width, sub_height);
 
-       /* The cropped area of the source video frame, in the same coordinate space */
-       Rectangle cropped_target_area (
-               fs->crop.left,
-               fs->crop.top,
-               target_base_width - (fs->crop.left + fs->crop.right),
-               target_base_height - (fs->crop.top + fs->crop.bottom)
-               );
+}
+       
+/** @param t Time in seconds from the start of the film */
+bool
+Subtitle::displayed_at (double t)
+{
+       return t >= _from && t <= _to;
+}
 
-       /* Hence the area of the cropped subtitle, in the same coordinate space */
-       Rectangle cropped_sub_area = sub_area.intersection (cropped_target_area);
+Rectangle
+subtitle_transformed_area (
+       float target_x_scale, float target_y_scale,
+       Rectangle sub_area, int subtitle_offset, float subtitle_scale
+       )
+{
+       Rectangle tx;
 
-       /* The crop that should be applied to the subtitle, in its coordinate space */
-       tx.crop.x = cropped_sub_area.x - sub_area.x;
-       tx.crop.y = cropped_sub_area.y - sub_area.y;
-       tx.crop.w = cropped_sub_area.w;
-       tx.crop.h = cropped_sub_area.h;
+       sub_area.y += subtitle_offset;
 
        /* We will scale the subtitle by the same amount as the video frame, and also by the additional
           subtitle_scale
        */
-       tx.transformed.w = cropped_sub_area.w * target_x_scale * fs->subtitle_scale;
-       tx.transformed.h = cropped_sub_area.h * target_y_scale * fs->subtitle_scale;
+       tx.w = sub_area.w * target_x_scale * subtitle_scale;
+       tx.h = sub_area.h * target_y_scale * subtitle_scale;
 
        /* Then we need a corrective translation, consisting of two parts:
         *
         * 1.  that which is the result of the scaling of the subtitle by target_x_scale and target_y_scale; this will be
-        *     (sub_area.x - fs->crop_left) * target_x_scale and (sub_area.y - fs->crop_top) * target_y_scale.
+        *     sub_area.x * target_x_scale and sub_area.y * target_y_scale.
         *
-        * 2.  that to shift the origin of the scale by fs->subtitle_scale to the centre of the subtitle; this will be
-        *     (width_before_subtitle_scale * (1 - fs->subtitle_scale) / 2) and
-        *     (height_before_subtitle_scale * (1 - fs->subtitle_scale) / 2).
+        * 2.  that to shift the origin of the scale by subtitle_scale to the centre of the subtitle; this will be
+        *     (width_before_subtitle_scale * (1 - subtitle_scale) / 2) and
+        *     (height_before_subtitle_scale * (1 - subtitle_scale) / 2).
         *
         * Combining these two translations gives these expressions.
         */
        
-       tx.transformed.x = target_x_scale * ((sub_area.x - fs->crop.left) + (cropped_sub_area.w * (1 - fs->subtitle_scale) / 2));
-       tx.transformed.y = target_y_scale * ((sub_area.y - fs->crop.top) + (cropped_sub_area.h * (1 - fs->subtitle_scale) / 2));
+       tx.x = target_x_scale * (sub_area.x + (sub_area.w * (1 - subtitle_scale) / 2));
+       tx.y = target_y_scale * (sub_area.y + (sub_area.h * (1 - subtitle_scale) / 2));
 
        return tx;
 }
+
+Rectangle
+Subtitle::area () const
+{
+       return Rectangle (_position.x, _position.y, _image->size().width, _image->size().height);
+}