diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-26 16:34:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-26 16:34:54 +0100 |
| commit | cd30cdbaf4188425ab0610b088dba81496144ccd (patch) | |
| tree | 5d104944273d7255a4631d2b6ca8d853d87cb6de /src/lib/ffmpeg_decoder.cc | |
| parent | 3d3d9d7aaeadbd9325ba8609f0d31961149c35a4 (diff) | |
Pass configured colours / outlining when text subtitles come out of FFmpeg.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 5352f176a..57d300e18 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -40,6 +40,7 @@ #include "md5_digester.h" #include "audio_decoder.h" #include "compose.hpp" +#include "subtitle_content.h" #include <dcp/subtitle_string.h> #include <sub/ssa_reader.h> #include <sub/subtitle.h> @@ -637,7 +638,7 @@ FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period) boost::optional<string> (), k.italic, k.bold, - dcp::Colour (255, 255, 255), + subtitle->content()->colour(), /* 48pt is 1/22nd of the screen height */ 48, 1, @@ -652,8 +653,8 @@ FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period) dcp::VALIGN_TOP, dcp::DIRECTION_LTR, k.text, - static_cast<dcp::Effect> (0), - dcp::Colour (255, 255, 255), + subtitle->content()->outline() ? dcp::BORDER : dcp::NONE, + subtitle->content()->outline_colour(), dcp::Time (), dcp::Time () ) |