Remove now-unnecessary assertion.

Since e29ce33a36c2e20444d57196defc86d5072bce81 channels is the
number of channels in the frame, and also the number in data,
so we don't need to check this any more.

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 9f505ea4303d8a4685c213b468a8335bb0a6b35a..477dcda1988371b271eb2bcaa1c943c1d630eb27 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -360,7 +360,6 @@ deinterleave_audio(shared_ptr<FFmpegAudioStream> stream, AVFrame* frame)
        case AV_SAMPLE_FMT_FLTP:
        {
                auto p = reinterpret_cast<float**> (frame->data);
-               DCPOMATIC_ASSERT(channels <= stream->channels());
                for (int i = 0; i < channels; ++i) {
                        memcpy (data[i], p[i], frames * sizeof(float));
                }

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 5a9c753242ec2983a541294f9b7ab841f6a5a9fa..002ea0e7a16123a4f0a2b13e49f78f9163cd56af 100644 (file)
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -233,3 +233,17 @@ BOOST_AUTO_TEST_CASE(analyse_audio_with_long_silent_end)
        JobManager::instance()->analyse_audio(film, playlist, false, c, [](Job::Result) {});
        BOOST_CHECK(!wait_for_jobs());
 }
+
+
+BOOST_AUTO_TEST_CASE(analyse_audio_with_strange_channel_count)
+{
+       auto content = content_factory(TestPaths::private_data() / "mali.mkv")[0];
+       auto film = new_test_film2("analyse_audio_with_strange_channel_count", { content });
+
+       auto playlist = make_shared<Playlist>();
+       playlist->add(film, content);
+       boost::signals2::connection c;
+       JobManager::instance()->analyse_audio(film, playlist, false, c, [](Job::Result) {});
+       BOOST_CHECK(!wait_for_jobs());
+}
+