History

swr/auto_matrix: move layouts to local variables

Michael Niedermayer committed 14 years ago

Commit ebc854e1 parent 9ab538e1 file · +37 −35Browse files

Unified · Split

libswresample/rematrix.c+37−35
@@ -123,35 +123,37 @@ static int auto_matrix(SwrContext *s) · 122 unmodified lines
123{123{
124 int i, j, out_i;124 int i, j, out_i;
125 double matrix[64][64]={{0}};125 double matrix[64][64]={{0}};
126 int64_t unaccounted= s->in_ch_layout & ~s->out_ch_layout;126 int64_t unaccounted, in_ch_layout = s->in_ch_layout, out_ch_layout = s->out_ch_layout;
127 double maxcoef=0;127 double maxcoef=0;
128 char buf[128];128 char buf[128];
129 const int matrix_encoding = s->matrix_encoding;129 const int matrix_encoding = s->matrix_encoding;
130 130
131 memset(s->matrix, 0, sizeof(s->matrix));131 if(!sane_layout(in_ch_layout)){
132 for(i=0; i<64; i++){
133 if(s->in_ch_layout & s->out_ch_layout & (1LL<<i))
134 matrix[i][i]= 1.0;
135 }
136
137 if(!sane_layout(s->in_ch_layout)){
138 av_get_channel_layout_string(buf, sizeof(buf), -1, s->in_ch_layout);132 av_get_channel_layout_string(buf, sizeof(buf), -1, s->in_ch_layout);
139 av_log(s, AV_LOG_ERROR, "Input channel layout '%s' is not supported\n", buf);133 av_log(s, AV_LOG_ERROR, "Input channel layout '%s' is not supported\n", buf);
140 return AVERROR(EINVAL);134 return AVERROR(EINVAL);
141 }135 }
142 if(!sane_layout(s->out_ch_layout)){136 if(!sane_layout(out_ch_layout)){
143 av_get_channel_layout_string(buf, sizeof(buf), -1, s->out_ch_layout);137 av_get_channel_layout_string(buf, sizeof(buf), -1, s->out_ch_layout);
144 av_log(s, AV_LOG_ERROR, "Output channel layout '%s' is not supported\n", buf);138 av_log(s, AV_LOG_ERROR, "Output channel layout '%s' is not supported\n", buf);
145 return AVERROR(EINVAL);139 return AVERROR(EINVAL);
146 }140 }
147 141
142 memset(s->matrix, 0, sizeof(s->matrix));
143 for(i=0; i<64; i++){
144 if(in_ch_layout & out_ch_layout & (1LL<<i))
145 matrix[i][i]= 1.0;
146 }
147
148 unaccounted= in_ch_layout & ~out_ch_layout;
149
148//FIXME implement dolby surround150//FIXME implement dolby surround
149//FIXME implement full ac3151//FIXME implement full ac3
150 152
151 153
152 if(unaccounted & AV_CH_FRONT_CENTER){154 if(unaccounted & AV_CH_FRONT_CENTER){
153 if((s->out_ch_layout & AV_CH_LAYOUT_STEREO) == AV_CH_LAYOUT_STEREO){155 if((out_ch_layout & AV_CH_LAYOUT_STEREO) == AV_CH_LAYOUT_STEREO){
154 if(s->in_ch_layout & AV_CH_LAYOUT_STEREO) {156 if(in_ch_layout & AV_CH_LAYOUT_STEREO) {
155 matrix[ FRONT_LEFT][FRONT_CENTER]+= s->clev;157 matrix[ FRONT_LEFT][FRONT_CENTER]+= s->clev;
156 matrix[FRONT_RIGHT][FRONT_CENTER]+= s->clev;158 matrix[FRONT_RIGHT][FRONT_CENTER]+= s->clev;
157 } else {159 } else {
@@ -162,23 +164,23 @@ static int auto_matrix(SwrContext *s) · 4 unmodified lines
162 av_assert0(0);164 av_assert0(0);
163 }165 }
164 if(unaccounted & AV_CH_LAYOUT_STEREO){166 if(unaccounted & AV_CH_LAYOUT_STEREO){
165 if(s->out_ch_layout & AV_CH_FRONT_CENTER){167 if(out_ch_layout & AV_CH_FRONT_CENTER){
166 matrix[FRONT_CENTER][ FRONT_LEFT]+= M_SQRT1_2;168 matrix[FRONT_CENTER][ FRONT_LEFT]+= M_SQRT1_2;
167 matrix[FRONT_CENTER][FRONT_RIGHT]+= M_SQRT1_2;169 matrix[FRONT_CENTER][FRONT_RIGHT]+= M_SQRT1_2;
168 if(s->in_ch_layout & AV_CH_FRONT_CENTER)170 if(in_ch_layout & AV_CH_FRONT_CENTER)
169 matrix[FRONT_CENTER][ FRONT_CENTER] = s->clev*sqrt(2);171 matrix[FRONT_CENTER][ FRONT_CENTER] = s->clev*sqrt(2);
170 }else172 }else
171 av_assert0(0);173 av_assert0(0);
172 }174 }
173 175
174 if(unaccounted & AV_CH_BACK_CENTER){176 if(unaccounted & AV_CH_BACK_CENTER){
175 if(s->out_ch_layout & AV_CH_BACK_LEFT){177 if(out_ch_layout & AV_CH_BACK_LEFT){
176 matrix[ BACK_LEFT][BACK_CENTER]+= M_SQRT1_2;178 matrix[ BACK_LEFT][BACK_CENTER]+= M_SQRT1_2;
177 matrix[BACK_RIGHT][BACK_CENTER]+= M_SQRT1_2;179 matrix[BACK_RIGHT][BACK_CENTER]+= M_SQRT1_2;
178 }else if(s->out_ch_layout & AV_CH_SIDE_LEFT){180 }else if(out_ch_layout & AV_CH_SIDE_LEFT){
179 matrix[ SIDE_LEFT][BACK_CENTER]+= M_SQRT1_2;181 matrix[ SIDE_LEFT][BACK_CENTER]+= M_SQRT1_2;
180 matrix[SIDE_RIGHT][BACK_CENTER]+= M_SQRT1_2;182 matrix[SIDE_RIGHT][BACK_CENTER]+= M_SQRT1_2;
181 }else if(s->out_ch_layout & AV_CH_FRONT_LEFT){183 }else if(out_ch_layout & AV_CH_FRONT_LEFT){
182 if (matrix_encoding == AV_MATRIX_ENCODING_DOLBY ||184 if (matrix_encoding == AV_MATRIX_ENCODING_DOLBY ||
183 matrix_encoding == AV_MATRIX_ENCODING_DPLII) {185 matrix_encoding == AV_MATRIX_ENCODING_DPLII) {
184 if (unaccounted & (AV_CH_BACK_LEFT | AV_CH_SIDE_LEFT)) {186 if (unaccounted & (AV_CH_BACK_LEFT | AV_CH_SIDE_LEFT)) {
@@ -192,24 +194,24 @@ static int auto_matrix(SwrContext *s) · 7 unmodified lines
192 matrix[ FRONT_LEFT][BACK_CENTER]+= s->slev*M_SQRT1_2;194 matrix[ FRONT_LEFT][BACK_CENTER]+= s->slev*M_SQRT1_2;
193 matrix[FRONT_RIGHT][BACK_CENTER]+= s->slev*M_SQRT1_2;195 matrix[FRONT_RIGHT][BACK_CENTER]+= s->slev*M_SQRT1_2;
194 }196 }
195 }else if(s->out_ch_layout & AV_CH_FRONT_CENTER){197 }else if(out_ch_layout & AV_CH_FRONT_CENTER){
196 matrix[ FRONT_CENTER][BACK_CENTER]+= s->slev*M_SQRT1_2;198 matrix[ FRONT_CENTER][BACK_CENTER]+= s->slev*M_SQRT1_2;
197 }else199 }else
198 av_assert0(0);200 av_assert0(0);
199 }201 }
200 if(unaccounted & AV_CH_BACK_LEFT){202 if(unaccounted & AV_CH_BACK_LEFT){
201 if(s->out_ch_layout & AV_CH_BACK_CENTER){203 if(out_ch_layout & AV_CH_BACK_CENTER){
202 matrix[BACK_CENTER][ BACK_LEFT]+= M_SQRT1_2;204 matrix[BACK_CENTER][ BACK_LEFT]+= M_SQRT1_2;
203 matrix[BACK_CENTER][BACK_RIGHT]+= M_SQRT1_2;205 matrix[BACK_CENTER][BACK_RIGHT]+= M_SQRT1_2;
204 }else if(s->out_ch_layout & AV_CH_SIDE_LEFT){206 }else if(out_ch_layout & AV_CH_SIDE_LEFT){
205 if(s->in_ch_layout & AV_CH_SIDE_LEFT){207 if(in_ch_layout & AV_CH_SIDE_LEFT){
206 matrix[ SIDE_LEFT][ BACK_LEFT]+= M_SQRT1_2;208 matrix[ SIDE_LEFT][ BACK_LEFT]+= M_SQRT1_2;
207 matrix[SIDE_RIGHT][BACK_RIGHT]+= M_SQRT1_2;209 matrix[SIDE_RIGHT][BACK_RIGHT]+= M_SQRT1_2;
208 }else{210 }else{
209 matrix[ SIDE_LEFT][ BACK_LEFT]+= 1.0;211 matrix[ SIDE_LEFT][ BACK_LEFT]+= 1.0;
210 matrix[SIDE_RIGHT][BACK_RIGHT]+= 1.0;212 matrix[SIDE_RIGHT][BACK_RIGHT]+= 1.0;
211 }213 }
212 }else if(s->out_ch_layout & AV_CH_FRONT_LEFT){214 }else if(out_ch_layout & AV_CH_FRONT_LEFT){
213 if (matrix_encoding == AV_MATRIX_ENCODING_DOLBY) {215 if (matrix_encoding == AV_MATRIX_ENCODING_DOLBY) {
214 matrix[FRONT_LEFT ][BACK_LEFT ] -= s->slev * M_SQRT1_2;216 matrix[FRONT_LEFT ][BACK_LEFT ] -= s->slev * M_SQRT1_2;
215 matrix[FRONT_LEFT ][BACK_RIGHT] -= s->slev * M_SQRT1_2;217 matrix[FRONT_LEFT ][BACK_RIGHT] -= s->slev * M_SQRT1_2;
@@ -224,7 +226,7 @@ static int auto_matrix(SwrContext *s) · 8 unmodified lines
224 matrix[ FRONT_LEFT][ BACK_LEFT] += s->slev;226 matrix[ FRONT_LEFT][ BACK_LEFT] += s->slev;
225 matrix[FRONT_RIGHT][BACK_RIGHT] += s->slev;227 matrix[FRONT_RIGHT][BACK_RIGHT] += s->slev;
226 }228 }
227 }else if(s->out_ch_layout & AV_CH_FRONT_CENTER){229 }else if(out_ch_layout & AV_CH_FRONT_CENTER){
228 matrix[ FRONT_CENTER][BACK_LEFT ]+= s->slev*M_SQRT1_2;230 matrix[ FRONT_CENTER][BACK_LEFT ]+= s->slev*M_SQRT1_2;
229 matrix[ FRONT_CENTER][BACK_RIGHT]+= s->slev*M_SQRT1_2;231 matrix[ FRONT_CENTER][BACK_RIGHT]+= s->slev*M_SQRT1_2;
230 }else232 }else
@@ -232,20 +234,20 @@ static int auto_matrix(SwrContext *s) · 1 unmodified line
232 }234 }
233 235
234 if(unaccounted & AV_CH_SIDE_LEFT){236 if(unaccounted & AV_CH_SIDE_LEFT){
235 if(s->out_ch_layout & AV_CH_BACK_LEFT){237 if(out_ch_layout & AV_CH_BACK_LEFT){
236 /* if back channels do not exist in the input, just copy side238 /* if back channels do not exist in the input, just copy side
237 channels to back channels, otherwise mix side into back */239 channels to back channels, otherwise mix side into back */
238 if (s->in_ch_layout & AV_CH_BACK_LEFT) {240 if (in_ch_layout & AV_CH_BACK_LEFT) {
239 matrix[BACK_LEFT ][SIDE_LEFT ] += M_SQRT1_2;241 matrix[BACK_LEFT ][SIDE_LEFT ] += M_SQRT1_2;
240 matrix[BACK_RIGHT][SIDE_RIGHT] += M_SQRT1_2;242 matrix[BACK_RIGHT][SIDE_RIGHT] += M_SQRT1_2;
241 } else {243 } else {
242 matrix[BACK_LEFT ][SIDE_LEFT ] += 1.0;244 matrix[BACK_LEFT ][SIDE_LEFT ] += 1.0;
243 matrix[BACK_RIGHT][SIDE_RIGHT] += 1.0;245 matrix[BACK_RIGHT][SIDE_RIGHT] += 1.0;
244 }246 }
245 }else if(s->out_ch_layout & AV_CH_BACK_CENTER){247 }else if(out_ch_layout & AV_CH_BACK_CENTER){
246 matrix[BACK_CENTER][ SIDE_LEFT]+= M_SQRT1_2;248 matrix[BACK_CENTER][ SIDE_LEFT]+= M_SQRT1_2;
247 matrix[BACK_CENTER][SIDE_RIGHT]+= M_SQRT1_2;249 matrix[BACK_CENTER][SIDE_RIGHT]+= M_SQRT1_2;
248 }else if(s->out_ch_layout & AV_CH_FRONT_LEFT){250 }else if(out_ch_layout & AV_CH_FRONT_LEFT){
249 if (matrix_encoding == AV_MATRIX_ENCODING_DOLBY) {251 if (matrix_encoding == AV_MATRIX_ENCODING_DOLBY) {
250 matrix[FRONT_LEFT ][SIDE_LEFT ] -= s->slev * M_SQRT1_2;252 matrix[FRONT_LEFT ][SIDE_LEFT ] -= s->slev * M_SQRT1_2;
251 matrix[FRONT_LEFT ][SIDE_RIGHT] -= s->slev * M_SQRT1_2;253 matrix[FRONT_LEFT ][SIDE_RIGHT] -= s->slev * M_SQRT1_2;
@@ -260,7 +262,7 @@ static int auto_matrix(SwrContext *s) · 8 unmodified lines
260 matrix[ FRONT_LEFT][ SIDE_LEFT] += s->slev;262 matrix[ FRONT_LEFT][ SIDE_LEFT] += s->slev;
261 matrix[FRONT_RIGHT][SIDE_RIGHT] += s->slev;263 matrix[FRONT_RIGHT][SIDE_RIGHT] += s->slev;
262 }264 }
263 }else if(s->out_ch_layout & AV_CH_FRONT_CENTER){265 }else if(out_ch_layout & AV_CH_FRONT_CENTER){
264 matrix[ FRONT_CENTER][SIDE_LEFT ]+= s->slev*M_SQRT1_2;266 matrix[ FRONT_CENTER][SIDE_LEFT ]+= s->slev*M_SQRT1_2;
265 matrix[ FRONT_CENTER][SIDE_RIGHT]+= s->slev*M_SQRT1_2;267 matrix[ FRONT_CENTER][SIDE_RIGHT]+= s->slev*M_SQRT1_2;
266 }else268 }else
@@ -268,10 +270,10 @@ static int auto_matrix(SwrContext *s) · 1 unmodified line
268 }270 }
269 271
270 if(unaccounted & AV_CH_FRONT_LEFT_OF_CENTER){272 if(unaccounted & AV_CH_FRONT_LEFT_OF_CENTER){
271 if(s->out_ch_layout & AV_CH_FRONT_LEFT){273 if(out_ch_layout & AV_CH_FRONT_LEFT){
272 matrix[ FRONT_LEFT][ FRONT_LEFT_OF_CENTER]+= 1.0;274 matrix[ FRONT_LEFT][ FRONT_LEFT_OF_CENTER]+= 1.0;
273 matrix[FRONT_RIGHT][FRONT_RIGHT_OF_CENTER]+= 1.0;275 matrix[FRONT_RIGHT][FRONT_RIGHT_OF_CENTER]+= 1.0;
274 }else if(s->out_ch_layout & AV_CH_FRONT_CENTER){276 }else if(out_ch_layout & AV_CH_FRONT_CENTER){
275 matrix[ FRONT_CENTER][ FRONT_LEFT_OF_CENTER]+= M_SQRT1_2;277 matrix[ FRONT_CENTER][ FRONT_LEFT_OF_CENTER]+= M_SQRT1_2;
276 matrix[ FRONT_CENTER][FRONT_RIGHT_OF_CENTER]+= M_SQRT1_2;278 matrix[ FRONT_CENTER][FRONT_RIGHT_OF_CENTER]+= M_SQRT1_2;
277 }else279 }else
@@ -279,9 +281,9 @@ static int auto_matrix(SwrContext *s) · 1 unmodified line
279 }281 }
280 /* mix LFE into front left/right or center */282 /* mix LFE into front left/right or center */
281 if (unaccounted & AV_CH_LOW_FREQUENCY) {283 if (unaccounted & AV_CH_LOW_FREQUENCY) {
282 if (s->out_ch_layout & AV_CH_FRONT_CENTER) {284 if (out_ch_layout & AV_CH_FRONT_CENTER) {
283 matrix[FRONT_CENTER][LOW_FREQUENCY] += s->lfe_mix_level;285 matrix[FRONT_CENTER][LOW_FREQUENCY] += s->lfe_mix_level;
284 } else if (s->out_ch_layout & AV_CH_FRONT_LEFT) {286 } else if (out_ch_layout & AV_CH_FRONT_LEFT) {
285 matrix[FRONT_LEFT ][LOW_FREQUENCY] += s->lfe_mix_level * M_SQRT1_2;287 matrix[FRONT_LEFT ][LOW_FREQUENCY] += s->lfe_mix_level * M_SQRT1_2;
286 matrix[FRONT_RIGHT][LOW_FREQUENCY] += s->lfe_mix_level * M_SQRT1_2;288 matrix[FRONT_RIGHT][LOW_FREQUENCY] += s->lfe_mix_level * M_SQRT1_2;
287 } else289 } else
@@ -296,11 +298,11 @@ static int auto_matrix(SwrContext *s) · 8 unmodified lines
296 if(matrix[i][j]){298 if(matrix[i][j]){
297 sum += fabs(matrix[i][j]);299 sum += fabs(matrix[i][j]);
298 }300 }
299 if(s->in_ch_layout & (1ULL<<j))301 if(in_ch_layout & (1ULL<<j))
300 in_i++;302 in_i++;
301 }303 }
302 maxcoef= FFMAX(maxcoef, sum);304 maxcoef= FFMAX(maxcoef, sum);
303 if(s->out_ch_layout & (1ULL<<i))305 if(out_ch_layout & (1ULL<<i))
304 out_i++;306 out_i++;
305 }307 }
306 if(s->rematrix_volume < 0)308 if(s->rematrix_volume < 0)
@@ -321,8 +323,8 @@ static int auto_matrix(SwrContext *s) · 14 unmodified lines
321 }323 }
322 }324 }
323 325
324 for(i=0; i<av_get_channel_layout_nb_channels(s->out_ch_layout); i++){326 for(i=0; i<av_get_channel_layout_nb_channels(out_ch_layout); i++){
325 for(j=0; j<av_get_channel_layout_nb_channels(s->in_ch_layout); j++){327 for(j=0; j<av_get_channel_layout_nb_channels(in_ch_layout); j++){
326 av_log(NULL, AV_LOG_DEBUG, "%f ", s->matrix[i][j]);328 av_log(NULL, AV_LOG_DEBUG, "%f ", s->matrix[i][j]);
327 }329 }
328 av_log(NULL, AV_LOG_DEBUG, "\n");330 av_log(NULL, AV_LOG_DEBUG, "\n");

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t