From 3882d34aed9dee417ceed93bf0bf5372b3970ff6 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 17 Jan 2013 20:49:09 +0000
Subject: Basics of doing trim using asset entry point / duration.

---
 src/lib/encoder.cc | 32 --------------------------------
 1 file changed, 32 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 35b43e334..c32d68834 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -286,14 +286,6 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		return;
 	}
 
-	if (_film->video_range ()) {
-		pair<SourceFrame, SourceFrame> const r = _film->video_range().get();
-		if (_video_frame < r.first || _video_frame >= r.second) {
-			++_video_frame;
-			return;
-		}
-	}
-
 	boost::mutex::scoped_lock lock (_worker_mutex);
 
 	/* Wait until the queue has gone down a bit */
@@ -343,30 +335,6 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 void
 Encoder::process_audio (shared_ptr<AudioBuffers> data)
 {
-	if (_film->audio_range ()) {
-		shared_ptr<AudioBuffers> trimmed (new AudioBuffers (*data.get ()));
-		
-		/* Range that we are encoding */
-		pair<int64_t, int64_t> required_range = _film->audio_range().get();
-		/* Range of this block of data */
-		pair<int64_t, int64_t> this_range (_audio_frame, _audio_frame + trimmed->frames());
-
-		if (this_range.second < required_range.first || required_range.second < this_range.first) {
-			/* No part of this audio is within the required range */
-			return;
-		} else if (required_range.first >= this_range.first && required_range.first < this_range.second) {
-			/* Trim start */
-			int64_t const shift = required_range.first - this_range.first;
-			trimmed->move (shift, 0, trimmed->frames() - shift);
-			trimmed->set_frames (trimmed->frames() - shift);
-		} else if (required_range.second >= this_range.first && required_range.second < this_range.second) {
-			/* Trim end */
-			trimmed->set_frames (required_range.second - this_range.first);
-		}
-
-		data = trimmed;
-	}
-
 #if HAVE_SWRESAMPLE
 	/* Maybe sample-rate convert */
 	if (_swr_context) {
-- 
cgit v1.2.3