comparison aac.c @ 7850:77030651ddd0 libavcodec

Only read some of TNS bitstream data in the case that the TNS filter order is non-zero as per the specification. Patch by Alex Converse (alex converse gmail com) Fixes another issue pertaining to issue632

7849:2bfde5b45e01

                    av_log(ac->avccontext, AV_LOG_ERROR, "TNS filter order %d is greater than maximum %d.",
                           tns->order[w][filt], tns_max_order);
                    tns->order[w][filt] = 0;
                    return -1;
                }
                tns->direction[w][filt] = get_bits1(gb);
                coef_compress = get_bits1(gb);
                coef_len = coef_res + 3 - coef_compress;
                tmp2_idx = 2*coef_compress + coef_res;

                for (i = 0; i < tns->order[w][filt]; i++)
                    tns->coef[w][filt][i] = tns_tmp2_map[tmp2_idx][get_bits(gb, coef_len)];
            }
        }
    }
    return 0;
}

7850:77030651ddd0

                    av_log(ac->avccontext, AV_LOG_ERROR, "TNS filter order %d is greater than maximum %d.",
                           tns->order[w][filt], tns_max_order);
                    tns->order[w][filt] = 0;
                    return -1;
                }
                if (tns->order[w][filt]) {
                tns->direction[w][filt] = get_bits1(gb);
                coef_compress = get_bits1(gb);
                coef_len = coef_res + 3 - coef_compress;
                tmp2_idx = 2*coef_compress + coef_res;

                for (i = 0; i < tns->order[w][filt]; i++)
                    tns->coef[w][filt][i] = tns_tmp2_map[tmp2_idx][get_bits(gb, coef_len)];
                }
            }
        }
    }
    return 0;
}