mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
copy default coupling band structure from table to decoding context (used for E-AC-3)
Originally committed as revision 14990 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e43b29ab26
commit
0ffea2439b
@ -824,6 +824,9 @@ static int decode_audio_block(AC3DecodeContext *s, int blk)
|
|||||||
s->cpl_band_struct[bnd] = get_bits1(gbc);
|
s->cpl_band_struct[bnd] = get_bits1(gbc);
|
||||||
}
|
}
|
||||||
} else if (!blk) {
|
} else if (!blk) {
|
||||||
|
memcpy(s->cpl_band_struct,
|
||||||
|
&ff_eac3_default_cpl_band_struct[cpl_begin_freq+1],
|
||||||
|
s->num_cpl_subbands-1);
|
||||||
}
|
}
|
||||||
s->cpl_band_struct[s->num_cpl_subbands-1] = 0;
|
s->cpl_band_struct[s->num_cpl_subbands-1] = 0;
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ typedef struct {
|
|||||||
int phase_flags[18]; ///< phase flags (phsflg)
|
int phase_flags[18]; ///< phase flags (phsflg)
|
||||||
int num_cpl_subbands; ///< number of coupling sub bands (ncplsubnd)
|
int num_cpl_subbands; ///< number of coupling sub bands (ncplsubnd)
|
||||||
int num_cpl_bands; ///< number of coupling bands (ncplbnd)
|
int num_cpl_bands; ///< number of coupling bands (ncplbnd)
|
||||||
int cpl_band_struct[18]; ///< coupling band structure (cplbndstrc)
|
uint8_t cpl_band_struct[18]; ///< coupling band structure (cplbndstrc)
|
||||||
int firstchincpl; ///< first channel in coupling
|
int firstchincpl; ///< first channel in coupling
|
||||||
int first_cpl_coords[AC3_MAX_CHANNELS]; ///< first coupling coordinates states (firstcplcos)
|
int first_cpl_coords[AC3_MAX_CHANNELS]; ///< first coupling coordinates states (firstcplcos)
|
||||||
int cpl_coords[AC3_MAX_CHANNELS][18]; ///< coupling coordinates (cplco)
|
int cpl_coords[AC3_MAX_CHANNELS][18]; ///< coupling coordinates (cplco)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user