Mercurial > libavcodec.hg

comparison aac.c @ 10621:62b3faabb663 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set the SBR mode to implicit on ADTS frames occurring before the output is locked.
author alexc
date Wed, 02 Dec 2009 09:07:32 +0000
parents a0dd118e82ae
children 2474aceea736
comparison
equal deleted inserted replaced
10620:972b17631531 10621:62b3faabb663
1685 if (output_configure(ac, ac->che_pos, new_che_pos, hdr_info.chan_config, OC_TRIAL_FRAME)) 1685 if (output_configure(ac, ac->che_pos, new_che_pos, hdr_info.chan_config, OC_TRIAL_FRAME))
1686 return -7; 1686 return -7;
1687 } else if (ac->output_configured != OC_LOCKED) { 1687 } else if (ac->output_configured != OC_LOCKED) {
1688 ac->output_configured = OC_NONE; 1688 ac->output_configured = OC_NONE;
1689 } 1689 }
1690 if (ac->output_configured != OC_LOCKED)
1691 ac->m4ac.sbr = -1;
1690 ac->m4ac.sample_rate = hdr_info.sample_rate; 1692 ac->m4ac.sample_rate = hdr_info.sample_rate;
1691 ac->m4ac.sampling_index = hdr_info.sampling_index; 1693 ac->m4ac.sampling_index = hdr_info.sampling_index;
1692 ac->m4ac.object_type = hdr_info.object_type; 1694 ac->m4ac.object_type = hdr_info.object_type;
1693 if (hdr_info.num_aac_frames == 1) { 1695 if (hdr_info.num_aac_frames == 1) {
1694 if (!hdr_info.crc_absent) 1696 if (!hdr_info.crc_absent)