virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

swr/auto_matrix: add clean layout function

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-09-08 21:10:19 +02:00
parent ebc854e4e9
commit c8ffab06f4
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libswresample/rematrix.c
View File

@@ -102,6 +102,11 @@ static int even(int64_t layout){
return 0; return 0;
} }
static int clean_layout(SwrContext *s, int64_t layout){
return layout;
}
static int sane_layout(int64_t layout){ static int sane_layout(int64_t layout){
if(!(layout & AV_CH_LAYOUT_SURROUND)) // at least 1 front speaker if(!(layout & AV_CH_LAYOUT_SURROUND)) // at least 1 front speaker
return 0; return 0;
@@ -123,16 +128,19 @@ static int auto_matrix(SwrContext *s)
{ {
int i, j, out_i; int i, j, out_i;
double matrix[64][64]={{0}}; 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; double maxcoef=0;
char buf[128]; char buf[128];
const int matrix_encoding = s->matrix_encoding; const int matrix_encoding = s->matrix_encoding;
in_ch_layout = clean_layout(s, s->in_ch_layout);
if(!sane_layout(in_ch_layout)){ if(!sane_layout(in_ch_layout)){
av_get_channel_layout_string(buf, sizeof(buf), -1, s->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); av_log(s, AV_LOG_ERROR, "Input channel layout '%s' is not supported\n", buf);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
out_ch_layout = clean_layout(s, s->out_ch_layout);
if(!sane_layout(out_ch_layout)){ if(!sane_layout(out_ch_layout)){
av_get_channel_layout_string(buf, sizeof(buf), -1, s->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); av_log(s, AV_LOG_ERROR, "Output channel layout '%s' is not supported\n", buf);