comparison libmpdemux/demux_lavf.c @ 30505:580319e640b3

Dynamically increase probe size for lavf demuxer up to 2 MB. This will read progressively more data if we still did not detect the format. The lavfpref demuxer is unaffected to avoid hanging for a long time in case of a slow network stream that some native demuxer may be able to handle.

30504:cc27da5d7286

#include "libavutil/avstring.h"
#include "libavcodec/opt.h"

#include "mp_taglists.h"

#define PROBE_BUF_SIZE (32*1024)

extern char *audio_lang;
extern char *dvdsub_lang;
extern int dvdsub_id;
static unsigned int opt_probesize = 0;

typedef struct lavf_priv_t{
    AVInputFormat *avif;
    AVFormatContext *avfc;
    ByteIOContext *pb;
    uint8_t buffer[FFMAX(BIO_BUFFER_SIZE, PROBE_BUF_SIZE)];
    int audio_streams;
    int video_streams;
    int sub_streams;
    int64_t last_pts;
    int astreams[MAX_A_STREAMS];

}

static int lavf_check_file(demuxer_t *demuxer){
    AVProbeData avpd;
    lavf_priv_t *priv;
    int probe_data_size;

    if(!demuxer->priv)
        demuxer->priv=calloc(sizeof(lavf_priv_t),1);
    priv= demuxer->priv;

        }
        mp_msg(MSGT_DEMUX,MSGL_INFO,"Forced lavf %s demuxer\n", priv->avif->long_name);
        return DEMUXER_TYPE_LAVF;
    }

    probe_data_size = stream_read(demuxer->stream, priv->buffer, PROBE_BUF_SIZE);
    if(probe_data_size < 0)
        return 0;
    avpd.filename= demuxer->stream->url;
    if (!strncmp(avpd.filename, "ffmpeg://", 9))
        avpd.filename += 9;
    avpd.buf= priv->buffer;
    avpd.buf_size= probe_data_size;

    priv->avif= av_probe_input_format(&avpd, probe_data_size > 0);
    if(!priv->avif){
        mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n");
        return 0;
    }else
        mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name);

30505:580319e640b3

#include "libavutil/avstring.h"
#include "libavcodec/opt.h"

#include "mp_taglists.h"

#define INITIAL_PROBE_SIZE (32*1024)
#define PROBE_BUF_SIZE (2*1024*1024)

extern char *audio_lang;
extern char *dvdsub_lang;
extern int dvdsub_id;
static unsigned int opt_probesize = 0;

typedef struct lavf_priv_t{
    AVInputFormat *avif;
    AVFormatContext *avfc;
    ByteIOContext *pb;
    uint8_t buffer[BIO_BUFFER_SIZE];
    int audio_streams;
    int video_streams;
    int sub_streams;
    int64_t last_pts;
    int astreams[MAX_A_STREAMS];

}

static int lavf_check_file(demuxer_t *demuxer){
    AVProbeData avpd;
    lavf_priv_t *priv;
    int probe_data_size = 0;
    int read_size = INITIAL_PROBE_SIZE;

    if(!demuxer->priv)
        demuxer->priv=calloc(sizeof(lavf_priv_t),1);
    priv= demuxer->priv;

        }
        mp_msg(MSGT_DEMUX,MSGL_INFO,"Forced lavf %s demuxer\n", priv->avif->long_name);
        return DEMUXER_TYPE_LAVF;
    }

    avpd.buf = av_mallocz(FFMAX(BIO_BUFFER_SIZE, PROBE_BUF_SIZE) +
                          FF_INPUT_BUFFER_PADDING_SIZE);
    do {
    read_size = stream_read(demuxer->stream, avpd.buf + probe_data_size, read_size);
    if(read_size < 0) {
        av_free(avpd.buf);
        return 0;
    }
    probe_data_size += read_size;
    avpd.filename= demuxer->stream->url;
    if (!strncmp(avpd.filename, "ffmpeg://", 9))
        avpd.filename += 9;
    avpd.buf_size= probe_data_size;

    priv->avif= av_probe_input_format(&avpd, probe_data_size > 0);
    read_size = FFMIN(2*read_size, PROBE_BUF_SIZE - probe_data_size);
    } while (demuxer->desc->type != DEMUXER_TYPE_LAVF_PREFERRED &&
             !priv->avif && read_size > 0 && probe_data_size < PROBE_BUF_SIZE);
    av_free(avpd.buf);

    if(!priv->avif){
        mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n");
        return 0;
    }else
        mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name);