Mercurial > libavcodec.hg
annotate flvdec.c @ 12494:94eaea836bf4 libavcodec
Check avctx width/height more thoroughly (e.g. all values 0 except width would
have been accepted before).
Also do not fail if they are invalid but instead override them to 0.
This allows decoding e.g. MPEG video when only the container values are corrupted.
For encoding a value of 0,0 of course makes no sense, but was allowed
through before and will be caught by an extra check in the encode function.
author | reimar |
---|---|
date | Wed, 15 Sep 2010 04:46:55 +0000 |
parents | ffb3668ff7af |
children |
rev | line source |
---|---|
10788 | 1 /* |
2 * FLV decoding. | |
3 * This file is part of FFmpeg. | |
4 * | |
5 * FFmpeg is free software; you can redistribute it and/or | |
6 * modify it under the terms of the GNU Lesser General Public | |
7 * License as published by the Free Software Foundation; either | |
8 * version 2.1 of the License, or (at your option) any later version. | |
9 * | |
10 * FFmpeg is distributed in the hope that it will be useful, | |
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 * Lesser General Public License for more details. | |
14 * | |
15 * You should have received a copy of the GNU Lesser General Public | |
16 * License along with FFmpeg; if not, write to the Free Software | |
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
18 */ | |
19 | |
20 #include "mpegvideo.h" | |
10828 | 21 #include "h263.h" |
10790 | 22 #include "flv.h" |
12372
914f484bb476
Remove use of the deprecated function avcodec_check_dimensions(), use
stefano
parents:
12108
diff
changeset
|
23 #include "libavcore/imgutils.h" |
10788 | 24 |
25 void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last){ | |
26 int is11 = get_bits1(gb); | |
27 *last = get_bits1(gb); | |
28 *run = get_bits(gb, 6); | |
29 if(is11){ | |
30 *level = get_sbits(gb, 11); | |
31 } else { | |
32 *level = get_sbits(gb, 7); | |
33 } | |
34 } | |
35 | |
36 int ff_flv_decode_picture_header(MpegEncContext *s) | |
37 { | |
38 int format, width, height; | |
39 | |
40 /* picture header */ | |
41 if (get_bits_long(&s->gb, 17) != 1) { | |
42 av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n"); | |
43 return -1; | |
44 } | |
45 format = get_bits(&s->gb, 5); | |
46 if (format != 0 && format != 1) { | |
47 av_log(s->avctx, AV_LOG_ERROR, "Bad picture format\n"); | |
48 return -1; | |
49 } | |
50 s->h263_flv = format+1; | |
51 s->picture_number = get_bits(&s->gb, 8); /* picture timestamp */ | |
52 format = get_bits(&s->gb, 3); | |
53 switch (format) { | |
54 case 0: | |
55 width = get_bits(&s->gb, 8); | |
56 height = get_bits(&s->gb, 8); | |
57 break; | |
58 case 1: | |
59 width = get_bits(&s->gb, 16); | |
60 height = get_bits(&s->gb, 16); | |
61 break; | |
62 case 2: | |
63 width = 352; | |
64 height = 288; | |
65 break; | |
66 case 3: | |
67 width = 176; | |
68 height = 144; | |
69 break; | |
70 case 4: | |
71 width = 128; | |
72 height = 96; | |
73 break; | |
74 case 5: | |
75 width = 320; | |
76 height = 240; | |
77 break; | |
78 case 6: | |
79 width = 160; | |
80 height = 120; | |
81 break; | |
82 default: | |
83 width = height = 0; | |
84 break; | |
85 } | |
12462
ffb3668ff7af
Use new imgutils.h API names, fix deprecation warnings.
stefano
parents:
12372
diff
changeset
|
86 if(av_image_check_size(width, height, 0, s->avctx)) |
10788 | 87 return -1; |
88 s->width = width; | |
89 s->height = height; | |
90 | |
91 s->pict_type = FF_I_TYPE + get_bits(&s->gb, 2); | |
92 s->dropable= s->pict_type > FF_P_TYPE; | |
93 if (s->dropable) | |
94 s->pict_type = FF_P_TYPE; | |
95 | |
96 skip_bits1(&s->gb); /* deblocking flag */ | |
97 s->chroma_qscale= s->qscale = get_bits(&s->gb, 5); | |
98 | |
99 s->h263_plus = 0; | |
100 | |
101 s->unrestricted_mv = 1; | |
102 s->h263_long_vectors = 0; | |
103 | |
104 /* PEI */ | |
105 while (get_bits1(&s->gb) != 0) { | |
106 skip_bits(&s->gb, 8); | |
107 } | |
108 s->f_code = 1; | |
109 | |
110 if(s->avctx->debug & FF_DEBUG_PICT_INFO){ | |
111 av_log(s->avctx, AV_LOG_DEBUG, "%c esc_type:%d, qp:%d num:%d\n", | |
112 s->dropable ? 'D' : av_get_pict_type_char(s->pict_type), s->h263_flv-1, s->qscale, s->picture_number); | |
113 } | |
114 | |
115 s->y_dc_scale_table= | |
116 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
117 | |
118 return 0; | |
119 } | |
120 | |
121 AVCodec flv_decoder = { | |
122 "flv", | |
11560
8a4984c5cacc
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
10828
diff
changeset
|
123 AVMEDIA_TYPE_VIDEO, |
10788 | 124 CODEC_ID_FLV1, |
125 sizeof(MpegEncContext), | |
126 ff_h263_decode_init, | |
127 NULL, | |
128 ff_h263_decode_end, | |
129 ff_h263_decode_frame, | |
130 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, | |
12108
c35d7bc64882
Add new decoder property max_lowres and do not init decoder if requested value is higher.
cehoyos
parents:
11560
diff
changeset
|
131 .max_lowres= 3, |
10788 | 132 .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"), |
133 .pix_fmts= ff_pixfmt_list_420, | |
134 }; |