Don't use stringstream in DecryptedKDM.

[libdcp.git] / src / sound_asset_writer.cc

diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc
index 25fcc4345d7d7df820ce1257838ea60400c3b653..b0d7bc7d98e9492f97ce3393ec4df9db77b03074 100644 (file)
--- a/src/sound_asset_writer.cc
+++ b/src/sound_asset_writer.cc
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     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 "sound_asset_writer.h"
@@ -22,7 +36,7 @@
 #include "exceptions.h"
 #include "dcp_assert.h"
 #include "compose.hpp"
-#include "AS_DCP.h"
+#include <asdcp/AS_DCP.h>
 
 using std::min;
 using std::max;
@@ -77,19 +91,27 @@ SoundAssetWriter::write (float const * const * data, int frames)
                _started = true;
        }
 
+       int const ch = _sound_asset->channels ();
+
        for (int i = 0; i < frames; ++i) {
 
                byte_t* out = _state->frame_buffer.Data() + _frame_buffer_offset;
 
                /* Write one sample per channel */
-               for (int j = 0; j < _sound_asset->channels(); ++j) {
+               for (int j = 0; j < ch; ++j) {
                        /* Convert sample to 24-bit int, clipping if necessary. */
-                       int32_t const s = min (clip, max (-clip, data[j][i])) * (1 << 23);
+                       float x = data[j][i];
+                       if (x > clip) {
+                               x = clip;
+                       } else if (x < -clip) {
+                               x = -clip;
+                       }
+                       int32_t const s = x * (1 << 23);
                        *out++ = (s & 0xff);
                        *out++ = (s & 0xff00) >> 8;
                        *out++ = (s & 0xff0000) >> 16;
                }
-               _frame_buffer_offset += 3 * _sound_asset->channels();
+               _frame_buffer_offset += 3 * ch;
 
                DCP_ASSERT (_frame_buffer_offset <= int (_state->frame_buffer.Capacity()));