Mercurial > libavcodec.hg
annotate pnm_parser.c @ 11989:176c5deb6756 libavcodec
Optimize split MC, so we don't always do 4x4 blocks of 4x4pixels each, but
we apply them as 16x8/8x16/8x8 subblocks where possible. Since this allows
us to use width=8/16 instead of width=4 MC functions, we can now take more
advantage of SSE2/SSSE3 optimizations, leading to a total speedup for splitMV
filter of about 10%.
author | rbultje |
---|---|
date | Mon, 28 Jun 2010 13:50:55 +0000 |
parents | a6bb56636f90 |
children |
rev | line source |
---|---|
4978 | 1 /* |
2 * PNM image parser | |
8629
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
4978
diff
changeset
|
3 * Copyright (c) 2002, 2003 Fabrice Bellard |
4978 | 4 * |
5 * This file is part of FFmpeg. | |
6 * | |
7 * FFmpeg is free software; you can redistribute it and/or | |
8 * modify it under the terms of the GNU Lesser General Public | |
9 * License as published by the Free Software Foundation; either | |
10 * version 2.1 of the License, or (at your option) any later version. | |
11 * | |
12 * FFmpeg is distributed in the hope that it will be useful, | |
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Lesser General Public | |
18 * License along with FFmpeg; if not, write to the Free Software | |
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
20 */ | |
21 | |
22 #include "parser.h" //for ParseContext | |
23 #include "pnm.h" | |
24 | |
25 | |
10459
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
26 static int pnm_parse(AVCodecParserContext *s, AVCodecContext *avctx, |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
27 const uint8_t **poutbuf, int *poutbuf_size, |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
28 const uint8_t *buf, int buf_size) |
4978 | 29 { |
30 ParseContext *pc = s->priv_data; | |
31 PNMContext pnmctx; | |
32 int next; | |
33 | |
10459
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
34 for (; pc->overread > 0; pc->overread--) { |
4978 | 35 pc->buffer[pc->index++]= pc->buffer[pc->overread_index++]; |
36 } | |
37 retry: | |
10459
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
38 if (pc->index) { |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
39 pnmctx.bytestream_start = |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
40 pnmctx.bytestream = pc->buffer; |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
41 pnmctx.bytestream_end = pc->buffer + pc->index; |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
42 } else { |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
43 pnmctx.bytestream_start = |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
44 pnmctx.bytestream = (uint8_t *) buf; /* casts avoid warnings */ |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
45 pnmctx.bytestream_end = (uint8_t *) buf + buf_size; |
4978 | 46 } |
10459
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
47 if (ff_pnm_decode_header(avctx, &pnmctx) < 0) { |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
48 if (pnmctx.bytestream < pnmctx.bytestream_end) { |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
49 if (pc->index) { |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
50 pc->index = 0; |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
51 } else { |
4978 | 52 buf++; |
53 buf_size--; | |
54 } | |
55 goto retry; | |
56 } | |
57 #if 0 | |
10459
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
58 if (pc->index && pc->index * 2 + FF_INPUT_BUFFER_PADDING_SIZE < pc->buffer_size && buf_size > pc->index) { |
4978 | 59 memcpy(pc->buffer + pc->index, buf, pc->index); |
60 pc->index += pc->index; | |
10459
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
61 buf += pc->index; |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
62 buf_size -= pc->index; |
4978 | 63 goto retry; |
64 } | |
65 #endif | |
10459
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
66 next = END_NOT_FOUND; |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
67 } else { |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
68 next = pnmctx.bytestream - pnmctx.bytestream_start |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
69 + avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
70 if (pnmctx.bytestream_start != buf) |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
71 next -= pc->index; |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
72 if (next > buf_size) |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
73 next = END_NOT_FOUND; |
4978 | 74 } |
75 | |
10459
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
76 if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { |
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
77 *poutbuf = NULL; |
4978 | 78 *poutbuf_size = 0; |
79 return buf_size; | |
80 } | |
10459
a6bb56636f90
whitespace cosmetics: K&R coding style, prettyprinting
diego
parents:
8629
diff
changeset
|
81 *poutbuf = buf; |
4978 | 82 *poutbuf_size = buf_size; |
83 return next; | |
84 } | |
85 | |
86 AVCodecParser pnm_parser = { | |
87 { CODEC_ID_PGM, CODEC_ID_PGMYUV, CODEC_ID_PPM, CODEC_ID_PBM, CODEC_ID_PAM}, | |
88 sizeof(ParseContext), | |
89 NULL, | |
90 pnm_parse, | |
91 ff_parse_close, | |
92 }; |