diff options
Diffstat (limited to 'src/audio_check.c')
| -rw-r--r-- | src/audio_check.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/audio_check.c b/src/audio_check.c index a9aa2dd8..4874e2da 100644 --- a/src/audio_check.c +++ b/src/audio_check.c @@ -22,53 +22,53 @@ #include <assert.h> -bool -audio_check_sample_rate(unsigned long sample_rate, GError **error_r) +#include <libavutil/samplefmt.h> + +bool audio_check_sample_rate(unsigned long sample_rate, GError **error_r) { - if (!audio_valid_sample_rate(sample_rate)) { - g_set_error(error_r, audio_format_quark(), 0, - "Invalid sample rate: %lu", sample_rate); - return false; - } + if (!audio_valid_sample_rate(sample_rate)) { + g_set_error(error_r, audio_format_quark(), 0, + "Invalid sample rate: %lu", sample_rate); + return false; + } - return true; + return true; } -bool -audio_check_sample_format(enum sample_format sample_format, GError **error_r) + bool +audio_check_sample_format(enum AVSampleFormat sample_format, GError **error_r) { - if (!audio_valid_sample_format(sample_format)) { - g_set_error(error_r, audio_format_quark(), 0, - "Invalid sample format: %u", sample_format); - return false; - } + if (!audio_valid_sample_format(sample_format)) { + g_set_error(error_r, audio_format_quark(), 0, + "Invalid sample format: %u", sample_format); + return false; + } - return true; + return true; } -bool + bool audio_check_channel_count(unsigned channels, GError **error_r) { - if (!audio_valid_channel_count(channels)) { - g_set_error(error_r, audio_format_quark(), 0, - "Invalid channel count: %u", channels); - return false; - } + if (!audio_valid_channel_count(channels)) { + g_set_error(error_r, audio_format_quark(), 0, + "Invalid channel count: %u", channels); + return false; + } - return true; + return true; } -bool -audio_format_init_checked(struct audio_format *af, unsigned long sample_rate, - enum sample_format sample_format, unsigned channels, - GError **error_r) +bool audio_format_init_checked(struct audio_format *af, unsigned long sample_rate, + enum AVSampleFormat sample_format, unsigned channels, + GError **error_r) { - if (audio_check_sample_rate(sample_rate, error_r) && - audio_check_sample_format(sample_format, error_r) && - audio_check_channel_count(channels, error_r)) { - audio_format_init(af, sample_rate, sample_format, channels); - assert(audio_format_valid(af)); - return true; - } else - return false; + if (audio_check_sample_rate(sample_rate, error_r) && + audio_check_sample_format(sample_format, error_r) && + audio_check_channel_count(channels, error_r)) { + audio_format_init(af, sample_rate, sample_format, channels); + assert(audio_format_valid(af)); + return true; + } else + return false; } |