summaryrefslogtreecommitdiffstats
path: root/libhb/audio_resample.h
diff options
context:
space:
mode:
authorRodeo <[email protected]>2014-02-18 02:26:52 +0000
committerRodeo <[email protected]>2014-02-18 02:26:52 +0000
commit52036382899171921343e10053fa3adaedcb19d2 (patch)
tree9c0204eeee2959d85b55b74984936e8cf46ce82a /libhb/audio_resample.h
parent6bd1bab325550ccc8a9c9d3ee372a0aaa2e75c2e (diff)
Bump libav to v10_beta1
Remove some patches that have been applied upstream. Add support for AVDownmixInfo side data (i.e. mix levels). git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6039 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/audio_resample.h')
-rw-r--r--libhb/audio_resample.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/libhb/audio_resample.h b/libhb/audio_resample.h
index 9242d78a5..3b9c646ff 100644
--- a/libhb/audio_resample.h
+++ b/libhb/audio_resample.h
@@ -24,6 +24,8 @@
/* Default mix level for center and surround channels */
#define HB_MIXLEV_DEFAULT ((double)M_SQRT1_2)
+/* Default mix level for LFE channel */
+#define HB_MIXLEV_ZERO ((double)0.0)
typedef struct
{
@@ -36,6 +38,7 @@ typedef struct
struct
{
uint64_t channel_layout;
+ double lfe_mix_level;
double center_mix_level;
double surround_mix_level;
enum AVSampleFormat sample_fmt;
@@ -45,6 +48,7 @@ typedef struct
{
int channels;
uint64_t channel_layout;
+ double lfe_mix_level;
double center_mix_level;
double surround_mix_level;
enum AVSampleFormat sample_fmt;
@@ -81,7 +85,8 @@ void hb_audio_resample_set_channel_layout(hb_audio_resample_t *r
void hb_audio_resample_set_mix_levels(hb_audio_resample_t *resample,
double surround_mix_level,
- double center_mix_level);
+ double center_mix_level,
+ double lfe_mix_level);
void hb_audio_resample_set_sample_fmt(hb_audio_resample_t *resample,
enum AVSampleFormat sample_fmt);