RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

af_hdcd: give cdt expired counter a value for never set 

The counter is now -1 if the code detect timer was never set,
and 0 if it was set but never expired.

Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Burt P 2016-07-29 12:36:17 -05:00 committed by Michael Niedermayer
parent 999c6b1da8
commit 390eea61be
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavfilter/af_hdcd.c
View File

@ -846,7 +846,9 @@ typedef struct {
* steps of 0.5, but no value below -6.0 dB should appear. */ * steps of 0.5, but no value below -6.0 dB should appear. */
int gain_counts[16]; /* for cursiosity, mostly */ int gain_counts[16]; /* for cursiosity, mostly */
int max_gain; int max_gain;
int count_sustain_expired; /* occurences of code detect timer expiring without detecting a code */ /* occurences of code detect timer expiring without detecting
* a code. -1 for timer never set. */
int count_sustain_expired;
AVFilterContext *fctx; /* filter context for logging errors */ AVFilterContext *fctx; /* filter context for logging errors */
} hdcd_state_t; } hdcd_state_t;
@ -909,7 +911,7 @@ static void hdcd_reset(hdcd_state_t *state, unsigned rate)
for(i = 0; i < 16; i++) state->gain_counts[i] = 0; for(i = 0; i < 16; i++) state->gain_counts[i] = 0;
state->max_gain = 0; state->max_gain = 0;
state->count_sustain_expired = 0; state->count_sustain_expired = -1;
} }
/* update the user info/counters */ /* update the user info/counters */
@ -991,6 +993,15 @@ static int hdcd_integrate(hdcd_state_t *state, int *flag, const int32_t *samples
return result; return result;
} }
static void hdcd_sustain_reset(hdcd_state_t *state)
{
state->sustain = state->sustain_reset;
/* if this is the first reset then change
* from never set, to never expired */
if (state->count_sustain_expired == -1)
state->count_sustain_expired = 0;
}
static int hdcd_scan(hdcd_state_t *state, const int32_t *samples, int max, int stride) static int hdcd_scan(hdcd_state_t *state, const int32_t *samples, int max, int stride)
{ {
int cdt_active = 0; int cdt_active = 0;
@ -1011,7 +1022,7 @@ static int hdcd_scan(hdcd_state_t *state, const int32_t *samples, int max, int s
result += consumed; result += consumed;
if (flag > 0) { if (flag > 0) {
/* reset timer if code detected in channel */ /* reset timer if code detected in channel */
state->sustain = state->sustain_reset; hdcd_sustain_reset(state);
break; break;
} }
samples += consumed * stride; samples += consumed * stride;