diff options
author | Rodeo <tdskywalker@gmail.com> | 2013-01-04 13:12:13 +0000 |
---|---|---|
committer | Rodeo <tdskywalker@gmail.com> | 2013-01-04 13:12:13 +0000 |
commit | e0ec7fbfd2fcf1d8759049a0826f571939fce536 (patch) | |
tree | 3344f1ab240394b4c21246173f5cb762460c87f7 | |
parent | be67e671058466a31ecd218a7360082037ac3f81 (diff) |
common.h: cosmetics.
Also remove a couple duplicate function declarations.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5142 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r-- | libhb/common.h | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/libhb/common.h b/libhb/common.h index fd49d4d29..9697916c0 100644 --- a/libhb/common.h +++ b/libhb/common.h @@ -233,32 +233,35 @@ int hb_get_video_encoders_count(); hb_encoder_t* hb_get_audio_encoders(); int hb_get_audio_encoders_count(); -int hb_mixdown_is_supported(int mixdown, uint32_t codec, uint64_t layout); -int hb_mixdown_has_codec_support(int mixdown, uint32_t codec); -int hb_mixdown_has_remix_support(int mixdown, uint64_t layout); -int hb_mixdown_get_discrete_channel_count(int amixdown); -int hb_mixdown_get_low_freq_channel_count(int amixdown); -int hb_mixdown_get_mixdown_from_short_name(const char *short_name); +int hb_mixdown_is_supported(int mixdown, uint32_t codec, uint64_t layout); +int hb_mixdown_has_codec_support(int mixdown, uint32_t codec); +int hb_mixdown_has_remix_support(int mixdown, uint64_t layout); +int hb_mixdown_get_discrete_channel_count(int amixdown); +int hb_mixdown_get_low_freq_channel_count(int amixdown); +int hb_mixdown_get_mixdown_from_short_name(const char *short_name); const char* hb_mixdown_get_short_name_from_mixdown(int amixdown); -int hb_mixdown_get_mixdown_from_short_name( const char * short_name ); -const char * hb_mixdown_get_short_name_from_mixdown( int amixdown ); -void hb_autopassthru_apply_settings( hb_job_t * job ); -void hb_autopassthru_print_settings( hb_job_t * job ); -int hb_autopassthru_get_encoder( int in_codec, int copy_mask, int fallback, int muxer ); +void hb_autopassthru_apply_settings(hb_job_t *job); +void hb_autopassthru_print_settings(hb_job_t *job); +int hb_autopassthru_get_encoder(int in_codec, int copy_mask, int fallback, int muxer); + int hb_get_best_mixdown(uint32_t codec, uint64_t layout, int mixdown); int hb_get_default_mixdown(uint32_t codec, uint64_t layout); + int hb_get_best_samplerate(uint32_t codec, int samplerate, int *sr_shift); -int hb_find_closest_audio_bitrate(int bitrate); + +int hb_find_closest_audio_bitrate(int bitrate); void hb_get_audio_bitrate_limits(uint32_t codec, int samplerate, int mixdown, int *low, int *high); -int hb_get_best_audio_bitrate( uint32_t codec, int bitrate, int samplerate, int mixdown); -int hb_get_default_audio_bitrate( uint32_t codec, int samplerate, int mixdown ); -void hb_get_audio_quality_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction); -float hb_get_best_audio_quality( uint32_t codec, float quality); -float hb_get_default_audio_quality( uint32_t codec ); -void hb_get_audio_compression_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction); -float hb_get_best_audio_compression( uint32_t codec, float compression); -float hb_get_default_audio_compression( uint32_t codec ); +int hb_get_best_audio_bitrate(uint32_t codec, int bitrate, int samplerate, int mixdown); +int hb_get_default_audio_bitrate(uint32_t codec, int samplerate, int mixdown); + +void hb_get_audio_quality_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction); +float hb_get_best_audio_quality(uint32_t codec, float quality); +float hb_get_default_audio_quality(uint32_t codec); + +void hb_get_audio_compression_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction); +float hb_get_best_audio_compression(uint32_t codec, float compression); +float hb_get_default_audio_compression(uint32_t codec); struct hb_title_set_s { |