summaryrefslogtreecommitdiff
path: root/src/lib/combiner.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-11-18 22:46:15 +0000
committerCarl Hetherington <cth@carlh.net>2012-11-18 22:46:15 +0000
commitb1defe9019642dc4b80697291d40ed88f09de8be (patch)
tree80f29e64acb805c21ea96e7e4ec070a88ca2397d /src/lib/combiner.cc
parent81dab3aaea745ddef97166448cb0730520798356 (diff)
Fix mis-alignment of copied AlignedImages; add some asserts; some docs.
Diffstat (limited to 'src/lib/combiner.cc')
-rw-r--r--src/lib/combiner.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
index 888046bc4..b85dbf288 100644
--- a/src/lib/combiner.cc
+++ b/src/lib/combiner.cc
@@ -28,16 +28,25 @@ Combiner::Combiner (Log* log)
}
+/** Process video for the left half of the frame.
+ * @param image Frame image.
+ * @param sub Subtitle (which will be ignored)
+ */
void
Combiner::process_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
{
_image = image;
}
+/** Process video for the right half of the frame.
+ * @param image Frame image.
+ * @param sub Subtitle (which will be put onto the whole frame)
+ */
void
Combiner::process_video_b (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
{
/* Copy the right half of this image into our _image */
+ /* XXX: this should probably be in the Image class */
for (int i = 0; i < image->components(); ++i) {
int const line_size = image->line_size()[i];
int const half_line_size = line_size / 2;