virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Make mime-type award a bonus probe score

Browse Source 
This changes the default behaviour of ffmpeg where content-type headers
on an input gives an absolut probe score (of 75) to instead give a bonus
score (of 30). This gives the probe a better chance to arrive at the
correct format by (hopefully) giving a large enough bonus to push edge
cases in the right direction (MPEG-PS vs MP3, I am looking at you) while
also not adversly punishing clearer cases (raw ADTS marked as
"audio/mpeg" for example).

This patch was regression tested against 20 million recent podcast
submissions (after content-type propagation was added to
original-storage), and 50k Juno vodcasts submissions (dito). No adverse
effects observed (but the bonus may still need tweaking if other edge
cases are detected in production).
This commit is contained in:
Peter Zebühr
2023-11-21 14:16:49 +01:00
committed by Tomas Härdin
parent 5a526fdad0
commit e24920375c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avformat.h
View File

@@ -459,7 +459,7 @@ typedef struct AVProbeData {
#define AVPROBE_SCORE_STREAM_RETRY (AVPROBE_SCORE_MAX/4-1) #define AVPROBE_SCORE_STREAM_RETRY (AVPROBE_SCORE_MAX/4-1)
#define AVPROBE_SCORE_EXTENSION 50 ///< score for file extension #define AVPROBE_SCORE_EXTENSION 50 ///< score for file extension
#define AVPROBE_SCORE_MIME 75 ///< score for file mime type #define AVPROBE_SCORE_MIME_BONUS 30 ///< score added for matching mime type
#define AVPROBE_SCORE_MAX 100 ///< maximum score #define AVPROBE_SCORE_MAX 100 ///< maximum score
#define AVPROBE_PADDING_SIZE 32 ///< extra allocated bytes at the end of the probe buffer #define AVPROBE_PADDING_SIZE 32 ///< extra allocated bytes at the end of the probe buffer

8
libavformat/format.c
View File

@@ -212,10 +212,10 @@ const AVInputFormat *av_probe_input_format3(const AVProbeData *pd,
score = AVPROBE_SCORE_EXTENSION; score = AVPROBE_SCORE_EXTENSION;
} }
if (av_match_name(lpd.mime_type, fmt1->mime_type)) { if (av_match_name(lpd.mime_type, fmt1->mime_type)) {
if (AVPROBE_SCORE_MIME > score) { int old_score = score;
av_log(NULL, AV_LOG_DEBUG, "Probing %s score:%d increased to %d due to MIME type\n", fmt1->name, score, AVPROBE_SCORE_MIME); score += AVPROBE_SCORE_MIME_BONUS;
score = AVPROBE_SCORE_MIME; if (score > AVPROBE_SCORE_MAX) score = AVPROBE_SCORE_MAX;
} av_log(NULL, AV_LOG_DEBUG, "Probing %s score:%d increased to %d due to MIME type\n", fmt1->name, old_score, score);
} }
if (score > score_max) { if (score > score_max) {
score_max = score; score_max = score;

2
libavformat/libopenmpt.c
View File

@@ -244,7 +244,7 @@ static int read_probe_openmpt(const AVProbeData *p)
* AVPROBE_SCORE_MAX in order to reduce the impact in the rare * AVPROBE_SCORE_MAX in order to reduce the impact in the rare
* cases of false positives. * cases of false positives.
*/ */
return AVPROBE_SCORE_MIME + 1; return (AVPROBE_SCORE_MAX * 3) / 4 + 1;
} else if (probe_result == OPENMPT_PROBE_FILE_HEADER_RESULT_WANTMOREDATA) { } else if (probe_result == OPENMPT_PROBE_FILE_HEADER_RESULT_WANTMOREDATA) {
if (probe_openmpt_extension(p) > 0) { if (probe_openmpt_extension(p) > 0) {
return AVPROBE_SCORE_RETRY; return AVPROBE_SCORE_RETRY;