Mercurial > libavcodec.hg
annotate aac_ac3_parser.c @ 11043:916df4ea4e64 libavcodec
Initialize thread_context[0] with h264 parser context.
This allows freeing the parser memory in the thread_context freeing loop.
Patch by Rafa?l Carr? gmailify(rafael, carre)
| author | benoit |
|---|---|
| date | Thu, 28 Jan 2010 13:04:25 +0000 |
| parents | 4d13e2e2503a |
| children | 9056fd765255 |
| rev | line source |
|---|---|
| 4941 | 1 /* |
|
7470
1a93d3bbe3ee
cosmetics: make all references to AC-3 capitalized and hyphenated
jbr
parents:
6650
diff
changeset
|
2 * Common AAC and AC-3 parser |
|
8629
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
8082
diff
changeset
|
3 * Copyright (c) 2003 Fabrice Bellard |
|
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
8082
diff
changeset
|
4 * Copyright (c) 2003 Michael Niedermayer |
| 4941 | 5 * |
| 6 * This file is part of FFmpeg. | |
| 7 * | |
| 8 * FFmpeg is free software; you can redistribute it and/or | |
| 9 * modify it under the terms of the GNU Lesser General Public | |
| 10 * License as published by the Free Software Foundation; either | |
| 11 * version 2.1 of the License, or (at your option) any later version. | |
| 12 * | |
| 13 * FFmpeg is distributed in the hope that it will be useful, | |
| 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 16 * Lesser General Public License for more details. | |
| 17 * | |
| 18 * You should have received a copy of the GNU Lesser General Public | |
| 19 * License along with FFmpeg; if not, write to the Free Software | |
| 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
| 21 */ | |
| 22 | |
| 23 #include "parser.h" | |
| 24 #include "aac_ac3_parser.h" | |
| 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 | 27 AVCodecContext *avctx, |
| 28 const uint8_t **poutbuf, int *poutbuf_size, | |
| 29 const uint8_t *buf, int buf_size) | |
| 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 | 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 | 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 | 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 | 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{ |
| 8082 | 52 s->state=0; |
|
6642
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
53 i-= s->header_size -1; |
| 6646 | 54 s->remaining_size = len; |
|
7903
ad95dd08b31a
Fix all the recent problems Justin had run into with the AC3 parser,
michael
parents:
7769
diff
changeset
|
55 if(!new_frame_start || pc->index+i<=0){ |
|
6650
2d1497d25251
This fixes the code so it is correct on both sides of the if().
michael
parents:
6649
diff
changeset
|
56 s->remaining_size += i; |
| 6644 | 57 goto get_next; |
|
6650
2d1497d25251
This fixes the code so it is correct on both sides of the if().
michael
parents:
6649
diff
changeset
|
58 } |
|
6642
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
59 } |
| 6576 | 60 } |
|
6642
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
61 } |
|
5816
0168cd384df3
factorize code and add safety check to prevent memcpying negative amounts
michael
parents:
4942
diff
changeset
|
62 |
|
6642
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
63 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
|
64 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
|
65 *poutbuf = NULL; |
|
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
66 *poutbuf_size = 0; |
|
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
67 return buf_size; |
|
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 |
|
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
70 *poutbuf = buf; |
|
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
71 *poutbuf_size = buf_size; |
|
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
72 |
| 6649 | 73 /* update codec info */ |
| 74 avctx->sample_rate = s->sample_rate; | |
| 8977 | 75 if(s->codec_id) |
| 76 avctx->codec_id = s->codec_id; | |
| 77 | |
|
7470
1a93d3bbe3ee
cosmetics: make all references to AC-3 capitalized and hyphenated
jbr
parents:
6650
diff
changeset
|
78 /* allow downmixing to stereo (or mono for AC-3) */ |
| 6649 | 79 if(avctx->request_channels > 0 && |
| 80 avctx->request_channels < s->channels && | |
| 81 (avctx->request_channels <= 2 || | |
| 82 (avctx->request_channels == 1 && | |
| 7769 | 83 (avctx->codec_id == CODEC_ID_AC3 || |
| 84 avctx->codec_id == CODEC_ID_EAC3)))) { | |
| 6649 | 85 avctx->channels = avctx->request_channels; |
| 9635 | 86 } else if (avctx->codec_id != CODEC_ID_AAC || s->channels) { |
| 6649 | 87 avctx->channels = s->channels; |
|
9512
ba5d9a97ab2f
Add channel layout support to the AC-3 decoder and AC-3 parser.
jbr
parents:
8977
diff
changeset
|
88 avctx->channel_layout = s->channel_layout; |
| 6649 | 89 } |
| 90 avctx->bit_rate = s->bit_rate; | |
| 91 avctx->frame_size = s->samples; | |
|
6642
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
92 |
|
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
93 return i; |
| 4941 | 94 } |
