diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-27 22:56:42 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-27 22:56:42 +0000 |
| commit | f508191f9d794e7762270d19a4211739470cfe0d (patch) | |
| tree | f6deb3d3bb14e7d52dbbfe528481f6c9b6120f7b /src/lib/ffmpeg.cc | |
| parent | cb0d899ec71a854e8d54213245812702d85b5670 (diff) | |
Remove some unused code.
Diffstat (limited to 'src/lib/ffmpeg.cc')
| -rw-r--r-- | src/lib/ffmpeg.cc | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index ac179e1d6..5171166d5 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -276,65 +276,6 @@ FFmpeg::subtitle_period (AVSubtitle const & sub) ); } -string -FFmpeg::subtitle_id (AVSubtitle const & sub) -{ - Digester digester; - digester.add (sub.pts); - for (unsigned int i = 0; i < sub.num_rects; ++i) { - AVSubtitleRect* rect = sub.rects[i]; - if (rect->type == SUBTITLE_BITMAP) { - digester.add (rect->x); - digester.add (rect->y); - digester.add (rect->w); - digester.add (rect->h); -#ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT - int const line = rect->pict.linesize[0]; - for (int j = 0; j < rect->h; ++j) { - digester.add (rect->pict.data[0] + j * line, line); - } -#else - int const line = rect->linesize[0]; - for (int j = 0; j < rect->h; ++j) { - digester.add (rect->data[0] + j * line, line); - } -#endif - } else if (rect->type == SUBTITLE_TEXT) { - digester.add (string (rect->text)); - } else if (rect->type == SUBTITLE_ASS) { - digester.add (string (rect->ass)); - } - } - return digester.get (); -} - -/** @return true if sub starts a new image subtitle */ -bool -FFmpeg::subtitle_starts_image (AVSubtitle const & sub) -{ - bool image = false; - bool text = false; - - for (unsigned int i = 0; i < sub.num_rects; ++i) { - switch (sub.rects[i]->type) { - case SUBTITLE_BITMAP: - image = true; - break; - case SUBTITLE_TEXT: - case SUBTITLE_ASS: - text = true; - break; - default: - break; - } - } - - /* We can't cope with mixed image/text in one AVSubtitle */ - DCPOMATIC_ASSERT (!image || !text); - - return image; -} - /** Compute the pts offset to use given a set of audio streams and some video details. * Sometimes these parameters will have just been determined by an Examiner, sometimes * they will have been retrieved from a piece of Content, hence the need for this method |
