#include "log.h"
#include "ffmpeg_subtitle_stream.h"
#include "ffmpeg_audio_stream.h"
+#include "md5_digester.h"
#include "compose.hpp"
extern "C" {
#include <libavcodec/avcodec.h>
if (log) {
string str (line);
boost::algorithm::trim (str);
- log->log (String::compose ("FFmpeg: %1", str), Log::TYPE_GENERAL);
+ log->log (String::compose ("FFmpeg: %1", str), LogEntry::TYPE_GENERAL);
} else {
cerr << line;
}
);
}
+string
+FFmpeg::subtitle_id (AVSubtitle const & sub)
+{
+ MD5Digester digester;
+ digester.add (sub.pts);
+ for (unsigned int i = 0; i < sub.num_rects; ++i) {
+ AVSubtitleRect* rect = sub.rects[i];
+ digester.add (rect->x);
+ digester.add (rect->y);
+ digester.add (rect->w);
+ digester.add (rect->h);
+ int const line = rect->pict.linesize[0];
+ for (int j = 0; j < rect->h; ++j) {
+ digester.add (rect->pict.data[0] + j * line, line);
+ }
+ }
+ return digester.get ();
+}
+
/** 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
/* Now adjust so that the video pts starts on a frame */
if (first_video) {
- po += first_video.get().round_up (video_frame_rate) - first_video.get();
+ ContentTime const fvc = first_video.get() + po;
+ po += fvc.round_up (video_frame_rate) - fvc;
}
return po;