[FFmpeg-cvslog] swr/auto_matrix: add clean layout function
Michael Niedermayer
git at videolan.org
Sat Sep 8 21:35:47 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 8 21:10:19 2012 +0200| [c8ffab06f4bc039f4ff191de4761ab3c57eb684a] | committer: Michael Niedermayer
swr/auto_matrix: add clean layout function
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8ffab06f4bc039f4ff191de4761ab3c57eb684a
---
libswresample/rematrix.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index 9fa4f52..a8d5fde 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -102,6 +102,11 @@ static int even(int64_t layout){
return 0;
}
+static int clean_layout(SwrContext *s, int64_t layout){
+
+ return layout;
+}
+
static int sane_layout(int64_t layout){
if(!(layout & AV_CH_LAYOUT_SURROUND)) // at least 1 front speaker
return 0;
@@ -123,16 +128,19 @@ static int auto_matrix(SwrContext *s)
{
int i, j, out_i;
double matrix[64][64]={{0}};
- int64_t unaccounted, in_ch_layout = s->in_ch_layout, out_ch_layout = s->out_ch_layout;
+ int64_t unaccounted, in_ch_layout, out_ch_layout;
double maxcoef=0;
char buf[128];
const int matrix_encoding = s->matrix_encoding;
+ in_ch_layout = clean_layout(s, s->in_ch_layout);
if(!sane_layout(in_ch_layout)){
av_get_channel_layout_string(buf, sizeof(buf), -1, s->in_ch_layout);
av_log(s, AV_LOG_ERROR, "Input channel layout '%s' is not supported\n", buf);
return AVERROR(EINVAL);
}
+
+ out_ch_layout = clean_layout(s, s->out_ch_layout);
if(!sane_layout(out_ch_layout)){
av_get_channel_layout_string(buf, sizeof(buf), -1, s->out_ch_layout);
av_log(s, AV_LOG_ERROR, "Output channel layout '%s' is not supported\n", buf);
More information about the ffmpeg-cvslog
mailing list