RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-03 13:32:16 +00:00
Code Issues Releases Wiki Activity

ao_lavc: use new sample format determination code

Browse Source 
This is just a refactor, which makes it use the previously introduced
function, and allows us to make af_format_conversion_score() private.

(We drop 2 unlikely warning messages too... who cares.)
This commit is contained in:
wm4 2015-09-10 23:38:42 +02:00
parent 60a617df31
commit e721660e6d
3 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/format.c
View File

@ -171,13 +171,11 @@ void af_fill_silence(void *dst, size_t bytes, int format)
memset(dst, af_fmt_is_unsigned(format) ? 0x80 : 0, bytes); memset(dst, af_fmt_is_unsigned(format) ? 0x80 : 0, bytes);
} }
#define FMT_DIFF(type, a, b) (((a) & type) - ((b) & type))
// Returns a "score" that serves as heuristic how lossy or hard a conversion is. // Returns a "score" that serves as heuristic how lossy or hard a conversion is.
// If the formats are equal, 1024 is returned. If they are gravely incompatible // If the formats are equal, 1024 is returned. If they are gravely incompatible
// (like s16<->ac3), INT_MIN is returned. If there is implied loss of precision // (like s16<->ac3), INT_MIN is returned. If there is implied loss of precision
// (like s16->s8), a value <0 is returned. // (like s16->s8), a value <0 is returned.
int af_format_conversion_score(int dst_format, int src_format) static int af_format_conversion_score(int dst_format, int src_format)
{ {
if (dst_format == AF_FORMAT_UNKNOWN || src_format == AF_FORMAT_UNKNOWN) if (dst_format == AF_FORMAT_UNKNOWN || src_format == AF_FORMAT_UNKNOWN)
return INT_MIN; return INT_MIN;

1
audio/format.h
View File

@ -75,7 +75,6 @@ int af_fmt_seconds_to_bytes(int format, float seconds, int channels, int sampler
void af_fill_silence(void *dst, size_t bytes, int format); void af_fill_silence(void *dst, size_t bytes, int format);
int af_format_conversion_score(int dst_format, int src_format);
void af_get_best_sample_formats(int src_format, int out_formats[AF_FORMAT_COUNT]); void af_get_best_sample_formats(int src_format, int out_formats[AF_FORMAT_COUNT]);
int af_format_sample_alignment(int format); int af_format_sample_alignment(int format);

35
audio/out/ao_lavc.c
View File

@ -58,33 +58,28 @@ struct priv {
bool shutdown; bool shutdown;
}; };
static void select_format(struct ao *ao, AVCodec *codec) static bool supports_format(AVCodec *codec, int format)
{ {
int best_score = INT_MIN;
int best_format = 0;
// Check the encoder's list of supported formats.
for (const enum AVSampleFormat *sampleformat = codec->sample_fmts; for (const enum AVSampleFormat *sampleformat = codec->sample_fmts;
sampleformat && *sampleformat != AV_SAMPLE_FMT_NONE; sampleformat && *sampleformat != AV_SAMPLE_FMT_NONE;
++sampleformat) ++sampleformat)
{ {
int fmt = af_from_avformat(*sampleformat); if (format && af_from_avformat(*sampleformat) == format)
if (!fmt) { return true;
MP_WARN(ao, "unsupported lavc format %s\n",
av_get_sample_fmt_name(*sampleformat));
continue;
}
int score = af_format_conversion_score(fmt, ao->format);
if (score > best_score) {
best_score = score;
best_format = fmt;
}
} }
return false;
}
if (best_format) { static void select_format(struct ao *ao, AVCodec *codec)
ao->format = best_format; {
} else { int formats[AF_FORMAT_COUNT];
MP_ERR(ao, "sample format not found\n"); // shouldn't happen af_get_best_sample_formats(ao->format, formats);
for (int n = 0; n < AF_FORMAT_COUNT; n++) {
if (supports_format(codec, formats[n])) {
ao->format = formats[n];
break;
}
} }
} }