annotate h264_mp4toannexb_bsf.c @ 11698:9a4c9c165b3b libavcodec

Check NAL unit size to avoid reading past the buffer. This fixes issue1907 Patch by Thomas Devanneaux gmail(thomdev)
author benoit
date Mon, 10 May 2010 07:08:57 +0000
parents 31a033fae70e
children e1e986bb64d0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5644
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
1 /*
9632
31a033fae70e Add a quick description to the H.264 BSF
alexc
parents: 8573
diff changeset
2 * H.264 MP4 to Annex B byte stream format filter
8156
a5e7dbce5412 Change email address to a valid one.
benoit
parents: 6134
diff changeset
3 * Copyright (c) 2007 Benoit Fouet <benoit.fouet@free.fr>
5644
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
4 *
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
5 * This file is part of FFmpeg.
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
6 *
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
11 *
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
15 * Lesser General Public License for more details.
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
16 *
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
20 */
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
21
8573
2acf0ae7b041 Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents: 8156
diff changeset
22 #include "libavutil/intreadwrite.h"
5644
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
23 #include "avcodec.h"
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
24
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
25 typedef struct H264BSFContext {
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
26 uint8_t length_size;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
27 uint8_t first_idr;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
28 uint8_t *sps_pps_data;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
29 uint32_t size;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
30 } H264BSFContext;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
31
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
32 static void alloc_and_copy(uint8_t **poutbuf, int *poutbuf_size,
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
33 const uint8_t *sps_pps, uint32_t sps_pps_size,
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
34 const uint8_t *in, uint32_t in_size) {
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
35 uint32_t offset = *poutbuf_size;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
36 uint8_t nal_header_size = offset ? 3 : 4;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
37
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
38 *poutbuf_size += sps_pps_size+in_size+nal_header_size;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
39 *poutbuf = av_realloc(*poutbuf, *poutbuf_size);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
40 if (sps_pps)
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
41 memcpy(*poutbuf+offset, sps_pps, sps_pps_size);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
42 memcpy(*poutbuf+sps_pps_size+nal_header_size+offset, in, in_size);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
43 if (!offset)
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
44 AV_WB32(*poutbuf+sps_pps_size, 1);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
45 else {
6134
6d0c5a68d559 Fix a bug causing the generated stream to be corrupt if the buffer
andoma
parents: 5644
diff changeset
46 (*poutbuf+offset+sps_pps_size)[0] = (*poutbuf+offset+sps_pps_size)[1] = 0;
6d0c5a68d559 Fix a bug causing the generated stream to be corrupt if the buffer
andoma
parents: 5644
diff changeset
47 (*poutbuf+offset+sps_pps_size)[2] = 1;
5644
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
48 }
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
49 }
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
50
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
51 static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
52 AVCodecContext *avctx, const char *args,
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
53 uint8_t **poutbuf, int *poutbuf_size,
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
54 const uint8_t *buf, int buf_size,
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
55 int keyframe) {
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
56 H264BSFContext *ctx = bsfc->priv_data;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
57 uint8_t unit_type;
11698
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
58 int32_t nal_size;
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
59 uint32_t cumul_size = 0;
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
60 const uint8_t *buf_end = buf + buf_size;
5644
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
61
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
62 /* nothing to filter */
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
63 if (!avctx->extradata || avctx->extradata_size < 6) {
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
64 *poutbuf = (uint8_t*) buf;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
65 *poutbuf_size = buf_size;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
66 return 0;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
67 }
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
68
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
69 /* retrieve sps and pps NAL units from extradata */
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
70 if (!ctx->sps_pps_data) {
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
71 uint16_t unit_size;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
72 uint32_t total_size = 0;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
73 uint8_t *out = NULL, unit_nb, sps_done = 0;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
74 const uint8_t *extradata = avctx->extradata+4;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
75 static const uint8_t nalu_header[4] = {0, 0, 0, 1};
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
76
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
77 /* retrieve length coded size */
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
78 ctx->length_size = (*extradata++ & 0x3) + 1;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
79 if (ctx->length_size == 3)
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
80 return AVERROR(EINVAL);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
81
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
82 /* retrieve sps and pps unit(s) */
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
83 unit_nb = *extradata++ & 0x1f; /* number of sps unit(s) */
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
84 if (!unit_nb) {
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
85 unit_nb = *extradata++; /* number of pps unit(s) */
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
86 sps_done++;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
87 }
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
88 while (unit_nb--) {
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
89 unit_size = AV_RB16(extradata);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
90 total_size += unit_size+4;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
91 if (extradata+2+unit_size > avctx->extradata+avctx->extradata_size) {
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
92 av_free(out);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
93 return AVERROR(EINVAL);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
94 }
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
95 out = av_realloc(out, total_size);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
96 if (!out)
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
97 return AVERROR(ENOMEM);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
98 memcpy(out+total_size-unit_size-4, nalu_header, 4);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
99 memcpy(out+total_size-unit_size, extradata+2, unit_size);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
100 extradata += 2+unit_size;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
101
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
102 if (!unit_nb && !sps_done++)
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
103 unit_nb = *extradata++; /* number of pps unit(s) */
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
104 }
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
105
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
106 ctx->sps_pps_data = out;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
107 ctx->size = total_size;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
108 ctx->first_idr = 1;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
109 }
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
110
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
111 *poutbuf_size = 0;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
112 *poutbuf = NULL;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
113 do {
11698
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
114 if (buf + ctx->length_size > buf_end)
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
115 goto fail;
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
116
5644
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
117 if (ctx->length_size == 1)
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
118 nal_size = buf[0];
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
119 else if (ctx->length_size == 2)
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
120 nal_size = AV_RB16(buf);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
121 else
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
122 nal_size = AV_RB32(buf);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
123
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
124 buf += ctx->length_size;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
125 unit_type = *buf & 0x1f;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
126
11698
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
127 if (buf + nal_size > buf_end || nal_size < 0)
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
128 goto fail;
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
129
5644
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
130 /* prepend only to the first type 5 NAL unit of an IDR picture */
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
131 if (ctx->first_idr && unit_type == 5) {
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
132 alloc_and_copy(poutbuf, poutbuf_size,
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
133 ctx->sps_pps_data, ctx->size,
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
134 buf, nal_size);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
135 ctx->first_idr = 0;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
136 }
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
137 else {
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
138 alloc_and_copy(poutbuf, poutbuf_size,
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
139 NULL, 0,
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
140 buf, nal_size);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
141 if (!ctx->first_idr && unit_type == 1)
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
142 ctx->first_idr = 1;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
143 }
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
144
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
145 buf += nal_size;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
146 cumul_size += nal_size + ctx->length_size;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
147 } while (cumul_size < buf_size);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
148
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
149 return 1;
11698
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
150
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
151 fail:
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
152 av_freep(poutbuf);
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
153 *poutbuf_size = 0;
9a4c9c165b3b Check NAL unit size to avoid reading past the buffer.
benoit
parents: 9632
diff changeset
154 return AVERROR(EINVAL);
5644
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
155 }
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
156
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
157 static void h264_mp4toannexb_close(AVBitStreamFilterContext *bsfc)
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
158 {
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
159 H264BSFContext *ctx = bsfc->priv_data;
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
160 av_freep(&ctx->sps_pps_data);
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
161 }
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
162
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
163 AVBitStreamFilter h264_mp4toannexb_bsf = {
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
164 "h264_mp4toannexb",
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
165 sizeof(H264BSFContext),
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
166 h264_mp4toannexb_filter,
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
167 h264_mp4toannexb_close,
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
168 };
679d6ccfffb0 Add a bitstream filter for H.264.
benoit
parents:
diff changeset
169