From cb88e67a861161c49d350cbdc7d5006bbd94ffa1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 9 May 2014 22:31:05 +0100 Subject: ChangeLog. --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 6eb3bcff0..f76c6ba35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-05-09 Carl Hetherington + + * Re-introduce ffprobe call when adding content. + 2014-05-02 Carl Hetherington * Version 1.68.0 released. -- cgit v1.2.3 From 283770d0bdde7ba4d1f7bc4b1a7d1812bff5c835 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 9 May 2014 22:55:43 +0100 Subject: Fix crash on using content with more than 12 audio channels. Reported-by: Sumit --- ChangeLog | 2 ++ src/lib/audio_mapping.cc | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index f76c6ba35..21b6eec15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-05-09 Carl Hetherington + * Fix crash on using content with more than 12 audio channels. + * Re-introduce ffprobe call when adding content. 2014-05-02 Carl Hetherington diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index 28a0fc380..301d44fa6 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -28,6 +28,7 @@ using std::cout; using std::make_pair; using std::pair; using std::string; +using std::min; using boost::shared_ptr; using boost::lexical_cast; using boost::dynamic_pointer_cast; @@ -71,7 +72,7 @@ AudioMapping::make_default () set (0, libdcp::CENTRE, 1); } else { /* 1:1 mapping */ - for (int i = 0; i < _content_channels; ++i) { + for (int i = 0; i < min (_content_channels, MAX_DCP_AUDIO_CHANNELS); ++i) { set (i, static_cast (i), 1); } } -- cgit v1.2.3 From f4086e8a19269917cb144a5425ce5d06deedf645 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 9 May 2014 22:57:47 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 440434d5e..a0d6edfdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-05-09 Carl Hetherington + + * Version 1.69.1 released. + 2014-05-09 Carl Hetherington * Fix crash on using content with more than 12 audio channels. diff --git a/debian/changelog b/debian/changelog index 0f31a2716..7bf686d34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.0-1) UNRELEASED; urgency=low +dcpomatic (1.69.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -124,8 +124,9 @@ dcpomatic (1.69.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Mon, 05 May 2014 16:41:46 +0100 + -- Carl Hetherington Fri, 09 May 2014 22:57:47 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index abba29173..0e6e33561 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.0devel' +VERSION = '1.69.1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 7f3a784849bb94a40480d6a5e6119eb182e93197 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 10 May 2014 13:35:55 +0100 Subject: Fix setup of the libswresample context to work with high channel counts. Reported-by: Sumit --- ChangeLog | 4 ++++ src/lib/resampler.cc | 34 +++++++++++++++------------------- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 440434d5e..e3398702e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-05-10 Carl Hetherington + + * Fix setup of the libswresample context to work with high channel counts. + 2014-05-09 Carl Hetherington * Fix crash on using content with more than 12 audio channels. diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc index d897bf562..e6b1623d9 100644 --- a/src/lib/resampler.cc +++ b/src/lib/resampler.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ extern "C" { #include "libavutil/channel_layout.h" +#include "libavutil/opt.h" } #include "resampler.h" #include "audio_buffers.h" @@ -37,24 +38,19 @@ Resampler::Resampler (int in, int out, int channels) , _out_rate (out) , _channels (channels) { - /* We will be using planar float data when we call the - resampler. As far as I can see, the audio channel - layout is not necessary for our purposes; it seems - only to be used get the number of channels and - decide if rematrixing is needed. It won't be, since - input and output layouts are the same. - */ - - _swr_context = swr_alloc_set_opts ( - 0, - av_get_default_channel_layout (_channels), - AV_SAMPLE_FMT_FLTP, - _out_rate, - av_get_default_channel_layout (_channels), - AV_SAMPLE_FMT_FLTP, - _in_rate, - 0, 0 - ); + _swr_context = swr_alloc (); + + /* Sample formats */ + av_opt_set_int (_swr_context, "isf", AV_SAMPLE_FMT_FLTP, 0); + av_opt_set_int (_swr_context, "osf", AV_SAMPLE_FMT_FLTP, 0); + + /* Channel counts */ + av_opt_set_int (_swr_context, "ich", _channels, 0); + av_opt_set_int (_swr_context, "och", _channels, 0); + + /* Sample rates */ + av_opt_set_int (_swr_context, "isr", _in_rate, 0); + av_opt_set_int (_swr_context, "osr", _out_rate, 0); swr_init (_swr_context); } -- cgit v1.2.3 From e26f836c4dc19aa3fd317952a7470bee9e41db42 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 10 May 2014 13:40:33 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 4c1fb3a31..1a031b445 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-05-10 Carl Hetherington + + * Version 1.69.2 released. + 2014-05-10 Carl Hetherington * Fix setup of the libswresample context to work with high channel counts. diff --git a/debian/changelog b/debian/changelog index 7bf686d34..418ef9fa4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.1-1) UNRELEASED; urgency=low +dcpomatic (1.69.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -125,8 +125,9 @@ dcpomatic (1.69.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Fri, 09 May 2014 22:57:47 +0100 + -- Carl Hetherington Sat, 10 May 2014 13:40:32 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 214149ef5..4b16c883d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.1devel' +VERSION = '1.69.2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3