comparison src/madplug/plugin.c @ 2667:84d34cd6aa71

Experimental changes in MADPlug's probing function to lessen chance of misdetection (some arbitrary files, such as old 15-inst ST MODs were being probed as MP3 streams.) NOTICE! A debug print is temporarily left in to see if any real MP3 files get rejected.

2666:053341c248ef

static int
audmad_is_our_fd(char *filename, VFSFile *fin)
{
    guint32 check;
    gchar *ext = extname(filename);
    gint cyc = 0, chkcount = 0, chksize = 4096;
    guchar buf[4];
    guchar tmp[4096];
    gint ret, i, frameSize;

    info.remote = aud_vfs_is_remote(filename);

    /* I've seen some flac files beginning with id3 frames..
       so let's exclude known non-mp3 filename extensions */

         !strcasecmp("wma", ext) )
        )
        return 0;

    if (fin == NULL) {
        g_message("fin = NULL");
        return 0;
    }

    if(aud_vfs_fread(buf, 1, 4, fin) == 0) {
        gchar *tmp = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
        g_message("aud_vfs_fread failed @1 %s", tmp);
        g_free(tmp);
        return 0;
    }

    check = mp3_head_convert(buf);

        return 0;
    else if (memcmp(buf, "RIFF", 4) == 0)
    {
        aud_vfs_fseek(fin, 4, SEEK_CUR);
        if(aud_vfs_fread(buf, 1, 4, fin) == 0) {
            gchar *tmp = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
            g_message("aud_vfs_fread failed @2 %s", tmp);
            g_free(tmp);
            return 0;
        }

        if (memcmp(buf, "RMP3", 4) == 0)
            return 1;
    }

    // check data for frame header
    while (!mp3_head_check(check, &frameSize))
    {
        if((ret = aud_vfs_fread(tmp, 1, chksize, fin)) == 0){
            gchar *tmp = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
            g_message("aud_vfs_fread failed @3 %s", tmp);
            g_free(tmp);
            return 0;
        }
        for (i = 0; i < ret; i++)
        {
            check <<= 8;
            check |= tmp[i];

            if (mp3_head_check(check, &frameSize)) {
                /* when the first matching frame header is found, we check for
                 * another frame by seeking to the approximate start of the
                 * next header ... also reduce the check size.
                 */
                if (++chkcount >= 3) return 1;
                aud_vfs_fseek(fin, frameSize-4, SEEK_CUR);
                check = 0;
                chksize = 8;
            }
        }

        if (++cyc > 32)
            return 0;
    }

    return 1;
}

// audacious vfs version
static int
audmad_is_our_file(char *filename)

2667:84d34cd6aa71

static int
audmad_is_our_fd(char *filename, VFSFile *fin)
{
    guint32 check;
    gchar *ext = extname(filename);
    guchar buf[4];

    info.remote = aud_vfs_is_remote(filename);

    /* I've seen some flac files beginning with id3 frames..
       so let's exclude known non-mp3 filename extensions */

         !strcasecmp("wma", ext) )
        )
        return 0;

    if (fin == NULL) {
        g_message("fin = NULL for %s", filename);
        return 0;
    }

    if (aud_vfs_fread(buf, 1, 4, fin) == 0) {
        g_message("aud_vfs_fread failed @1 %s", filename);
        return 0;
    }

    check = mp3_head_convert(buf);

        return 0;
    else if (memcmp(buf, "RIFF", 4) == 0)
    {
        aud_vfs_fseek(fin, 4, SEEK_CUR);
        if(aud_vfs_fread(buf, 1, 4, fin) == 0) {
            g_message("aud_vfs_fread failed @2 %s", filename);
            return 0;
        }

        if (memcmp(buf, "RMP3", 4) == 0)
            return 1;
    }

    /* Check stream data for frame header(s)
     */
    guchar chkbuf[2048];
    gint chkret, i, framesize, cyc, chkcount, chksize = sizeof(chkbuf);
    
    for (cyc = chkcount = 0; cyc < 32; cyc++)
    {
        if ((chkret = aud_vfs_fread(chkbuf, 1, chksize, fin)) == 0)
            break;
        
        for (i = 0; i < chkret; i++)
        {
            check <<= 8;
            check |= chkbuf[i];

            if (mp3_head_check(check, &framesize)) {
                /* when the first matching frame header is found, we check for
                 * another frame by seeking to the approximate start of the
                 * next header ... also reduce the check size.
                 */
                if (++chkcount >= 4) return 1;
                aud_vfs_fseek(fin, framesize-8, SEEK_CUR);
                check = 0;
                chksize = 16;
            } else {
                aud_vfs_fseek(fin, chksize, SEEK_CUR);
            }
        }
    }

    g_message("Rejecting %s (not an MP3 file?)", filename);
    return 0;
}

// audacious vfs version
static int
audmad_is_our_file(char *filename)