projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trying to create export audio encoders with between 9 and 15 channels
[dcpomatic.git]
/
src
/
lib
/
examine_ffmpeg_subtitles_job.cc
diff --git
a/src/lib/examine_ffmpeg_subtitles_job.cc
b/src/lib/examine_ffmpeg_subtitles_job.cc
index af548b7944529100d2d57e3ec925e85f6255f6e4..b2bba11cd05707acf1c32647e48dc2754bcd3d2a 100644
(file)
--- a/
src/lib/examine_ffmpeg_subtitles_job.cc
+++ b/
src/lib/examine_ffmpeg_subtitles_job.cc
@@
-43,6
+43,11
@@
ExamineFFmpegSubtitlesJob::ExamineFFmpegSubtitlesJob (shared_ptr<const Film> fil
}
}
+ExamineFFmpegSubtitlesJob::~ExamineFFmpegSubtitlesJob ()
+{
+ stop_thread ();
+}
+
string
ExamineFFmpegSubtitlesJob::name () const
{
string
ExamineFFmpegSubtitlesJob::name () const
{
@@
-82,16
+87,17
@@
ExamineFFmpegSubtitlesJob::run ()
/* sub_p looks up into a BGRA palette which is here
(i.e. first byte B, second G, third R, fourth A)
*/
/* sub_p looks up into a BGRA palette which is here
(i.e. first byte B, second G, third R, fourth A)
*/
- uint
32_t const * palette = (uint32_t *)
rect->pict.data[1];
+ uint
8_t const * palette =
rect->pict.data[1];
#else
/* sub_p looks up into a BGRA palette which is here
(i.e. first byte B, second G, third R, fourth A)
*/
#else
/* sub_p looks up into a BGRA palette which is here
(i.e. first byte B, second G, third R, fourth A)
*/
- uint
32_t const * palette = (uint32_t *)
rect->data[1];
+ uint
8_t const * palette =
rect->data[1];
#endif
for (int j = 0; j < rect->nb_colors; ++j) {
#endif
for (int j = 0; j < rect->nb_colors; ++j) {
- RGBA c (
(palette[j] & 0xff0000) >> 16, (palette[j] & 0xff00) >> 8, palette[j] & 0xff, (palette[j] & 0xff000000) >> 24
);
+ RGBA c (
palette[2], palette[1], palette[0], palette[3]
);
_content->subtitle_stream()->set_colour (c, c);
_content->subtitle_stream()->set_colour (c, c);
+ palette += 4;
}
}
}
}
}
}