}
#endif /* CONFIG_AMR_MUXER */
-static int amr_probe(AVProbeData *p)
+static int amr_probe(const AVProbeData *p)
{
// Only check for "#!AMR" which could be amr-wb, amr-nb.
// This will also trigger multichannel files: "#!AMR_MC1.0\n" and
#endif
#if CONFIG_AMRNB_DEMUXER
-static int amrnb_probe(AVProbeData *p)
+static int amrnb_probe(const AVProbeData *p)
{
int mode, i = 0, valid = 0, invalid = 0;
const uint8_t *b = p->buf;
while (i < p->buf_size) {
mode = b[i] >> 3 & 0x0F;
if (mode < 9 && (b[i] & 0x4) == 0x4) {
- int last = mode;
+ int last = b[i];
int size = amrnb_packed_size[mode];
while (size--) {
if (b[++i] != last)
break;
- last = b[i];
}
if (size > 0) {
valid++;
i++;
}
}
- if (valid > 100 && valid > invalid)
+ if (valid > 100 && valid >> 4 > invalid)
return AVPROBE_SCORE_EXTENSION / 2 + 1;
return 0;
}
#endif
#if CONFIG_AMRWB_DEMUXER
-static int amrwb_probe(AVProbeData *p)
+static int amrwb_probe(const AVProbeData *p)
{
int mode, i = 0, valid = 0, invalid = 0;
const uint8_t *b = p->buf;
while (i < p->buf_size) {
mode = b[i] >> 3 & 0x0F;
if (mode < 10 && (b[i] & 0x4) == 0x4) {
- int last = mode;
+ int last = b[i];
int size = amrwb_packed_size[mode];
while (size--) {
if (b[++i] != last)
break;
- last = b[i];
}
if (size > 0) {
valid++;
i++;
}
}
- if (valid > 100 && valid > invalid)
- return AVPROBE_SCORE_EXTENSION / 2 - 1;
+ if (valid > 100 && valid >> 4 > invalid)
+ return AVPROBE_SCORE_EXTENSION / 2 + 1;
return 0;
}