Unified · Split
| @@ -174,7 +174,7 @@ static int config_output(AVFilterLink *outlink) · 173 unmodified lines | |||
| 174 | } \ | 174 | } \ |
| 175 | } | 175 | } |
| 176 | 176 | ||
| 177 | #define TRACE(type, depth, one) \ | 177 | #define DO_TRACE(type, depth, one) \ |
| 178 | for (int ch = 0; ch < inlink->channels; ch++) { \ | 178 | for (int ch = 0; ch < inlink->channels; ch++) { \ |
| 179 | const int w = outpicref->width / inlink->channels; \ | 179 | const int w = outpicref->width / inlink->channels; \ |
| 180 | const type *in = (const type *)insamples->extended_data[ch]; \ | 180 | const type *in = (const type *)insamples->extended_data[ch]; \ |
| @@ -238,18 +238,18 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) · 57 unmodified lines | |||
| 238 | 238 | ||
| 239 | switch (insamples->format) { | 239 | switch (insamples->format) { |
| 240 | case AV_SAMPLE_FMT_U8P: | 240 | case AV_SAMPLE_FMT_U8P: |
| 241 | if (s->mode == 0) { BARS(uint8_t, 8, 1) } else { TRACE(uint8_t, 8, 1) } | 241 | if (s->mode == 0) { BARS(uint8_t, 8, 1) } else { DO_TRACE(uint8_t, 8, 1) } |
| 242 | break; | 242 | break; |
| 243 | case AV_SAMPLE_FMT_S16P: | 243 | case AV_SAMPLE_FMT_S16P: |
| 244 | if (s->mode == 0) { BARS(uint16_t, 16, 1) } else { TRACE(uint16_t, 16, 1) } | 244 | if (s->mode == 0) { BARS(uint16_t, 16, 1) } else { DO_TRACE(uint16_t, 16, 1) } |
| 245 | break; | 245 | break; |
| 246 | case AV_SAMPLE_FMT_FLTP: | 246 | case AV_SAMPLE_FMT_FLTP: |
| 247 | case AV_SAMPLE_FMT_S32P: | 247 | case AV_SAMPLE_FMT_S32P: |
| 248 | if (s->mode == 0) { BARS(uint32_t, 32, 1U) } else { TRACE(uint32_t, 32, 1U) } | 248 | if (s->mode == 0) { BARS(uint32_t, 32, 1U) } else { DO_TRACE(uint32_t, 32, 1U) } |
| 249 | break; | 249 | break; |
| 250 | case AV_SAMPLE_FMT_DBLP: | 250 | case AV_SAMPLE_FMT_DBLP: |
| 251 | case AV_SAMPLE_FMT_S64P: | 251 | case AV_SAMPLE_FMT_S64P: |
| 252 | if (s->mode == 0) { BARS(uint64_t, 64, 1ULL) } else { TRACE(uint64_t, 64, 1ULL) } | 252 | if (s->mode == 0) { BARS(uint64_t, 64, 1ULL) } else { DO_TRACE(uint64_t, 64, 1ULL) } |
| 253 | break; | 253 | break; |
| 254 | } | 254 | } |
| 255 | 255 | ||