X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=85c5d3297d0d6a8acb704f523bf70d01524446e4;hb=d311043bf3c1e3e7f41b314f7ab7c91ed7e5aa7f;hp=a67b244f75392b4803a7d1638372c80e216f1070;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index a67b244f7..85c5d3297 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,148 +18,180 @@
 
 */
 
-#include "dcp_decoder.h"
-#include "dcp_content.h"
+
+#include "atmos_decoder.h"
 #include "audio_content.h"
-#include "video_decoder.h"
 #include "audio_decoder.h"
-#include "j2k_image_proxy.h"
-#include "text_decoder.h"
+#include "config.h"
+#include "dcp_content.h"
+#include "dcp_decoder.h"
+#include "digester.h"
 #include "ffmpeg_image_proxy.h"
+#include "frame_interval_checker.h"
 #include "image.h"
-#include "config.h"
-#include <dcp/dcp.h>
+#include "j2k_image_proxy.h"
+#include "text_decoder.h"
+#include "video_decoder.h"
 #include <dcp/cpl.h>
-#include <dcp/reel.h>
+#include <dcp/dcp.h>
+#include <dcp/decrypted_kdm.h>
 #include <dcp/mono_picture_asset.h>
 #include <dcp/mono_picture_asset_reader.h>
-#include <dcp/stereo_picture_asset.h>
-#include <dcp/stereo_picture_asset_reader.h>
+#include <dcp/mono_picture_frame.h>
+#include <dcp/reel.h>
+#include <dcp/reel_atmos_asset.h>
+#include <dcp/reel_closed_caption_asset.h>
 #include <dcp/reel_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
 #include <dcp/reel_subtitle_asset.h>
-#include <dcp/reel_closed_caption_asset.h>
-#include <dcp/mono_picture_frame.h>
-#include <dcp/stereo_picture_frame.h>
-#include <dcp/sound_frame.h>
 #include <dcp/sound_asset_reader.h>
+#include <dcp/sound_frame.h>
+#include <dcp/stereo_picture_asset.h>
+#include <dcp/stereo_picture_asset_reader.h>
+#include <dcp/stereo_picture_frame.h>
 #include <dcp/subtitle_image.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
-using std::list;
+
 using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+using std::list;
+using std::make_shared;
+using std::map;
+using std::shared_ptr;
+using std::string;
+using std::vector;
 using boost::optional;
+using namespace dcpomatic;
 
-DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, bool fast)
-	: DCP (c)
-	, _decode_referenced (false)
+
+DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent> content, bool fast, bool tolerant, shared_ptr<DCPDecoder> old)
+	: DCP (content, tolerant)
+	, Decoder (film)
 {
-	if (c->video) {
-		video.reset (new VideoDecoder (this, c));
-	}
-	if (c->audio) {
-		audio.reset (new AudioDecoder (this, c->audio, fast));
-	}
-	BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
-		/* XXX: this time here should be the time of the first subtitle, not 0 */
-		text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, i, ContentTime())));
+	if (content->can_be_played()) {
+		if (content->video) {
+			video = make_shared<VideoDecoder>(this, content);
+		}
+		if (content->audio) {
+			audio = make_shared<AudioDecoder>(this, content->audio, fast);
+		}
+		for (auto i: content->text) {
+			/* XXX: this time here should be the time of the first subtitle, not 0 */
+			text.push_back (make_shared<TextDecoder>(this, i, ContentTime()));
+		}
+		if (content->atmos) {
+			atmos = make_shared<AtmosDecoder>(this, content);
+		}
 	}
 
-	list<shared_ptr<dcp::CPL> > cpl_list = cpls ();
+	/* We try to avoid re-scanning the DCP's files every time we make a new DCPDecoder; we do this
+	   by re-using the _reels list.  Before we do this we need to check that nothing too serious
+	   has changed in the DCPContent.
 
-	if (cpl_list.empty()) {
-		throw DCPError (_("No CPLs found in DCP."));
-	}
+	   We do this by storing a digest of the important bits of the DCPContent and then checking that's
+	   the same before we re-use _reels.
+	*/
+
+	_lazy_digest = calculate_lazy_digest (content);
+
+	if (old && old->lazy_digest() == _lazy_digest) {
+		_reels = old->_reels;
+	} else {
 
-	shared_ptr<dcp::CPL> cpl;
-	BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpl_list) {
-		if (_dcp_content->cpl() && i->id() == _dcp_content->cpl().get()) {
-			cpl = i;
+		auto cpl_list = cpls ();
+
+		if (cpl_list.empty()) {
+			throw DCPError (_("No CPLs found in DCP."));
 		}
-	}
 
-	if (!cpl) {
-		/* No CPL found; probably an old file that doesn't specify it;
-		   just use the first one.
-		*/
-		cpl = cpls().front ();
+		shared_ptr<dcp::CPL> cpl;
+		for (auto i: cpl_list) {
+			if (_dcp_content->cpl() && i->id() == _dcp_content->cpl().get()) {
+				cpl = i;
+			}
+		}
+
+		if (!cpl) {
+			/* No CPL found; probably an old file that doesn't specify it;
+			   just use the first one.
+			*/
+			cpl = cpls().front ();
+		}
+
+		_reels = cpl->reels ();
 	}
 
 	set_decode_referenced (false);
 
-	_reels = cpl->reels ();
-
 	_reel = _reels.begin ();
-	_offset = 0;
 	get_readers ();
 }
 
 
 bool
-DCPDecoder::pass (shared_ptr<const Film> film)
+DCPDecoder::pass ()
 {
-	if (_reel == _reels.end () || !_dcp_content->can_be_played ()) {
+	if (!_dcp_content->can_be_played()) {
 		return true;
 	}
 
-	double const vfr = _dcp_content->active_video_frame_rate (film);
+	if (_reel == _reels.end()) {
+		if (audio) {
+			audio->flush ();
+		}
+		return true;
+	}
+
+	auto const vfr = _dcp_content->active_video_frame_rate (film());
 
 	/* Frame within the (played part of the) reel that is coming up next */
-	int64_t const frame = _next.frames_round (vfr);
+	auto const frame = _next.frames_round (vfr);
 
-	shared_ptr<dcp::PictureAsset> picture_asset = (*_reel)->main_picture()->asset();
+	auto picture_asset = (*_reel)->main_picture()->asset();
 	DCPOMATIC_ASSERT (picture_asset);
 
 	/* We must emit texts first as when we emit the video for this frame
 	   it will expect already to have the texts.
 	*/
-	pass_texts (film, _next, picture_asset->size());
+	pass_texts (_next, picture_asset->size());
 
 	if ((_mono_reader || _stereo_reader) && (_decode_referenced || !_dcp_content->reference_video())) {
-		int64_t const entry_point = (*_reel)->main_picture()->entry_point ();
+		auto const entry_point = (*_reel)->main_picture()->entry_point().get_value_or(0);
 		if (_mono_reader) {
 			video->emit (
-				film,
-				shared_ptr<ImageProxy> (
-					new J2KImageProxy (
-						_mono_reader->get_frame (entry_point + frame),
-						picture_asset->size(),
-						AV_PIX_FMT_XYZ12LE,
-						_forced_reduction
-						)
+				film(),
+				std::make_shared<J2KImageProxy>(
+					_mono_reader->get_frame (entry_point + frame),
+					picture_asset->size(),
+					AV_PIX_FMT_XYZ12LE,
+					_forced_reduction
 					),
 				_offset + frame
 				);
 		} else {
 			video->emit (
-				film,
-				shared_ptr<ImageProxy> (
-					new J2KImageProxy (
-						_stereo_reader->get_frame (entry_point + frame),
-						picture_asset->size(),
-						dcp::EYE_LEFT,
-						AV_PIX_FMT_XYZ12LE,
-						_forced_reduction
-						)
+				film(),
+				std::make_shared<J2KImageProxy>(
+					_stereo_reader->get_frame (entry_point + frame),
+					picture_asset->size(),
+					dcp::Eye::LEFT,
+					AV_PIX_FMT_XYZ12LE,
+					_forced_reduction
 					),
 				_offset + frame
 				);
 
 			video->emit (
-				film,
-				shared_ptr<ImageProxy> (
-					new J2KImageProxy (
-						_stereo_reader->get_frame (entry_point + frame),
-						picture_asset->size(),
-						dcp::EYE_RIGHT,
-						AV_PIX_FMT_XYZ12LE,
-						_forced_reduction
-						)
+				film(),
+				std::make_shared<J2KImageProxy>(
+					_stereo_reader->get_frame (entry_point + frame),
+					picture_asset->size(),
+					dcp::Eye::RIGHT,
+					AV_PIX_FMT_XYZ12LE,
+					_forced_reduction
 					),
 				_offset + frame
 				);
@@ -167,14 +199,14 @@ DCPDecoder::pass (shared_ptr<const Film> film)
 	}
 
 	if (_sound_reader && (_decode_referenced || !_dcp_content->reference_audio())) {
-		int64_t const entry_point = (*_reel)->main_sound()->entry_point ();
-		shared_ptr<const dcp::SoundFrame> sf = _sound_reader->get_frame (entry_point + frame);
-		uint8_t const * from = sf->data ();
+		auto const entry_point = (*_reel)->main_sound()->entry_point().get_value_or(0);
+		auto sf = _sound_reader->get_frame (entry_point + frame);
+		auto from = sf->data ();
 
 		int const channels = _dcp_content->audio->stream()->channels ();
 		int const frames = sf->size() / (3 * channels);
-		shared_ptr<AudioBuffers> data (new AudioBuffers (channels, frames));
-		float** data_data = data->data();
+		auto data = make_shared<AudioBuffers>(channels, frames);
+		auto data_data = data->data();
 		for (int i = 0; i < frames; ++i) {
 			for (int j = 0; j < channels; ++j) {
 				data_data[j][i] = static_cast<int> ((from[0] << 8) | (from[1] << 16) | (from[2] << 24)) / static_cast<float> (INT_MAX - 256);
@@ -182,7 +214,13 @@ DCPDecoder::pass (shared_ptr<const Film> film)
 			}
 		}
 
-		audio->emit (film, _dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next);
+		audio->emit (film(), _dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next);
+	}
+
+	if (_atmos_reader) {
+		DCPOMATIC_ASSERT (_atmos_metadata);
+		auto const entry_point = (*_reel)->atmos()->entry_point().get_value_or(0);
+		atmos->emit (film(), _atmos_reader->get_frame(entry_point + frame), _offset + frame, *_atmos_metadata);
 	}
 
 	_next += ContentTime::from_frames (1, vfr);
@@ -197,27 +235,33 @@ DCPDecoder::pass (shared_ptr<const Film> film)
 	return false;
 }
 
+
 void
-DCPDecoder::pass_texts (shared_ptr<const Film> film, ContentTime next, dcp::Size size)
+DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
 {
-	list<shared_ptr<TextDecoder> >::const_iterator decoder = text.begin ();
+	auto decoder = text.begin ();
+	if (decoder == text.end()) {
+		/* It's possible that there is now a main subtitle but no TextDecoders, for example if
+		   the CPL has just changed but the TextContent's texts have not been recreated yet.
+		*/
+		return;
+	}
+
 	if ((*_reel)->main_subtitle()) {
-		DCPOMATIC_ASSERT (decoder != text.end ());
 		pass_texts (
-			film,
 			next,
 			(*_reel)->main_subtitle()->asset(),
-			_dcp_content->reference_text(TEXT_OPEN_SUBTITLE),
-			(*_reel)->main_subtitle()->entry_point(),
+			_dcp_content->reference_text(TextType::OPEN_SUBTITLE),
+			(*_reel)->main_subtitle()->entry_point().get_value_or(0),
 			*decoder,
 			size
 			);
 		++decoder;
 	}
-	BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> i, (*_reel)->closed_captions()) {
-		DCPOMATIC_ASSERT (decoder != text.end ());
+
+	for (auto i: (*_reel)->closed_captions()) {
 		pass_texts (
-			film, next, i->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), i->entry_point(), *decoder, size
+			next, i->asset(), _dcp_content->reference_text(TextType::CLOSED_CAPTION), i->entry_point().get_value_or(0), *decoder, size
 			);
 		++decoder;
 	}
@@ -225,15 +269,15 @@ DCPDecoder::pass_texts (shared_ptr<const Film> film, ContentTime next, dcp::Size
 
 void
 DCPDecoder::pass_texts (
-	shared_ptr<const Film> film, ContentTime next, shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, shared_ptr<TextDecoder> decoder, dcp::Size size
+	ContentTime next, shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, shared_ptr<TextDecoder> decoder, dcp::Size size
 	)
 {
-	double const vfr = _dcp_content->active_video_frame_rate (film);
+	auto const vfr = _dcp_content->active_video_frame_rate (film());
 	/* Frame within the (played part of the) reel that is coming up next */
-	int64_t const frame = next.frames_round (vfr);
+	auto const frame = next.frames_round (vfr);
 
 	if (_decode_referenced || !reference) {
-		list<shared_ptr<dcp::Subtitle> > subs = asset->subtitles_during (
+		auto subs = asset->subtitles_during (
 			dcp::Time (entry_point + frame, vfr, vfr),
 			dcp::Time (entry_point + frame + 1, vfr, vfr),
 			true
@@ -241,11 +285,11 @@ DCPDecoder::pass_texts (
 
 		list<dcp::SubtitleString> strings;
 
-		BOOST_FOREACH (shared_ptr<dcp::Subtitle> i, subs) {
-			shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString> (i);
+		for (auto i: subs) {
+			auto is = dynamic_pointer_cast<const dcp::SubtitleString>(i);
 			if (is) {
 				if (!strings.empty() && (strings.back().in() != is->in() || strings.back().out() != is->out())) {
-					dcp::SubtitleString b = strings.back();
+					auto b = strings.back();
 					decoder->emit_plain (
 						ContentTimePeriod (
 							ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
@@ -259,51 +303,26 @@ DCPDecoder::pass_texts (
 				strings.push_back (*is);
 			}
 
-			shared_ptr<dcp::SubtitleImage> ii = dynamic_pointer_cast<dcp::SubtitleImage> (i);
-			if (ii) {
-				FFmpegImageProxy proxy (ii->png_image());
-				shared_ptr<Image> image = proxy.image().first;
-				/* set up rect with height and width */
-				dcpomatic::Rect<double> rect(0, 0, image->size().width / double(size.width), image->size().height / double(size.height));
-
-				/* add in position */
-
-				switch (ii->h_align()) {
-				case dcp::HALIGN_LEFT:
-					rect.x += ii->h_position();
-					break;
-				case dcp::HALIGN_CENTER:
-					rect.x += 0.5 + ii->h_position() - rect.width / 2;
-					break;
-				case dcp::HALIGN_RIGHT:
-					rect.x += 1 - ii->h_position() - rect.width;
-					break;
-				}
-
-				switch (ii->v_align()) {
-				case dcp::VALIGN_TOP:
-					rect.y += ii->v_position();
-					break;
-				case dcp::VALIGN_CENTER:
-					rect.y += 0.5 + ii->v_position() - rect.height / 2;
-					break;
-				case dcp::VALIGN_BOTTOM:
-					rect.y += 1 - ii->v_position() - rect.height;
-					break;
-				}
+			/* XXX: perhaps these image subs should also be collected together like the string ones are;
+			   this would need to be done both here and in DCPSubtitleDecoder.
+			*/
 
-				decoder->emit_bitmap (
+			auto ii = dynamic_pointer_cast<const dcp::SubtitleImage>(i);
+			if (ii) {
+				emit_subtitle_image (
 					ContentTimePeriod (
 						ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i->in().as_seconds ()),
 						ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i->out().as_seconds ())
 						),
-					image, rect
+					*ii,
+					size,
+					decoder
 					);
 			}
 		}
 
 		if (!strings.empty()) {
-			dcp::SubtitleString b = strings.back();
+			auto b = strings.back();
 			decoder->emit_plain (
 				ContentTimePeriod (
 					ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
@@ -316,14 +335,16 @@ DCPDecoder::pass_texts (
 	}
 }
 
+
 void
 DCPDecoder::next_reel ()
 {
-	_offset += (*_reel)->main_picture()->duration();
+	_offset += (*_reel)->main_picture()->actual_duration();
 	++_reel;
 	get_readers ();
 }
 
+
 void
 DCPDecoder::get_readers ()
 {
@@ -331,19 +352,22 @@ DCPDecoder::get_readers ()
 		_mono_reader.reset ();
 		_stereo_reader.reset ();
 		_sound_reader.reset ();
+		_atmos_reader.reset ();
 		return;
 	}
 
 	if ((*_reel)->main_picture()) {
-		shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
-		shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset);
-		shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset);
+		auto asset = (*_reel)->main_picture()->asset ();
+		auto mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset);
+		auto stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset);
 		DCPOMATIC_ASSERT (mono || stereo);
 		if (mono) {
 			_mono_reader = mono->start_read ();
+			_mono_reader->set_check_hmac (false);
 			_stereo_reader.reset ();
 		} else {
 			_stereo_reader = stereo->start_read ();
+			_stereo_reader->set_check_hmac (false);
 			_mono_reader.reset ();
 		}
 	} else {
@@ -353,19 +377,31 @@ DCPDecoder::get_readers ()
 
 	if ((*_reel)->main_sound()) {
 		_sound_reader = (*_reel)->main_sound()->asset()->start_read ();
+		_sound_reader->set_check_hmac (false);
 	} else {
 		_sound_reader.reset ();
 	}
+
+	if ((*_reel)->atmos()) {
+		auto asset = (*_reel)->atmos()->asset();
+		_atmos_reader = asset->start_read();
+		_atmos_reader->set_check_hmac (false);
+		_atmos_metadata = AtmosMetadata (asset);
+	} else {
+		_atmos_reader.reset ();
+		_atmos_metadata = boost::none;
+	}
 }
 
+
 void
-DCPDecoder::seek (shared_ptr<const Film> film, ContentTime t, bool accurate)
+DCPDecoder::seek (ContentTime t, bool accurate)
 {
 	if (!_dcp_content->can_be_played ()) {
 		return;
 	}
 
-	Decoder::seek (film, t, accurate);
+	Decoder::seek (t, accurate);
 
 	_reel = _reels.begin ();
 	_offset = 0;
@@ -375,15 +411,19 @@ DCPDecoder::seek (shared_ptr<const Film> film, ContentTime t, bool accurate)
 
 	/* Pre-roll for subs */
 
-	ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
+	auto pre = t - ContentTime::from_seconds (pre_roll_seconds);
 	if (pre < ContentTime()) {
 		pre = ContentTime ();
 	}
 
 	/* Seek to pre-roll position */
 
-	while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film))) {
-		ContentTime rd = ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film));
+	while (
+		_reel != _reels.end() &&
+		pre >= ContentTime::from_frames ((*_reel)->main_picture()->actual_duration(), _dcp_content->active_video_frame_rate(film()))
+		) {
+
+		auto rd = ContentTime::from_frames ((*_reel)->main_picture()->actual_duration(), _dcp_content->active_video_frame_rate(film()));
 		pre -= rd;
 		t -= rd;
 		next_reel ();
@@ -391,22 +431,27 @@ DCPDecoder::seek (shared_ptr<const Film> film, ContentTime t, bool accurate)
 
 	/* Pass texts in the pre-roll */
 
-	double const vfr = _dcp_content->active_video_frame_rate (film);
+	auto const vfr = _dcp_content->active_video_frame_rate (film());
 	for (int i = 0; i < pre_roll_seconds * vfr; ++i) {
-		pass_texts (film, pre, (*_reel)->main_picture()->asset()->size());
+		pass_texts (pre, (*_reel)->main_picture()->asset()->size());
 		pre += ContentTime::from_frames (1, vfr);
 	}
 
 	/* Seek to correct position */
 
-	while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film))) {
-		t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film));
+	while (
+		_reel != _reels.end() &&
+		t >= ContentTime::from_frames ((*_reel)->main_picture()->actual_duration(), _dcp_content->active_video_frame_rate(film()))
+		) {
+
+		t -= ContentTime::from_frames ((*_reel)->main_picture()->actual_duration(), _dcp_content->active_video_frame_rate(film()));
 		next_reel ();
 	}
 
 	_next = t;
 }
 
+
 void
 DCPDecoder::set_decode_referenced (bool r)
 {
@@ -420,8 +465,50 @@ DCPDecoder::set_decode_referenced (bool r)
 	}
 }
 
+
 void
 DCPDecoder::set_forced_reduction (optional<int> reduction)
 {
 	_forced_reduction = reduction;
 }
+
+
+string
+DCPDecoder::calculate_lazy_digest (shared_ptr<const DCPContent> c) const
+{
+	Digester d;
+	for (auto i: c->paths()) {
+		d.add (i.string());
+	}
+	if (_dcp_content->kdm()) {
+		d.add(_dcp_content->kdm()->id());
+	}
+	d.add (static_cast<bool>(c->cpl()));
+	if (c->cpl()) {
+		d.add (c->cpl().get());
+	}
+	return d.get ();
+}
+
+
+ContentTime
+DCPDecoder::position () const
+{
+	return ContentTime::from_frames(_offset, _dcp_content->active_video_frame_rate(film())) + _next;
+}
+
+
+vector<FontData>
+DCPDecoder::fonts () const
+{
+	vector<FontData> data;
+	for (auto i: _reels) {
+		if (i->main_subtitle() && i->main_subtitle()->asset()) {
+			for (auto const& j: i->main_subtitle()->asset()->font_data()) {
+				data.push_back (FontData(j.first, j.second));
+			}
+		}
+	}
+	return data;
+}
+