Mercurial > libavcodec.hg
annotate mpeg4video_parser.c @ 10061:09f2db2d7c90 libavcodec
Fix bug caused by difference in stride and picture width.
When a frame is allocated using libschroedinger routines, the frame data size
does not match the actual frame size if the width is not a multiple of 16. So
we cannot do a straightforward memcpy of the frame returned by libschroedinger
into the FFmpeg picture as the stride differs from the width.
Fix this bug by allocating for the libschroedinger frame with the dimensions
in AVCodecContext within libavcodec and passing the frame to libschroedinger.
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk
author | diego |
---|---|
date | Sat, 15 Aug 2009 11:59:53 +0000 |
parents | 043574c5c153 |
children | 9311c65558c0 |
rev | line source |
---|---|
4912 | 1 /* |
2 * MPEG4 Video frame extraction | |
8629
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
4957
diff
changeset
|
3 * Copyright (c) 2003 Fabrice Bellard |
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
4957
diff
changeset
|
4 * Copyright (c) 2003 Michael Niedermayer |
4912 | 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 "mpegvideo.h" | |
4957
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
25 #include "mpeg4video_parser.h" |
4912 | 26 |
27 | |
4957
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
28 int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){ |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
29 int vop_found, i; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
30 uint32_t state; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
31 |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
32 vop_found= pc->frame_start_found; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
33 state= pc->state; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
34 |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
35 i=0; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
36 if(!vop_found){ |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
37 for(i=0; i<buf_size; i++){ |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
38 state= (state<<8) | buf[i]; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
39 if(state == 0x1B6){ |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
40 i++; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
41 vop_found=1; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
42 break; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
43 } |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
44 } |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
45 } |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
46 |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
47 if(vop_found){ |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
48 /* EOF considered as end of frame */ |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
49 if (buf_size == 0) |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
50 return 0; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
51 for(; i<buf_size; i++){ |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
52 state= (state<<8) | buf[i]; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
53 if((state&0xFFFFFF00) == 0x100){ |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
54 pc->frame_start_found=0; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
55 pc->state=-1; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
56 return i-3; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
57 } |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
58 } |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
59 } |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
60 pc->frame_start_found= vop_found; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
61 pc->state= state; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
62 return END_NOT_FOUND; |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
63 } |
3fcb2f0d9ef1
move ff_mpeg4_find_frame_end() from h263dec.c to mpeg4video_parser.c
aurel
parents:
4931
diff
changeset
|
64 |
4912 | 65 /* XXX: make it use less memory */ |
66 static int av_mpeg4_decode_header(AVCodecParserContext *s1, | |
67 AVCodecContext *avctx, | |
68 const uint8_t *buf, int buf_size) | |
69 { | |
70 ParseContext1 *pc = s1->priv_data; | |
71 MpegEncContext *s = pc->enc; | |
72 GetBitContext gb1, *gb = &gb1; | |
73 int ret; | |
74 | |
75 s->avctx = avctx; | |
76 s->current_picture_ptr = &s->current_picture; | |
77 | |
78 if (avctx->extradata_size && pc->first_picture){ | |
79 init_get_bits(gb, avctx->extradata, avctx->extradata_size*8); | |
80 ret = ff_mpeg4_decode_picture_header(s, gb); | |
81 } | |
82 | |
83 init_get_bits(gb, buf, 8 * buf_size); | |
84 ret = ff_mpeg4_decode_picture_header(s, gb); | |
85 if (s->width) { | |
86 avcodec_set_dimensions(avctx, s->width, s->height); | |
87 } | |
88 s1->pict_type= s->pict_type; | |
89 pc->first_picture = 0; | |
90 return ret; | |
91 } | |
92 | |
9007
043574c5c153
Add missing av_cold in static init/close functions.
stefano
parents:
8629
diff
changeset
|
93 static av_cold int mpeg4video_parse_init(AVCodecParserContext *s) |
4912 | 94 { |
95 ParseContext1 *pc = s->priv_data; | |
96 | |
97 pc->enc = av_mallocz(sizeof(MpegEncContext)); | |
98 if (!pc->enc) | |
99 return -1; | |
100 pc->first_picture = 1; | |
101 return 0; | |
102 } | |
103 | |
104 static int mpeg4video_parse(AVCodecParserContext *s, | |
105 AVCodecContext *avctx, | |
4931
0d1cc37d9430
make some parser parameters const to avoid casting const to non-const
aurel
parents:
4912
diff
changeset
|
106 const uint8_t **poutbuf, int *poutbuf_size, |
4912 | 107 const uint8_t *buf, int buf_size) |
108 { | |
109 ParseContext *pc = s->priv_data; | |
110 int next; | |
111 | |
112 if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){ | |
113 next= buf_size; | |
114 }else{ | |
115 next= ff_mpeg4_find_frame_end(pc, buf, buf_size); | |
116 | |
4931
0d1cc37d9430
make some parser parameters const to avoid casting const to non-const
aurel
parents:
4912
diff
changeset
|
117 if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { |
4912 | 118 *poutbuf = NULL; |
119 *poutbuf_size = 0; | |
120 return buf_size; | |
121 } | |
122 } | |
123 av_mpeg4_decode_header(s, avctx, buf, buf_size); | |
124 | |
4931
0d1cc37d9430
make some parser parameters const to avoid casting const to non-const
aurel
parents:
4912
diff
changeset
|
125 *poutbuf = buf; |
4912 | 126 *poutbuf_size = buf_size; |
127 return next; | |
128 } | |
129 | |
130 | |
131 AVCodecParser mpeg4video_parser = { | |
132 { CODEC_ID_MPEG4 }, | |
133 sizeof(ParseContext1), | |
134 mpeg4video_parse_init, | |
135 mpeg4video_parse, | |
136 ff_parse1_close, | |
137 ff_mpeg4video_split, | |
138 }; |