annotate aac_ac3_parser.c @ 7275:c5bcb9e4c5b2 libavcodec

Revert r14218. FFMAX is a macro, so sum = FFMAX(1, scalar_product(...)); might calculate the scalar product twice, which is slower.
author vitor
date Mon, 14 Jul 2008 14:41:01 +0000
parents 2d1497d25251
children 1a93d3bbe3ee
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4941
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
1 /*
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
2 * Common AAC and AC3 parser
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
3 * Copyright (c) 2003 Fabrice Bellard.
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
4 * Copyright (c) 2003 Michael Niedermayer.
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
5 *
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
6 * This file is part of FFmpeg.
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
7 *
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
8 * FFmpeg is free software; you can redistribute it and/or
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
9 * modify it under the terms of the GNU Lesser General Public
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
10 * License as published by the Free Software Foundation; either
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
11 * version 2.1 of the License, or (at your option) any later version.
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
12 *
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
13 * FFmpeg is distributed in the hope that it will be useful,
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
16 * Lesser General Public License for more details.
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
17 *
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
18 * You should have received a copy of the GNU Lesser General Public
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
19 * License along with FFmpeg; if not, write to the Free Software
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
21 */
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
22
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
23 #include "parser.h"
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
24 #include "aac_ac3_parser.h"
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
25
4942
b42e963c8149 cosmetics: rename for consistency after previous aac and ac3 parsers move
aurel
parents: 4941
diff changeset
26 int ff_aac_ac3_parse(AVCodecParserContext *s1,
4941
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
27 AVCodecContext *avctx,
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
28 const uint8_t **poutbuf, int *poutbuf_size,
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
29 const uint8_t *buf, int buf_size)
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
30 {
4942
b42e963c8149 cosmetics: rename for consistency after previous aac and ac3 parsers move
aurel
parents: 4941
diff changeset
31 AACAC3ParseContext *s = s1->priv_data;
6642
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
32 ParseContext *pc = &s->pc;
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
33 int len, i;
6643
4d04fcb5e1e4 Add new_frame_start and need_next_header.
michael
parents: 6642
diff changeset
34 int new_frame_start;
5816
0168cd384df3 factorize code and add safety check to prevent memcpying negative amounts
michael
parents: 4942
diff changeset
35
6644
1d9eb7c09f98 part 1 of EAC3 support
michael
parents: 6643
diff changeset
36 get_next:
6642
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
37 i=END_NOT_FOUND;
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
38 if(s->remaining_size <= buf_size){
6644
1d9eb7c09f98 part 1 of EAC3 support
michael
parents: 6643
diff changeset
39 if(s->remaining_size && !s->need_next_header){
6642
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
40 i= s->remaining_size;
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
41 s->remaining_size = 0;
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
42 }else{ //we need a header first
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
43 len=0;
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
44 for(i=s->remaining_size; i<buf_size; i++){
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
45 s->state = (s->state<<8) + buf[i];
6643
4d04fcb5e1e4 Add new_frame_start and need_next_header.
michael
parents: 6642
diff changeset
46 if((len=s->sync(s->state, s, &s->need_next_header, &new_frame_start)))
6642
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
47 break;
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
48 }
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
49 if(len<=0){
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
50 i=END_NOT_FOUND;
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
51 }else{
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
52 i-= s->header_size -1;
6646
7ca428109684 100l I broke AC3 in MPEG seeking.
michael
parents: 6644
diff changeset
53 s->remaining_size = len;
6650
2d1497d25251 This fixes the code so it is correct on both sides of the if().
michael
parents: 6649
diff changeset
54 if(!new_frame_start){
2d1497d25251 This fixes the code so it is correct on both sides of the if().
michael
parents: 6649
diff changeset
55 s->remaining_size += i;
6644
1d9eb7c09f98 part 1 of EAC3 support
michael
parents: 6643
diff changeset
56 goto get_next;
6650
2d1497d25251 This fixes the code so it is correct on both sides of the if().
michael
parents: 6649
diff changeset
57 }
6642
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
58 }
6576
5e7c69ebc019 undo changes in aac_ac3_parser
bwolowiec
parents: 6572
diff changeset
59 }
6642
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
60 }
5816
0168cd384df3 factorize code and add safety check to prevent memcpying negative amounts
michael
parents: 4942
diff changeset
61
6642
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
62 if(ff_combine_frame(pc, i, &buf, &buf_size)<0){
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
63 s->remaining_size -= FFMIN(s->remaining_size, buf_size);
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
64 *poutbuf = NULL;
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
65 *poutbuf_size = 0;
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
66 return buf_size;
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
67 }
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
68
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
69 *poutbuf = buf;
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
70 *poutbuf_size = buf_size;
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
71
6649
michael
parents: 6646
diff changeset
72 /* update codec info */
michael
parents: 6646
diff changeset
73 avctx->sample_rate = s->sample_rate;
michael
parents: 6646
diff changeset
74 /* allow downmixing to stereo (or mono for AC3) */
michael
parents: 6646
diff changeset
75 if(avctx->request_channels > 0 &&
michael
parents: 6646
diff changeset
76 avctx->request_channels < s->channels &&
michael
parents: 6646
diff changeset
77 (avctx->request_channels <= 2 ||
michael
parents: 6646
diff changeset
78 (avctx->request_channels == 1 &&
michael
parents: 6646
diff changeset
79 avctx->codec_id == CODEC_ID_AC3))) {
michael
parents: 6646
diff changeset
80 avctx->channels = avctx->request_channels;
michael
parents: 6646
diff changeset
81 } else {
michael
parents: 6646
diff changeset
82 avctx->channels = s->channels;
michael
parents: 6646
diff changeset
83 }
michael
parents: 6646
diff changeset
84 avctx->bit_rate = s->bit_rate;
michael
parents: 6646
diff changeset
85 avctx->frame_size = s->samples;
6642
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
86
866b9ade048c Change aac and ac3 parsers to use ff_combine_frame().
michael
parents: 6639
diff changeset
87 return i;
4941
c3ee5c30c297 move aac and ac3 parsers in their own files
aurel
parents:
diff changeset
88 }