Reasonably straightforward stuff; main things are adding

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

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 294c0da8c22d0b0e7bcb8ad682645247efa4be30..5240decb24dfd69e74650b31a2de3b13ab8c8f18 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -65,18 +65,19 @@ using std::list;
 using std::min;
 using std::pair;
 using std::max;
+using std::map;
 using boost::shared_ptr;
 using boost::is_any_of;
 using boost::split;
 using dcp::Size;
 
 FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log, bool fast)
-       : VideoDecoder (c)
+       : VideoDecoder (c->video, log)
        , AudioDecoder (c, fast)
        , SubtitleDecoder (c)
        , FFmpeg (c)
        , _log (log)
-       , _pts_offset (pts_offset (c->ffmpeg_audio_streams(), c->first_video(), c->video_frame_rate()))
+       , _pts_offset (pts_offset (c->ffmpeg_audio_streams(), c->first_video(), c->video->video_frame_rate()))
 {
 
 }
@@ -129,7 +130,7 @@ FFmpegDecoder::pass (PassReason reason, bool accurate)
                decode_audio_packet ();
        }
 
-       av_free_packet (&_packet);
+       av_packet_unref (&_packet);
        return false;
 }
 
@@ -217,6 +218,17 @@ FFmpegDecoder::deinterleave_audio (shared_ptr<FFmpegAudioStream> stream) const
        }
        break;
 
+       case AV_SAMPLE_FMT_S32P:
+       {
+               int32_t** p = reinterpret_cast<int32_t **> (_frame->data);
+               for (int i = 0; i < stream->channels(); ++i) {
+                       for (int j = 0; j < frames; ++j) {
+                               audio->data(i)[j] = static_cast<float>(p[i][j]) / (1 << 31);
+                       }
+               }
+       }
+       break;
+
        case AV_SAMPLE_FMT_FLT:
        {
                float* p = reinterpret_cast<float*> (_frame->data[0]);
@@ -402,7 +414,7 @@ FFmpegDecoder::decode_video_packet ()
                        double const pts = i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _pts_offset.seconds ();
                        video (
                                shared_ptr<ImageProxy> (new RawImageProxy (image)),
-                               llrint (pts * _ffmpeg_content->video_frame_rate ())
+                               llrint (pts * _ffmpeg_content->video->video_frame_rate ())
                                );
                } else {
                        LOG_WARNING_NC ("Dropping frame without PTS");
@@ -483,12 +495,40 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP
        */
        shared_ptr<Image> image (new Image (AV_PIX_FMT_RGBA, dcp::Size (rect->w, rect->h), true));
 
+#ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT
        /* Start of the first line in the subtitle */
        uint8_t* sub_p = rect->pict.data[0];
        /* sub_p looks up into a BGRA palette which is here
           (i.e. first byte B, second G, third R, fourth A)
        */
        uint32_t const * palette = (uint32_t *) rect->pict.data[1];
+#else
+       /* Start of the first line in the subtitle */
+       uint8_t* sub_p = rect->data[0];
+       /* sub_p looks up into a BGRA palette which is here
+          (i.e. first byte B, second G, third R, fourth A)
+       */
+       uint32_t const * palette = (uint32_t *) rect->data[1];
+#endif
+       /* And the stream has a map of those palette colours to colours
+          chosen by the user; created a `mapped' palette from those settings.
+       */
+       map<RGBA, RGBA> colour_map = ffmpeg_content()->subtitle_stream()->colours ();
+       vector<RGBA> mapped_palette (rect->nb_colors);
+       for (int i = 0; i < rect->nb_colors; ++i) {
+               RGBA c ((palette[i] & 0xff0000) >> 16, (palette[i] & 0xff00) >> 8, palette[i] & 0xff, (palette[i] & 0xff000000) >> 24);
+               map<RGBA, RGBA>::const_iterator j = colour_map.find (c);
+               if (j != colour_map.end ()) {
+                       mapped_palette[i] = j->second;
+               } else {
+                       /* This colour was not found in the FFmpegSubtitleStream's colour map; probably because
+                          it is from a project that was created before this stuff was added.  Just use the
+                          colour straight from the original palette.
+                       */
+                       mapped_palette[i] = c;
+               }
+       }
+
        /* Start of the output data */
        uint32_t* out_p = (uint32_t *) image->data()[0];
 
@@ -496,14 +536,19 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP
                uint8_t* sub_line_p = sub_p;
                uint32_t* out_line_p = out_p;
                for (int x = 0; x < rect->w; ++x) {
-                       uint32_t const p = palette[*sub_line_p++];
-                       *out_line_p++ = ((p & 0xff) << 16) | (p & 0xff00) | ((p & 0xff0000) >> 16) | (p & 0xff000000);
+                       RGBA const p = mapped_palette[*sub_line_p++];
+                       /* XXX: this seems to be wrong to me (isn't the output image RGBA?) but it looks right on screen */
+                       *out_line_p++ = (p.a << 24) | (p.r << 16) | (p.g << 8) | p.b;
                }
+#ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT
                sub_p += rect->pict.linesize[0];
+#else
+               sub_p += rect->linesize[0];
+#endif
                out_p += image->stride()[0] / sizeof (uint32_t);
        }
 
-       dcp::Size const vs = _ffmpeg_content->video_size ();
+       dcp::Size const vs = _ffmpeg_content->video->video_size ();
        dcpomatic::Rect<double> const scaled_rect (
                static_cast<double> (rect->x) / vs.width,
                static_cast<double> (rect->y) / vs.height,
@@ -552,6 +597,7 @@ FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period)
                                        dcp::SubtitleString (
                                                boost::optional<string> (),
                                                k.italic,
+                                               k.bold,
                                                dcp::Colour (255, 255, 255),
                                                /* 48pt is 1/22nd of the screen height */
                                                48,
@@ -565,6 +611,7 @@ FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period)
                                                */
                                                1.015 - ((1 + highest - j.vertical_position.line.get()) * 1.5 / 22),
                                                dcp::VALIGN_TOP,
+                                               dcp::DIRECTION_LTR,
                                                k.text,
                                                static_cast<dcp::Effect> (0),
                                                dcp::Colour (255, 255, 255),