projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak crop widgets.
[dcpomatic.git]
/
src
/
lib
/
subtitle.cc
diff --git
a/src/lib/subtitle.cc
b/src/lib/subtitle.cc
index 1af277255462f367337f36194a5d15215bfe0cf2..bd5f0c87969cc76b473c4af506c0c88e913ec235 100644
(file)
--- a/
src/lib/subtitle.cc
+++ b/
src/lib/subtitle.cc
@@
-27,6
+27,7
@@
using namespace std;
using namespace boost;
using namespace std;
using namespace boost;
+using libdcp::Size;
/** Construct a TimedSubtitle. This is a subtitle image, position,
* and a range of time over which it should be shown.
/** Construct a TimedSubtitle. This is a subtitle image, position,
* and a range of time over which it should be shown.
@@
-34,12
+35,12
@@
using namespace boost;
*/
TimedSubtitle::TimedSubtitle (AVSubtitle const & sub)
{
*/
TimedSubtitle::TimedSubtitle (AVSubtitle const & sub)
{
- assert (sub.rects > 0);
+ assert (sub.
num_
rects > 0);
/* Subtitle PTS in seconds (within the source, not taking into account any of the
source that we may have chopped off for the DCP)
*/
/* Subtitle PTS in seconds (within the source, not taking into account any of the
source that we may have chopped off for the DCP)
*/
- double const packet_time =
((sub.pts / AV_TIME_BASE) + float (sub.pts % AV_TIME_BASE) / 1e6)
;
+ double const packet_time =
static_cast<double> (sub.pts) / AV_TIME_BASE
;
/* hence start time for this sub */
_from = packet_time + (double (sub.start_display_time) / 1e3);
/* hence start time for this sub */
_from = packet_time + (double (sub.start_display_time) / 1e3);
@@
-55,7
+56,7
@@
TimedSubtitle::TimedSubtitle (AVSubtitle const & sub)
throw DecodeError ("non-bitmap subtitles not yet supported");
}
throw DecodeError ("non-bitmap subtitles not yet supported");
}
- shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGBA, Size (rect->w, rect->h), true));
+ shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGBA,
libdcp::
Size (rect->w, rect->h), true));
/* Start of the first line in the subtitle */
uint8_t* sub_p = rect->pict.data[0];
/* Start of the first line in the subtitle */
uint8_t* sub_p = rect->pict.data[0];
@@
-77,7
+78,7
@@
TimedSubtitle::TimedSubtitle (AVSubtitle const & sub)
_subtitle.reset (new Subtitle (Position (rect->x, rect->y), image));
}
_subtitle.reset (new Subtitle (Position (rect->x, rect->y), image));
}
-/** @param t Time in seconds from the start of the
film
*/
+/** @param t Time in seconds from the start of the
source
*/
bool
TimedSubtitle::displayed_at (double t) const
{
bool
TimedSubtitle::displayed_at (double t) const
{
@@
-139,7
+140,7
@@
subtitle_transformed_area (
return tx;
}
return tx;
}
-/** @return area that this subtitle take up, in the original uncropped source's coordinate space */
+/** @return area that this subtitle take
s
up, in the original uncropped source's coordinate space */
Rect
Subtitle::area () const
{
Rect
Subtitle::area () const
{