X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_frame.cc;h=521c990f40518ed7b9f975547650fff9b2b2752c;hb=67cba4ee8eba281297af23b3c55a5f8d30fb8363;hp=c2a10564d108f465a0db01a56c42bce83e0f6063;hpb=c2bac22380bea453665a24c6f39200a977771daf;p=libdcp.git

diff --git a/src/sound_frame.cc b/src/sound_frame.cc
index c2a10564..521c990f 100644
--- a/src/sound_frame.cc
+++ b/src/sound_frame.cc
@@ -1,58 +1,60 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
-#include "AS_DCP.h"
-#include "KM_fileio.h"
 #include "sound_frame.h"
-#include "exceptions.h"
+#include <asdcp/AS_DCP.h>
+#include <iostream>
 
-using namespace std;
-using namespace libdcp;
-
-SoundFrame::SoundFrame (string mxf_path, int n)
-{
-	ASDCP::PCM::MXFReader reader;
-	if (ASDCP_FAILURE (reader.OpenRead (mxf_path.c_str()))) {
-		boost::throw_exception (FileError ("could not open MXF file for reading", mxf_path));
-	}
-
-	/* XXX: unfortunate guesswork on this buffer size */
-	_buffer = new ASDCP::PCM::FrameBuffer (1 * Kumu::Megabyte);
-
-	if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer))) {
-		boost::throw_exception (DCPReadError ("could not read audio frame"));
-	}
-}
+using std::cout;
+using namespace dcp;
 
-SoundFrame::~SoundFrame ()
+SoundFrame::SoundFrame (ASDCP::PCM::MXFReader* reader, int n, boost::shared_ptr<const DecryptionContext> c)
+	: Frame<ASDCP::PCM::MXFReader, ASDCP::PCM::FrameBuffer> (reader, n, c)
 {
-	delete _buffer;
+	ASDCP::PCM::AudioDescriptor desc;
+	reader->FillAudioDescriptor (desc);
+	_channels = desc.ChannelCount;
 }
 
-uint8_t const *
-SoundFrame::data () const
+int32_t
+SoundFrame::get (int channel, int frame) const
 {
-	return _buffer->RoData();
+	uint8_t const * d = data() + (frame * _channels * 3) + (channel * 3);
+	return d[0] | (d[1] << 8) | (d[2] << 16);
 }
 
 int
-SoundFrame::size () const
+SoundFrame::samples () const
 {
-	return _buffer->Size ();
+	return size() / (_channels * 3);
 }