Mercurial > libavformat.hg
annotate adtsenc.c @ 6234:0287312dda71 libavformat
rtpdec_asf: Propagate errors from the chained av_open_input_stream
This fixes the crash in issue 2070.
author | mstorsjo |
---|---|
date | Mon, 05 Jul 2010 16:46:00 +0000 |
parents | 1327f1008940 |
children | 79b5e6fa86c9 |
rev | line source |
---|---|
939 | 1 /* |
2 * ADTS muxer. | |
3 * Copyright (c) 2006 Baptiste Coudurier <baptiste.coudurier@smartjog.com> | |
2218 | 4 * Mans Rullgard <mans@mansr.com> |
939 | 5 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
6 * This file is part of FFmpeg. |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
7 * |
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
8 * FFmpeg is free software; you can redistribute it and/or |
939 | 9 * modify it under the terms of the GNU Lesser General Public |
10 * License as published by the Free Software Foundation; either | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
11 * version 2.1 of the License, or (at your option) any later version. |
939 | 12 * |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
13 * FFmpeg is distributed in the hope that it will be useful, |
939 | 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 | |
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1169
diff
changeset
|
19 * License along with FFmpeg; if not, write to the Free Software |
939 | 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
21 */ | |
3286 | 22 |
4872 | 23 #include "libavcodec/get_bits.h" |
4864
7aa7c5853bb6
Split bitstream.h, put the bitstream writer stuff in the new file
stefano
parents:
4666
diff
changeset
|
24 #include "libavcodec/put_bits.h" |
5079
cc9c5e6b8ccf
Use av_log_missing_feature in the ADTS encoder. (Pseudo reverts r19173).
alexc
parents:
5025
diff
changeset
|
25 #include "libavcodec/avcodec.h" |
6205
1327f1008940
Allow remuxing of explicitly signalled AAC files into ADTS.
alexc
parents:
5787
diff
changeset
|
26 #include "libavcodec/mpeg4audio.h" |
939 | 27 #include "avformat.h" |
5787
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
28 #include "adts.h" |
939 | 29 |
5787
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
30 int ff_adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t *buf, int size) |
939 | 31 { |
32 GetBitContext gb; | |
4934 | 33 PutBitContext pb; |
6205
1327f1008940
Allow remuxing of explicitly signalled AAC files into ADTS.
alexc
parents:
5787
diff
changeset
|
34 MPEG4AudioConfig m4ac; |
1327f1008940
Allow remuxing of explicitly signalled AAC files into ADTS.
alexc
parents:
5787
diff
changeset
|
35 int off; |
939 | 36 |
37 init_get_bits(&gb, buf, size * 8); | |
6205
1327f1008940
Allow remuxing of explicitly signalled AAC files into ADTS.
alexc
parents:
5787
diff
changeset
|
38 off = ff_mpeg4audio_get_config(&m4ac, buf, size); |
1327f1008940
Allow remuxing of explicitly signalled AAC files into ADTS.
alexc
parents:
5787
diff
changeset
|
39 if (off < 0) |
1327f1008940
Allow remuxing of explicitly signalled AAC files into ADTS.
alexc
parents:
5787
diff
changeset
|
40 return off; |
1327f1008940
Allow remuxing of explicitly signalled AAC files into ADTS.
alexc
parents:
5787
diff
changeset
|
41 skip_bits_long(&gb, off); |
1327f1008940
Allow remuxing of explicitly signalled AAC files into ADTS.
alexc
parents:
5787
diff
changeset
|
42 adts->objecttype = m4ac.object_type - 1; |
1327f1008940
Allow remuxing of explicitly signalled AAC files into ADTS.
alexc
parents:
5787
diff
changeset
|
43 adts->sample_rate_index = m4ac.sampling_index; |
1327f1008940
Allow remuxing of explicitly signalled AAC files into ADTS.
alexc
parents:
5787
diff
changeset
|
44 adts->channel_conf = m4ac.chan_config; |
939 | 45 |
4666
bf7e0b55d9ec
ADTS: Increased protection against writing illegal/nonsense files.
alexc
parents:
4482
diff
changeset
|
46 if (adts->objecttype > 3U) { |
4468
d23db4a449ed
Report the illegal audio object type, not it offset by 1.
alexc
parents:
4467
diff
changeset
|
47 av_log(s, AV_LOG_ERROR, "MPEG-4 AOT %d is not allowed in ADTS\n", adts->objecttype+1); |
4467
1dae64d3a6ff
ADTS Muxer: Refuse to write illegal ADTS files by checking validity of header
superdump
parents:
3424
diff
changeset
|
48 return -1; |
1dae64d3a6ff
ADTS Muxer: Refuse to write illegal ADTS files by checking validity of header
superdump
parents:
3424
diff
changeset
|
49 } |
1dae64d3a6ff
ADTS Muxer: Refuse to write illegal ADTS files by checking validity of header
superdump
parents:
3424
diff
changeset
|
50 if (adts->sample_rate_index == 15) { |
1dae64d3a6ff
ADTS Muxer: Refuse to write illegal ADTS files by checking validity of header
superdump
parents:
3424
diff
changeset
|
51 av_log(s, AV_LOG_ERROR, "Escape sample rate index illegal in ADTS\n"); |
1dae64d3a6ff
ADTS Muxer: Refuse to write illegal ADTS files by checking validity of header
superdump
parents:
3424
diff
changeset
|
52 return -1; |
1dae64d3a6ff
ADTS Muxer: Refuse to write illegal ADTS files by checking validity of header
superdump
parents:
3424
diff
changeset
|
53 } |
4666
bf7e0b55d9ec
ADTS: Increased protection against writing illegal/nonsense files.
alexc
parents:
4482
diff
changeset
|
54 if (get_bits(&gb, 1)) { |
bf7e0b55d9ec
ADTS: Increased protection against writing illegal/nonsense files.
alexc
parents:
4482
diff
changeset
|
55 av_log(s, AV_LOG_ERROR, "960/120 MDCT window is not allowed in ADTS\n"); |
bf7e0b55d9ec
ADTS: Increased protection against writing illegal/nonsense files.
alexc
parents:
4482
diff
changeset
|
56 return -1; |
bf7e0b55d9ec
ADTS: Increased protection against writing illegal/nonsense files.
alexc
parents:
4482
diff
changeset
|
57 } |
bf7e0b55d9ec
ADTS: Increased protection against writing illegal/nonsense files.
alexc
parents:
4482
diff
changeset
|
58 if (get_bits(&gb, 1)) { |
bf7e0b55d9ec
ADTS: Increased protection against writing illegal/nonsense files.
alexc
parents:
4482
diff
changeset
|
59 av_log(s, AV_LOG_ERROR, "Scalable configurations are not allowed in ADTS\n"); |
bf7e0b55d9ec
ADTS: Increased protection against writing illegal/nonsense files.
alexc
parents:
4482
diff
changeset
|
60 return -1; |
bf7e0b55d9ec
ADTS: Increased protection against writing illegal/nonsense files.
alexc
parents:
4482
diff
changeset
|
61 } |
4934 | 62 if (!adts->channel_conf) { |
63 init_put_bits(&pb, adts->pce_data, MAX_PCE_SIZE); | |
64 | |
65 put_bits(&pb, 3, 5); //ID_PCE | |
66 adts->pce_size = (ff_copy_pce_data(&pb, &gb) + 3) / 8; | |
67 flush_put_bits(&pb); | |
68 } | |
4467
1dae64d3a6ff
ADTS Muxer: Refuse to write illegal ADTS files by checking validity of header
superdump
parents:
3424
diff
changeset
|
69 |
939 | 70 adts->write_adts = 1; |
71 | |
72 return 0; | |
73 } | |
74 | |
75 static int adts_write_header(AVFormatContext *s) | |
76 { | |
77 ADTSContext *adts = s->priv_data; | |
78 AVCodecContext *avc = s->streams[0]->codec; | |
79 | |
4467
1dae64d3a6ff
ADTS Muxer: Refuse to write illegal ADTS files by checking validity of header
superdump
parents:
3424
diff
changeset
|
80 if(avc->extradata_size > 0 && |
5787
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
81 ff_adts_decode_extradata(s, adts, avc->extradata, avc->extradata_size) < 0) |
4467
1dae64d3a6ff
ADTS Muxer: Refuse to write illegal ADTS files by checking validity of header
superdump
parents:
3424
diff
changeset
|
82 return -1; |
939 | 83 |
84 return 0; | |
85 } | |
86 | |
5787
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
87 int ff_adts_write_frame_header(ADTSContext *ctx, |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
88 uint8_t *buf, int size, int pce_size) |
939 | 89 { |
90 PutBitContext pb; | |
91 | |
92 init_put_bits(&pb, buf, ADTS_HEADER_SIZE); | |
93 | |
94 /* adts_fixed_header */ | |
95 put_bits(&pb, 12, 0xfff); /* syncword */ | |
96 put_bits(&pb, 1, 0); /* ID */ | |
97 put_bits(&pb, 2, 0); /* layer */ | |
98 put_bits(&pb, 1, 1); /* protection_absent */ | |
99 put_bits(&pb, 2, ctx->objecttype); /* profile_objecttype */ | |
100 put_bits(&pb, 4, ctx->sample_rate_index); | |
101 put_bits(&pb, 1, 0); /* private_bit */ | |
102 put_bits(&pb, 3, ctx->channel_conf); /* channel_configuration */ | |
103 put_bits(&pb, 1, 0); /* original_copy */ | |
104 put_bits(&pb, 1, 0); /* home */ | |
105 | |
106 /* adts_variable_header */ | |
107 put_bits(&pb, 1, 0); /* copyright_identification_bit */ | |
108 put_bits(&pb, 1, 0); /* copyright_identification_start */ | |
5787
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
109 put_bits(&pb, 13, ADTS_HEADER_SIZE + size + pce_size); /* aac_frame_length */ |
939 | 110 put_bits(&pb, 11, 0x7ff); /* adts_buffer_fullness */ |
111 put_bits(&pb, 2, 0); /* number_of_raw_data_blocks_in_frame */ | |
112 | |
113 flush_put_bits(&pb); | |
114 | |
115 return 0; | |
116 } | |
117 | |
118 static int adts_write_packet(AVFormatContext *s, AVPacket *pkt) | |
119 { | |
120 ADTSContext *adts = s->priv_data; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2218
diff
changeset
|
121 ByteIOContext *pb = s->pb; |
5787
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
122 uint8_t buf[ADTS_HEADER_SIZE]; |
939 | 123 |
1043 | 124 if (!pkt->size) |
125 return 0; | |
5787
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
126 if(adts->write_adts) { |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
127 ff_adts_write_frame_header(adts, buf, pkt->size, adts->pce_size); |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
128 put_buffer(pb, buf, ADTS_HEADER_SIZE); |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
129 if(adts->pce_size) { |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
130 put_buffer(pb, adts->pce_data, adts->pce_size); |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
131 adts->pce_size = 0; |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
132 } |
667736f463b3
In mpegts muxer, write adts header if aac bitstream does not contain it
bcoudurier
parents:
5079
diff
changeset
|
133 } |
939 | 134 put_buffer(pb, pkt->data, pkt->size); |
1041 | 135 put_flush_packet(pb); |
939 | 136 |
137 return 0; | |
138 } | |
139 | |
1169 | 140 AVOutputFormat adts_muxer = { |
939 | 141 "adts", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3286
diff
changeset
|
142 NULL_IF_CONFIG_SMALL("ADTS AAC"), |
939 | 143 "audio/aac", |
5003 | 144 "aac,adts", |
939 | 145 sizeof(ADTSContext), |
146 CODEC_ID_AAC, | |
147 CODEC_ID_NONE, | |
148 adts_write_header, | |
149 adts_write_packet, | |
150 }; |