Mercurial > libavcodec.hg

comparison mpegaudiodec.c @ 7329:104a00d9abfa libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Supply context argument to av_log() in mpeg audio decoder.
author andoma
date Sun, 20 Jul 2008 14:58:49 +0000
parents 7c13d54f389d
children 0a8486c08024
comparison
equal deleted inserted replaced
7328:9309e19c2b98 7329:104a00d9abfa
1575 if (pos > end_pos2 && last_pos){ 1575 if (pos > end_pos2 && last_pos){
1576 /* some encoders generate an incorrect size for this 1576 /* some encoders generate an incorrect size for this
1577 part. We must go back into the data */ 1577 part. We must go back into the data */
1578 s_index -= 4; 1578 s_index -= 4;
1579 skip_bits_long(&s->gb, last_pos - pos); 1579 skip_bits_long(&s->gb, last_pos - pos);
1580 av_log(NULL, AV_LOG_INFO, "overread, skip %d enddists: %d %d\n", last_pos - pos, end_pos-pos, end_pos2-pos); 1580 av_log(s->avctx, AV_LOG_INFO, "overread, skip %d enddists: %d %d\n", last_pos - pos, end_pos-pos, end_pos2-pos);
1581 if(s->error_resilience >= FF_ER_COMPLIANT) 1581 if(s->error_resilience >= FF_ER_COMPLIANT)
1582 s_index=0; 1582 s_index=0;
1583 break; 1583 break;
1584 } 1584 }
1585 // av_log(NULL, AV_LOG_ERROR, "pos2: %d %d %d %d\n", pos, end_pos, end_pos2, s_index); 1585 // av_log(NULL, AV_LOG_ERROR, "pos2: %d %d %d %d\n", pos, end_pos, end_pos2, s_index);
1611 } 1611 }
1612 /* skip extension bits */ 1612 /* skip extension bits */
1613 bits_left = end_pos2 - get_bits_count(&s->gb); 1613 bits_left = end_pos2 - get_bits_count(&s->gb);
1614 //av_log(NULL, AV_LOG_ERROR, "left:%d buf:%p\n", bits_left, s->in_gb.buffer); 1614 //av_log(NULL, AV_LOG_ERROR, "left:%d buf:%p\n", bits_left, s->in_gb.buffer);
1615 if (bits_left < 0/* || bits_left > 500*/) { 1615 if (bits_left < 0/* || bits_left > 500*/) {
1616 av_log(NULL, AV_LOG_ERROR, "bits_left=%d\n", bits_left); 1616 av_log(s->avctx, AV_LOG_ERROR, "bits_left=%d\n", bits_left);
1617 s_index=0; 1617 s_index=0;
1618 }else if(bits_left > 0 && s->error_resilience >= FF_ER_AGGRESSIVE){ 1618 }else if(bits_left > 0 && s->error_resilience >= FF_ER_AGGRESSIVE){
1619 av_log(NULL, AV_LOG_ERROR, "bits_left=%d\n", bits_left); 1619 av_log(s->avctx, AV_LOG_ERROR, "bits_left=%d\n", bits_left);
1620 s_index=0; 1620 s_index=0;
1621 } 1621 }
1622 memset(&g->sb_hybrid[s_index], 0, sizeof(*g->sb_hybrid)*(576 - s_index)); 1622 memset(&g->sb_hybrid[s_index], 0, sizeof(*g->sb_hybrid)*(576 - s_index));
1623 skip_bits_long(&s->gb, bits_left); 1623 skip_bits_long(&s->gb, bits_left);
1624 1624
2055 g->scalefac_compress = get_bits(&s->gb, 4); 2055 g->scalefac_compress = get_bits(&s->gb, 4);
2056 blocksplit_flag = get_bits1(&s->gb); 2056 blocksplit_flag = get_bits1(&s->gb);
2057 if (blocksplit_flag) { 2057 if (blocksplit_flag) {
2058 g->block_type = get_bits(&s->gb, 2); 2058 g->block_type = get_bits(&s->gb, 2);
2059 if (g->block_type == 0){ 2059 if (g->block_type == 0){
2060 av_log(NULL, AV_LOG_ERROR, "invalid block type\n"); 2060 av_log(s->avctx, AV_LOG_ERROR, "invalid block type\n");
2061 return -1; 2061 return -1;
2062 } 2062 }
2063 g->switch_point = get_bits1(&s->gb); 2063 g->switch_point = get_bits1(&s->gb);
2064 for(i=0;i<2;i++) 2064 for(i=0;i<2;i++)
2065 g->table_select[i] = get_bits(&s->gb, 5); 2065 g->table_select[i] = get_bits(&s->gb, 5);
2107 2107
2108 for(gr=0;gr<nb_granules;gr++) { 2108 for(gr=0;gr<nb_granules;gr++) {
2109 for(ch=0;ch<s->nb_channels;ch++) { 2109 for(ch=0;ch<s->nb_channels;ch++) {
2110 g = &granules[ch][gr]; 2110 g = &granules[ch][gr];
2111 if(get_bits_count(&s->gb)<0){ 2111 if(get_bits_count(&s->gb)<0){
2112 av_log(NULL, AV_LOG_ERROR, "mdb:%d, lastbuf:%d skipping granule %d\n", 2112 av_log(s->avctx, AV_LOG_ERROR, "mdb:%d, lastbuf:%d skipping granule %d\n",
2113 main_data_begin, s->last_buf_size, gr); 2113 main_data_begin, s->last_buf_size, gr);
2114 skip_bits_long(&s->gb, g->part2_3_length); 2114 skip_bits_long(&s->gb, g->part2_3_length);
2115 memset(g->sb_hybrid, 0, sizeof(g->sb_hybrid)); 2115 memset(g->sb_hybrid, 0, sizeof(g->sb_hybrid));
2116 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->in_gb.buffer){ 2116 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->in_gb.buffer){
2117 skip_bits_long(&s->in_gb, get_bits_count(&s->gb) - s->gb.size_in_bits); 2117 skip_bits_long(&s->in_gb, get_bits_count(&s->gb) - s->gb.size_in_bits);
2314 i= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3; 2314 i= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3;
2315 if(i >= 0 && i <= BACKSTEP_SIZE){ 2315 if(i >= 0 && i <= BACKSTEP_SIZE){
2316 memmove(s->last_buf, s->gb.buffer + (get_bits_count(&s->gb)>>3), i); 2316 memmove(s->last_buf, s->gb.buffer + (get_bits_count(&s->gb)>>3), i);
2317 s->last_buf_size=i; 2317 s->last_buf_size=i;
2318 }else 2318 }else
2319 av_log(NULL, AV_LOG_ERROR, "invalid old backstep %d\n", i); 2319 av_log(s->avctx, AV_LOG_ERROR, "invalid old backstep %d\n", i);
2320 s->gb= s->in_gb; 2320 s->gb= s->in_gb;
2321 s->in_gb.buffer= NULL; 2321 s->in_gb.buffer= NULL;
2322 } 2322 }
2323 2323
2324 align_get_bits(&s->gb); 2324 align_get_bits(&s->gb);
2325 assert((get_bits_count(&s->gb) & 7) == 0); 2325 assert((get_bits_count(&s->gb) & 7) == 0);
2326 i= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3; 2326 i= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3;
2327 2327
2328 if(i<0 || i > BACKSTEP_SIZE || nb_frames<0){ 2328 if(i<0 || i > BACKSTEP_SIZE || nb_frames<0){
2329 av_log(NULL, AV_LOG_ERROR, "invalid new backstep %d\n", i); 2329 av_log(s->avctx, AV_LOG_ERROR, "invalid new backstep %d\n", i);
2330 i= FFMIN(BACKSTEP_SIZE, buf_size - HEADER_SIZE); 2330 i= FFMIN(BACKSTEP_SIZE, buf_size - HEADER_SIZE);
2331 } 2331 }
2332 assert(i <= buf_size - HEADER_SIZE && i>= 0); 2332 assert(i <= buf_size - HEADER_SIZE && i>= 0);
2333 memcpy(s->last_buf + s->last_buf_size, s->gb.buffer + buf_size - HEADER_SIZE - i, i); 2333 memcpy(s->last_buf + s->last_buf_size, s->gb.buffer + buf_size - HEADER_SIZE - i, i);
2334 s->last_buf_size += i; 2334 s->last_buf_size += i;