Browse Source

lavc: Use supported_samplerates for Dolby Digital encoders.

Fixes ticket #8518.
tags/n4.3
Carl Eugen Hoyos 5 years ago
parent
commit
4679a474f0
5 changed files with 5 additions and 2 deletions
  1. +1
    -0
      libavcodec/ac3enc_fixed.c
  2. +1
    -0
      libavcodec/ac3enc_float.c
  3. +1
    -1
      libavcodec/ac3tab.c
  4. +1
    -1
      libavcodec/ac3tab.h
  5. +1
    -0
      libavcodec/eac3enc.c

+ 1
- 0
libavcodec/ac3enc_fixed.c View File

@@ -155,6 +155,7 @@ AVCodec ff_ac3_fixed_encoder = {
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16P, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.priv_class = &ac3enc_class, .priv_class = &ac3enc_class,
.supported_samplerates = ff_ac3_sample_rate_tab,
.channel_layouts = ff_ac3_channel_layouts, .channel_layouts = ff_ac3_channel_layouts,
.defaults = ac3_defaults, .defaults = ac3_defaults,
}; };

+ 1
- 0
libavcodec/ac3enc_float.c View File

@@ -150,6 +150,7 @@ AVCodec ff_ac3_encoder = {
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.priv_class = &ac3enc_class, .priv_class = &ac3enc_class,
.supported_samplerates = ff_ac3_sample_rate_tab,
.channel_layouts = ff_ac3_channel_layouts, .channel_layouts = ff_ac3_channel_layouts,
.defaults = ac3_defaults, .defaults = ac3_defaults,
}; };

+ 1
- 1
libavcodec/ac3tab.c View File

@@ -126,7 +126,7 @@ const uint8_t ff_ac3_dec_channel_map[8][2][6] = {
}; };


/* possible frequencies */ /* possible frequencies */
const uint16_t ff_ac3_sample_rate_tab[3] = { 48000, 44100, 32000 };
const int ff_ac3_sample_rate_tab[3] = { 48000, 44100, 32000 };


/* possible bitrates */ /* possible bitrates */
const uint16_t ff_ac3_bitrate_tab[19] = { const uint16_t ff_ac3_bitrate_tab[19] = {


+ 1
- 1
libavcodec/ac3tab.h View File

@@ -33,7 +33,7 @@ extern const uint8_t ff_ac3_channels_tab[8];
extern av_export_avcodec const uint16_t avpriv_ac3_channel_layout_tab[8]; extern av_export_avcodec const uint16_t avpriv_ac3_channel_layout_tab[8];
extern const uint8_t ff_ac3_enc_channel_map[8][2][6]; extern const uint8_t ff_ac3_enc_channel_map[8][2][6];
extern const uint8_t ff_ac3_dec_channel_map[8][2][6]; extern const uint8_t ff_ac3_dec_channel_map[8][2][6];
extern const uint16_t ff_ac3_sample_rate_tab[3];
extern const int ff_ac3_sample_rate_tab[3];
extern const uint16_t ff_ac3_bitrate_tab[19]; extern const uint16_t ff_ac3_bitrate_tab[19];
extern const uint8_t ff_ac3_rematrix_band_tab[5]; extern const uint8_t ff_ac3_rematrix_band_tab[5];
extern const uint8_t ff_eac3_default_cpl_band_struct[18]; extern const uint8_t ff_eac3_default_cpl_band_struct[18];


+ 1
- 0
libavcodec/eac3enc.c View File

@@ -263,6 +263,7 @@ AVCodec ff_eac3_encoder = {
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.priv_class = &eac3enc_class, .priv_class = &eac3enc_class,
.supported_samplerates = ff_ac3_sample_rate_tab,
.channel_layouts = ff_ac3_channel_layouts, .channel_layouts = ff_ac3_channel_layouts,
.defaults = ac3_defaults, .defaults = ac3_defaults,
}; };

Loading…
Cancel
Save