Author: alexc
Date: Fri Nov 20 21:29:01 2009
New Revision: 5454
Log:
bs_amp_res is overridden by 0 for (bs_frame_class == FIXFIX && bs_num_env == 1)
only for the current frame.
Modified:
aac-sbr/aacsbr.c
aac-sbr/aacsbr.h
Modified: aac-sbr/aacsbr.c
==============================================================================
--- aac-sbr/aacsbr.c Fri Nov 20 21:28:59 2009 (r5453)
+++ aac-sbr/aacsbr.c Fri Nov 20 21:29:01 2009 (r5454)
@@ -85,7 +85,7 @@ static unsigned int sbr_header(SpectralB
// Save last spectrum parameters variables to compare to new ones
memcpy(&sbr->spectrum_params[0], &sbr->spectrum_params[1],
sizeof(SpectrumParameters));
- sbr->bs_amp_res = get_bits1(gb);
+ sbr->bs_amp_res_header = get_bits1(gb);
sbr->spectrum_params[1].bs_start_freq = get_bits(gb, 4);
sbr->spectrum_params[1].bs_stop_freq = get_bits(gb, 4);
sbr->spectrum_params[1].bs_xover_band = get_bits(gb, 3);
@@ -501,6 +501,7 @@ static int sbr_grid(AACContext *ac, Spec
int i;
ch_data->bs_num_env[0] = ch_data->bs_num_env[1];
+ sbr->bs_amp_res = sbr->bs_amp_res_header;
switch (ch_data->bs_frame_class = get_bits(gb, 2)) {
case FIXFIX:
Modified: aac-sbr/aacsbr.h
==============================================================================
--- aac-sbr/aacsbr.h Fri Nov 20 21:28:59 2009 (r5453)
+++ aac-sbr/aacsbr.h Fri Nov 20 21:29:01 2009 (r5454)
@@ -109,6 +109,7 @@ typedef struct {
uint8_t start;
// SBR header bitstream variables
uint8_t bs_amp_res;
+ uint8_t bs_amp_res_header;
SpectrumParameters spectrum_params[2];
// if (bs_header_extra_2)
uint8_t bs_limiter_bands;
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
