virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

swresample: use av_get_default_channel_layout instead of guess_layout

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Marton Balint 2011-10-06 23:19:23 +02:00 committed by Michael Niedermayer
parent cbfca6225a
commit 177ed7e818
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libswresample/swresample.c
View File

@ -22,6 +22,7 @@
#include "swresample_internal.h" #include "swresample_internal.h"
#include "audioconvert.h" #include "audioconvert.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/audioconvert.h"
#define C30DB M_SQRT2 #define C30DB M_SQRT2
#define C15DB 1.189207115 #define C15DB 1.189207115
@ -117,18 +118,6 @@ void swr_free(SwrContext **ss){
av_freep(ss); av_freep(ss);
} }
static int64_t guess_layout(int ch){
switch(ch){
case 1: return AV_CH_LAYOUT_MONO;
case 2: return AV_CH_LAYOUT_STEREO;
case 5: return AV_CH_LAYOUT_5POINT0;
case 6: return AV_CH_LAYOUT_5POINT1;
case 7: return AV_CH_LAYOUT_7POINT0;
case 8: return AV_CH_LAYOUT_7POINT1;
default: return 0;
}
}
int swr_init(SwrContext *s){ int swr_init(SwrContext *s){
s->in_buffer_index= 0; s->in_buffer_index= 0;
s->in_buffer_count= 0; s->in_buffer_count= 0;
@ -183,9 +172,9 @@ int swr_init(SwrContext *s){
} }
if(!s-> in_ch_layout) if(!s-> in_ch_layout)
s-> in_ch_layout= guess_layout(s->in.ch_count); s-> in_ch_layout= av_get_default_channel_layout(s->in.ch_count);
if(!s->out_ch_layout) if(!s->out_ch_layout)
s->out_ch_layout= guess_layout(s->out.ch_count); s->out_ch_layout= av_get_default_channel_layout(s->out.ch_count);
s->rematrix= s->out_ch_layout !=s->in_ch_layout; s->rematrix= s->out_ch_layout !=s->in_ch_layout;