comparison dv.c @ 5185:0c742c9c4aa7 libavformat

Try harder to avoid false positives for DV probe. Require at least one signature match per provided 1MB of probe data, and if there is only a single match, return at most MAX/4. Fixes issue1382 but could/should probably still be improved.

5184:2d15ea28c450

static int dv_probe(AVProbeData *p)
{
    unsigned state, marker_pos = 0;
    int i;

    if (p->buf_size < 5)
        return 0;

    state = AV_RB32(p->buf);
    for (i = 4; i < p->buf_size; i++) {
        if ((state & 0xffffff7f) == 0x1f07003f)
            return AVPROBE_SCORE_MAX*3/4; // not max to avoid dv in mov to match
        if (state == 0x003f0700 || state == 0xff3f0700)
            marker_pos = i;
        if (state == 0xff3f0701 && i - marker_pos == 80)
            return AVPROBE_SCORE_MAX/4;
        state = (state << 8) | p->buf[i];
    }

    return 0;
}

#if CONFIG_DV_DEMUXER
AVInputFormat dv_demuxer = {

5185:0c742c9c4aa7

static int dv_probe(AVProbeData *p)
{
    unsigned state, marker_pos = 0;
    int i;
    int matches = 0;

    if (p->buf_size < 5)
        return 0;

    state = AV_RB32(p->buf);
    for (i = 4; i < p->buf_size; i++) {
        if ((state & 0xffffff7f) == 0x1f07003f)
            matches++;
        if (state == 0x003f0700 || state == 0xff3f0700)
            marker_pos = i;
        if (state == 0xff3f0701 && i - marker_pos == 80)
            matches++;
        state = (state << 8) | p->buf[i];
    }

    if (matches && p->buf_size / matches < 1024*1024) {
        if (matches > 4)
            return AVPROBE_SCORE_MAX*3/4; // not max to avoid dv in mov to match
        return AVPROBE_SCORE_MAX/4;
    }
    return 0;
}

#if CONFIG_DV_DEMUXER
AVInputFormat dv_demuxer = {