Fix to allow re-writing of SMPTE subtitles.

[libdcp.git] / src / sound_frame.cc

diff --git a/src/sound_frame.cc b/src/sound_frame.cc
index b5a52d02b7c23b5b3696d957745cd9898b061ba4..821a88660155c8e8d162068582d61bedee4ced25 100644 (file)
--- a/src/sound_frame.cc
+++ b/src/sound_frame.cc
@@ -38,7 +38,7 @@
 using std::cout;
 using namespace dcp;
 
-SoundFrame::SoundFrame (ASDCP::PCM::MXFReader* reader, int n, boost::shared_ptr<const DecryptionContext> c)
+SoundFrame::SoundFrame (ASDCP::PCM::MXFReader* reader, int n, std::shared_ptr<const DecryptionContext> c)
        : Frame<ASDCP::PCM::MXFReader, ASDCP::PCM::FrameBuffer> (reader, n, c)
 {
        ASDCP::PCM::AudioDescriptor desc;
@@ -50,7 +50,8 @@ int32_t
 SoundFrame::get (int channel, int frame) const
 {
        uint8_t const * d = data() + (frame * _channels * 3) + (channel * 3);
-       return d[0] | (d[1] << 8) | (d[2] << 16);
+       /* This is slightly dubious I think */
+       return (d[0] << 8 | (d[1] << 16) | (d[2] << 24)) >> 8;
 }
 
 int