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

Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0' 

* commit '3a19405d574a467c68b48e4b824c76617fd59de0':
  avformat: Use the mime type information in input probe

Conflicts:
	libavformat/format.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-29 20:57:42 +02:00
parent 31e0b5d3cb 3a19405d57
commit 80a3a6611f
3 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/avformat.h
View File

@ -393,12 +393,16 @@ typedef struct AVProbeData {
const char *filename;
unsigned char *buf; /**< Buffer must have AVPROBE_PADDING_SIZE of extra allocated bytes filled with zero. */
int buf_size; /**< Size of buf except extra allocated bytes */
#ifdef FF_API_PROBE_MIME
uint8_t *mime_type; /**< mime_type, when known. */
#endif
} AVProbeData;
#define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4)
#define AVPROBE_SCORE_STREAM_RETRY (AVPROBE_SCORE_MAX/4-1)
#define AVPROBE_SCORE_EXTENSION 50 ///< score for file extension
#define AVPROBE_SCORE_MIME 75 ///< score for file mime type
#define AVPROBE_SCORE_MAX 100 ///< maximum score
#define AVPROBE_PADDING_SIZE 32 ///< extra allocated bytes at the end of the probe buffer
@ -585,6 +589,13 @@ typedef struct AVInputFormat {
const AVClass *priv_class; ///< AVClass for the private context
/**
* Comma-separated list of mime types.
* It is used check for matching mime types while probing.
* @see av_probe_input_format2
*/
const char *mime_type;
/*****************************************************************
* No fields below this line are part of the public API. They
* may not be used outside of libavformat and can be changed and

34
libavformat/format.c
View File

@ -20,6 +20,7 @@
*/
#include "libavutil/avstring.h"
#include "libavutil/opt.h"
#include "avio_internal.h"
#include "avformat.h"
@ -213,6 +214,10 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened,
if (av_match_ext(lpd.filename, fmt1->extensions))
score = AVPROBE_SCORE_EXTENSION;
}
#ifdef FF_API_PROBE_MIME
if (av_match_name(lpd.mime_type, fmt1->mime_type))
score = FFMAX(score, AVPROBE_SCORE_EXTENSION);
#endif
if (score > score_max) {
score_max = score;
fmt = fmt1;
@ -264,12 +269,19 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
if (offset >= max_probe_size)
return AVERROR(EINVAL);
#ifdef FF_API_PROBE_MIME
if (pb->av_class)
av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &pd.mime_type);
#endif
#if !FF_API_PROBE_MIME
if (!*fmt && pb->av_class && av_opt_get(pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type) >= 0 && mime_type) {
if (!av_strcasecmp(mime_type, "audio/aacp")) {
*fmt = av_find_input_format("aac");
}
av_freep(&mime_type);
}
#endif
for (probe_size = PROBE_BUF_MIN; probe_size <= max_probe_size && !*fmt;
probe_size = FFMIN(probe_size << 1,
@ -278,14 +290,13 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
/* Read probe data. */
if ((ret = av_reallocp(&buf, probe_size + AVPROBE_PADDING_SIZE)) < 0)
return ret;
goto fail;
if ((ret = avio_read(pb, buf + buf_offset,
probe_size - buf_offset)) < 0) {
/* Fail if error was not end of file, otherwise, lower score. */
if (ret != AVERROR_EOF) {
av_free(buf);
return ret;
}
if (ret != AVERROR_EOF)
goto fail;
score = 0;
ret = 0; /* error was end of file, nothing read */
}
@ -317,14 +328,17 @@ int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
}
}
if (!*fmt) {
av_free(buf);
return AVERROR_INVALIDDATA;
}
if (!*fmt)
ret = AVERROR_INVALIDDATA;
fail:
/* Rewind. Reuse probe buffer to avoid seeking. */
ret = ffio_rewind_with_probe_data(pb, &buf, buf_offset);
if (ret >= 0)
ret = ffio_rewind_with_probe_data(pb, &buf, buf_offset);
#ifdef FF_API_PROBE_MIME
av_free(pd.mime_type);
#endif
return ret < 0 ? ret : score;
}

4
libavformat/version.h
View File

@ -85,4 +85,8 @@
#ifndef FF_API_R_FRAME_RATE
#define FF_API_R_FRAME_RATE 1
#endif
#ifndef FF_API_PROBE_MIME
#define FF_API_PROBE_MIME (LIBAVFORMAT_VERSION_MAJOR > 55)
#endif
#endif /* AVFORMAT_VERSION_H */