diff options
| author | Burt P <pburt0@gmail.com> | 2016-09-05 05:59:39 -0500 |
|---|---|---|
| committer | Burt P <pburt0@gmail.com> | 2016-09-07 10:54:30 -0500 |
| commit | eb0086588f1823841108ab1dee08683ab67cf507 (patch) | |
| tree | a281c6095e94ae7ff0f8d83a1c396e5312067d74 | |
| parent | e700e21b6ff5765e344201997f80f26fe7792ee9 (diff) | |
af_hdcd: tweak hdcd_analyze_prepare() a bit
* use the actual sample rate
* use a more sensible frequency for the tone
* update fate test result
Signed-off-by: Burt P <pburt0@gmail.com>
| -rw-r--r-- | libavfilter/af_hdcd.c | 9 | ||||
| -rw-r--r-- | tests/fate/filter-audio.mak | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c index 641076aa7f..a8a3d59448 100644 --- a/libavfilter/af_hdcd.c +++ b/libavfilter/af_hdcd.c @@ -871,6 +871,7 @@ typedef struct { * a code. -1 for timer never set. */ int count_sustain_expired; + int rate; /**< sampling rate */ int _ana_snb; /**< used in the analyze mode tone generator */ } hdcd_state; @@ -1026,6 +1027,7 @@ static void hdcd_reset(hdcd_state *state, unsigned rate, unsigned cdt_ms) state->max_gain = 0; state->count_sustain_expired = -1; + state->rate = rate; state->_ana_snb = 0; } @@ -1297,7 +1299,8 @@ static int hdcd_scan_stereo(HDCDContext *ctx, const int32_t *samples, int max) /** replace audio with solid tone, but save LSBs */ static void hdcd_analyze_prepare(hdcd_state *state, int32_t *samples, int count, int stride) { - int n; + int n, f = 300; + int so = state->rate / f; for (n = 0; n < count * stride; n += stride) { /* in analyze mode, the audio is replaced by a solid tone, and * amplitude is changed to signal when the specified feature is @@ -1306,9 +1309,9 @@ static void hdcd_analyze_prepare(hdcd_state *state, int32_t *samples, int count, * bit 1: Original sample was above PE level */ int32_t save = (abs(samples[n]) - PEAK_EXT_LEVEL >= 0) ? 2 : 0; /* above PE level */ save |= samples[n] & 1; /* save LSB for HDCD packets */ - samples[n] = TONEGEN16(state->_ana_snb, 277.18, 44100, 0.1); + samples[n] = TONEGEN16(state->_ana_snb, f, state->rate, 0.1); samples[n] = (samples[n] | 3) ^ ((~save) & 3); - if (++state->_ana_snb > 0x3fffffff) state->_ana_snb = 0; + if (++state->_ana_snb > so) state->_ana_snb = 0; } } diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 2066fa9a71..cf92ef6d20 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -242,7 +242,7 @@ FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM fate-filter-hdcd-analyze: SRC = $(TARGET_SAMPLES)/filter/hdcd.flac fate-filter-hdcd-analyze: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=pe -f s24le fate-filter-hdcd-analyze: CMP = oneline -fate-filter-hdcd-analyze: REF = 81a4f00f85a585bc0198e9a0670a8cde +fate-filter-hdcd-analyze: REF = 6e39dc4629c1e84321c0d8bc069b42f6 FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-false-positive fate-filter-hdcd-false-positive: SRC = $(TARGET_SAMPLES)/filter/hdcd-false-positive.flac |