comparison mpegaudiodec.c @ 5089:bff60ecc02f9 libavcodec

Use AV_xx throughout libavcodec
author ramiro
date Sat, 02 Jun 2007 01:41:07 +0000
parents 796c2a5481ad
children 94c3f01c243c
comparison
equal deleted inserted replaced
5088:8e206208db1f 5089:bff60ecc02f9
2378 2378
2379 retry: 2379 retry:
2380 if(buf_size < HEADER_SIZE) 2380 if(buf_size < HEADER_SIZE)
2381 return -1; 2381 return -1;
2382 2382
2383 header = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]; 2383 header = AV_RB32(buf);
2384 if(ff_mpa_check_header(header) < 0){ 2384 if(ff_mpa_check_header(header) < 0){
2385 buf++; 2385 buf++;
2386 // buf_size--; 2386 // buf_size--;
2387 av_log(avctx, AV_LOG_ERROR, "Header missing skipping one byte.\n"); 2387 av_log(avctx, AV_LOG_ERROR, "Header missing skipping one byte.\n");
2388 goto retry; 2388 goto retry;
2457 2457
2458 if (len > MPA_MAX_CODED_FRAME_SIZE) 2458 if (len > MPA_MAX_CODED_FRAME_SIZE)
2459 len = MPA_MAX_CODED_FRAME_SIZE; 2459 len = MPA_MAX_CODED_FRAME_SIZE;
2460 2460
2461 // Get header and restore sync word 2461 // Get header and restore sync word
2462 header = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3] | 0xffe00000; 2462 header = AV_RB32(buf) | 0xffe00000;
2463 2463
2464 if (ff_mpa_check_header(header) < 0) { // Bad header, discard frame 2464 if (ff_mpa_check_header(header) < 0) { // Bad header, discard frame
2465 *data_size = 0; 2465 *data_size = 0;
2466 return buf_size; 2466 return buf_size;
2467 } 2467 }
2602 fsize = MPA_MAX_CODED_FRAME_SIZE; 2602 fsize = MPA_MAX_CODED_FRAME_SIZE;
2603 m = s->mp3decctx[fr]; 2603 m = s->mp3decctx[fr];
2604 assert (m != NULL); 2604 assert (m != NULL);
2605 2605
2606 // Get header 2606 // Get header
2607 header = (start[0] << 24) | (start[1] << 16) | (start[2] << 8) | start[3] | 0xfff00000; 2607 header = AV_RB32(start) | 0xfff00000;
2608 2608
2609 if (ff_mpa_check_header(header) < 0) { // Bad header, discard block 2609 if (ff_mpa_check_header(header) < 0) { // Bad header, discard block
2610 *data_size = 0; 2610 *data_size = 0;
2611 return buf_size; 2611 return buf_size;
2612 } 2612 }