highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

af_hdcd: support s16p (WavPack) directly

Browse Source 
The buffer is already being copied anyway, so interlace the planar
format during the copy and remove one use of auto-convert.

Signed-off-by: Burt P <pburt0@gmail.com>
This commit is contained in:
Burt P
2016-09-28 06:18:19 -05:00
parent 7e46bb80ef
commit 80d89c1960
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/af_hdcd.c
View File

@ -1665,10 +1665,18 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
} }
out->format = outlink->format; // is this needed? out->format = outlink->format; // is this needed?
in_data = (int16_t*)in->data[0];
out_data = (int32_t*)out->data[0]; out_data = (int32_t*)out->data[0];
for (c = n = 0; n < in->nb_samples * in->channels; n++) if (inlink->format == AV_SAMPLE_FMT_S16P) {
for (n = 0; n < in->nb_samples; n++)
for (c = 0; c < in->channels; c++) {
in_data = (int16_t*)in->extended_data[c];
out_data[(n * in->channels) + c] = in_data[n];
}
} else {
in_data = (int16_t*)in->data[0];
for (n = 0; n < in->nb_samples * in->channels; n++)
out_data[n] = in_data[n]; out_data[n] = in_data[n];
}
if (s->process_stereo) { if (s->process_stereo) {
hdcd_detect_start(&s->detect); hdcd_detect_start(&s->detect);
@ -1707,6 +1715,7 @@ static int query_formats(AVFilterContext *ctx)
static const enum AVSampleFormat sample_fmts_in[] = { static const enum AVSampleFormat sample_fmts_in[] = {
AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE AV_SAMPLE_FMT_NONE
}; };
static const enum AVSampleFormat sample_fmts_out[] = { static const enum AVSampleFormat sample_fmts_out[] = {