History

avcodec/ac3enc: Remove disabled code for RealAudio variant of AC-3

Implicitly disabled by 4679a474f06c229b10976d7f0b4eee0613c2715a. Given that no one has ever complained about this, this commit removes the now dead code.

Andreas Rheinhardt committed 2 years ago

Commit fee093a1 parent 27a830c4 files · +17 −41Browse files

Unified · Split

4 files
  1. doc/encoders.texi +1 −2
  2. libavcodec/ac3enc.c +14 −30
  3. libavcodec/ac3enc.h +0 −2
  4. libavcodec/eac3enc.c +2 −7
doc/encoders.texi+1−2
@@ -144,8 +144,7 @@ If this option is unspecified it is set to @samp{aac_low}. · 143 unmodified lines
144144
145145 AC-3 audio encoders.
146146
147−These encoders implement part of ATSC A/52:2010 and ETSI TS 102 366, as well as
148−the undocumented RealAudio 3 (a.k.a. dnet).
147+These encoders implement part of ATSC A/52:2010 and ETSI TS 102 366.
149148
150149 The @var{ac3} encoder uses floating-point math, while the @var{ac3_fixed}
151150 encoder only uses fixed-point integer math. This does not mean that one is
libavcodec/ac3enc.c+14−30
@@ -874,8 +874,8 @@ static av_cold void bit_alloc_init(AC3EncodeContext *s) · 873 unmodified lines
874874 /* compute real values */
875875 /* currently none of these values change during encoding, so we can just
876876 set them once at initialization */
877− s->bit_alloc.slow_decay = ff_ac3_slow_decay_tab[s->slow_decay_code] >> s->bit_alloc.sr_shift;
878− s->bit_alloc.fast_decay = ff_ac3_fast_decay_tab[s->fast_decay_code] >> s->bit_alloc.sr_shift;
877+ s->bit_alloc.slow_decay = ff_ac3_slow_decay_tab[s->slow_decay_code];
878+ s->bit_alloc.fast_decay = ff_ac3_fast_decay_tab[s->fast_decay_code];
879879 s->bit_alloc.slow_gain = ff_ac3_slow_gain_tab[s->slow_gain_code];
880880 s->bit_alloc.db_per_bit = ff_ac3_db_per_bit_tab[s->db_per_bit_code];
881881 s->bit_alloc.floor = ff_ac3_floor_tab[s->floor_code];
@@ -1812,8 +1812,6 @@ static void dprint_options(AC3EncodeContext *s) · 930 unmodified lines
18121812 switch (s->bitstream_id) {
18131813 case 6: msg = "AC-3 (alt syntax)"; break;
18141814 case 8: msg = "AC-3 (standard)"; break;
1815− case 9: msg = "AC-3 (dnet half-rate)"; break;
1816− case 10: msg = "AC-3 (dnet quater-rate)"; break;
18171815 case 16: msg = "E-AC-3 (enhanced)"; break;
18181816 default: msg = "ERROR";
18191817 }
@@ -2132,18 +2130,8 @@ int ff_ac3_validate_metadata(AC3EncodeContext *s) · 312 unmodified lines
21322130 }
21332131
21342132 /* set bitstream id for alternate bitstream syntax */
2135− if (!s->eac3 && (opt->extended_bsi_1 || opt->extended_bsi_2)) {
2136− if (s->bitstream_id > 8 && s->bitstream_id < 11) {
2137− if (!s->warned_alternate_bitstream) {
2138− av_log(avctx, AV_LOG_WARNING, "alternate bitstream syntax is "
2139− "not compatible with reduced samplerates. writing of "
2140− "extended bitstream information will be disabled.\n");
2141− s->warned_alternate_bitstream = 1;
2142− }
2143− } else {
2144− s->bitstream_id = 6;
2145− }
2146− }
2133+ if (!s->eac3 && (opt->extended_bsi_1 || opt->extended_bsi_2))
2134+ s->bitstream_id = 6;
21472135
21482136 return 0;
21492137 }
@@ -2233,23 +2221,19 @@ static av_cold void set_channel_info(AVCodecContext *avctx) · 83 unmodified lines
22332221 static av_cold int validate_options(AC3EncodeContext *s)
22342222 {
22352223 AVCodecContext *avctx = s->avctx;
2236− int i, ret, max_sr;
2224+ int ret;
22372225
22382226 set_channel_info(avctx);
22392227
2240− /* validate sample rate */
2241− /* note: max_sr could be changed from 2 to 5 for E-AC-3 once we find a
2242− decoder that supports half sample rate so we can validate that
2243− the generated files are correct. */
2244− max_sr = s->eac3 ? 2 : 8;
2245− for (i = 0; i <= max_sr; i++) {
2246− if ((ff_ac3_sample_rate_tab[i % 3] >> (i / 3)) == avctx->sample_rate)
2228+ for (int i = 0;; i++) {
2229+ if (ff_ac3_sample_rate_tab[i] == avctx->sample_rate) {
2230+ s->bit_alloc.sr_code = i;
22472231 break;
2232+ }
2233+ av_assert1(ff_ac3_sample_rate_tab[i] != 0);
22482234 }
22492235 s->sample_rate = avctx->sample_rate;
2250− s->bit_alloc.sr_shift = i / 3;
2251− s->bit_alloc.sr_code = i % 3;
2252− s->bitstream_id = s->eac3 ? 16 : 8 + s->bit_alloc.sr_shift;
2236+ s->bitstream_id = s->eac3 ? 16 : 8;
22532237
22542238 /* select a default bit rate if not set by the user */
22552239 if (!avctx->bit_rate) {
@@ -2297,7 +2281,7 @@ static av_cold int validate_options(AC3EncodeContext *s) · 41 unmodified lines
22972281 parameter selection */
22982282 min_br_code = -1;
22992283 min_br_dist = INT64_MAX;
2300− for (i = 0; i < 19; i++) {
2284+ for (int i = 0; i < 19; i++) {
23012285 long long br_dist = llabs(ff_ac3_bitrate_tab[i] * 1000 - avctx->bit_rate);
23022286 if (br_dist < min_br_dist) {
23032287 min_br_dist = br_dist;
@@ -2313,8 +2297,8 @@ static av_cold int validate_options(AC3EncodeContext *s) · 9 unmodified lines
23132297 } else {
23142298 int best_br = 0, best_code = 0;
23152299 long long best_diff = INT64_MAX;
2316− for (i = 0; i < 19; i++) {
2317− int br = (ff_ac3_bitrate_tab[i] >> s->bit_alloc.sr_shift) * 1000;
2300+ for (int i = 0; i < 19; i++) {
2301+ int br = ff_ac3_bitrate_tab[i] * 1000;
23182302 long long diff = llabs(br - avctx->bit_rate);
23192303 if (diff < best_diff) {
23202304 best_br = br;
libavcodec/ac3enc.h+0−2
@@ -256,8 +256,6 @@ typedef struct AC3EncodeContext { · 255 unmodified lines
256256 uint8_t *ref_bap [AC3_MAX_CHANNELS][AC3_MAX_BLOCKS]; ///< bit allocation pointers (bap)
257257 int ref_bap_set; ///< indicates if ref_bap pointers have been set
258258
259− int warned_alternate_bitstream;
260−
261259 /* fixed vs. float function pointers */
262260 int (*mdct_init)(struct AC3EncodeContext *s);
263261
libavcodec/eac3enc.c+2−7
@@ -134,13 +134,8 @@ void ff_eac3_output_frame_header(AC3EncodeContext *s) · 133 unmodified lines
134134 put_bits(&s->pb, 2, 0); /* stream type = independent */
135135 put_bits(&s->pb, 3, 0); /* substream id = 0 */
136136 put_bits(&s->pb, 11, (s->frame_size / 2) - 1); /* frame size */
137− if (s->bit_alloc.sr_shift) {
138− put_bits(&s->pb, 2, 0x3); /* fscod2 */
139− put_bits(&s->pb, 2, s->bit_alloc.sr_code); /* sample rate code */
140− } else {
141− put_bits(&s->pb, 2, s->bit_alloc.sr_code); /* sample rate code */
142− put_bits(&s->pb, 2, s->num_blks_code); /* number of blocks */
143− }
137+ put_bits(&s->pb, 2, s->bit_alloc.sr_code); /* sample rate code */
138+ put_bits(&s->pb, 2, s->num_blks_code); /* number of blocks */
144139 put_bits(&s->pb, 3, s->channel_mode); /* audio coding mode */
145140 put_bits(&s->pb, 1, s->lfe_on); /* LFE channel indicator */
146141 put_bits(&s->pb, 5, s->bitstream_id); /* bitstream id (EAC3=16) */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t