Mercurial > libavcodec.hg
annotate targaenc.c @ 5685:070a376d496b libavcodec
fix image corruption when with multi-threaded decoding.
dequant-tables were not correctly reinitialized in the slave
contexts when a PPS came with updated matrices.
Patch by Andreas ªÓman %andreas A olebyn P nu%
Original thread:
date: Sep 16, 2007 6:14 AM
subject: [FFmpeg-devel] Parallelized h264 image corruption bug
author | gpoirier |
---|---|
date | Sun, 16 Sep 2007 10:37:07 +0000 |
parents | 2b72f9bc4f06 |
children | 48759bfbd073 |
rev | line source |
---|---|
4673 | 1 /* |
2 * Targa (.tga) image encoder | |
3 * Copyright (c) 2007 Bobby Bingham | |
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 #include "avcodec.h" | |
4767
a3667e74f44b
generic rle encoder by Bartlomiej Wolowiec b.wolowiec students mimuw edu pl
michael
parents:
4678
diff
changeset
|
22 #include "rle.h" |
4678
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
23 |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
24 /** |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
25 * RLE compress the image, with maximum size of out_size |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
26 * @param outbuf Output buffer |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
27 * @param out_size Maximum output size |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
28 * @param pic Image to compress |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
29 * @param bpp Bytes per pixel |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
30 * @param w Image width |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
31 * @param h Image height |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
32 * @return Size of output in bytes, or -1 if larger than out_size |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
33 */ |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
34 static int targa_encode_rle(uint8_t *outbuf, int out_size, AVFrame *pic, |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
35 int bpp, int w, int h) |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
36 { |
4767
a3667e74f44b
generic rle encoder by Bartlomiej Wolowiec b.wolowiec students mimuw edu pl
michael
parents:
4678
diff
changeset
|
37 int y,ret; |
a3667e74f44b
generic rle encoder by Bartlomiej Wolowiec b.wolowiec students mimuw edu pl
michael
parents:
4678
diff
changeset
|
38 uint8_t *out; |
4678
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
39 |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
40 out = outbuf; |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
41 |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
42 for(y = 0; y < h; y ++) { |
4771
7cd3ffe4897f
Changed the rle encoder a little and made it more universal.
michael
parents:
4767
diff
changeset
|
43 ret = ff_rle_encode(out, out_size, pic->data[0] + pic->linesize[0] * y, bpp, w, 0x7f, 0, -1, 0); |
4767
a3667e74f44b
generic rle encoder by Bartlomiej Wolowiec b.wolowiec students mimuw edu pl
michael
parents:
4678
diff
changeset
|
44 if(ret == -1){ |
a3667e74f44b
generic rle encoder by Bartlomiej Wolowiec b.wolowiec students mimuw edu pl
michael
parents:
4678
diff
changeset
|
45 return -1; |
4678
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
46 } |
4767
a3667e74f44b
generic rle encoder by Bartlomiej Wolowiec b.wolowiec students mimuw edu pl
michael
parents:
4678
diff
changeset
|
47 out+= ret; |
a3667e74f44b
generic rle encoder by Bartlomiej Wolowiec b.wolowiec students mimuw edu pl
michael
parents:
4678
diff
changeset
|
48 out_size -= ret; |
4678
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
49 } |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
50 |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
51 return out - outbuf; |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
52 } |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
53 |
4677
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
54 static int targa_encode_normal(uint8_t *outbuf, AVFrame *pic, int bpp, int w, int h) |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
55 { |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
56 int i, n = bpp * w; |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
57 uint8_t *out = outbuf; |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
58 uint8_t *ptr = pic->data[0]; |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
59 |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
60 for(i=0; i < h; i++) { |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
61 memcpy(out, ptr, n); |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
62 out += n; |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
63 ptr += pic->linesize[0]; |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
64 } |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
65 |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
66 return out - outbuf; |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
67 } |
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
68 |
4673 | 69 static int targa_encode_frame(AVCodecContext *avctx, |
70 unsigned char *outbuf, | |
71 int buf_size, void *data){ | |
72 AVFrame *p = data; | |
4678
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
73 int bpp, picsize, datasize; |
4677
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
74 uint8_t *out; |
4673 | 75 |
76 if(avctx->width > 0xffff || avctx->height > 0xffff) { | |
77 av_log(avctx, AV_LOG_ERROR, "image dimensions too large\n"); | |
78 return -1; | |
79 } | |
4678
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
80 picsize = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
81 if(buf_size < picsize + 45) { |
4673 | 82 av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n"); |
83 return -1; | |
84 } | |
85 | |
86 p->pict_type= FF_I_TYPE; | |
87 p->key_frame= 1; | |
88 | |
89 /* zero out the header and only set applicable fields */ | |
90 memset(outbuf, 0, 11); | |
91 AV_WL16(outbuf+12, avctx->width); | |
92 AV_WL16(outbuf+14, avctx->height); | |
93 outbuf[17] = 0x20; /* origin is top-left. no alpha */ | |
94 | |
4678
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
95 /* TODO: support alpha channel */ |
4673 | 96 switch(avctx->pix_fmt) { |
97 case PIX_FMT_GRAY8: | |
98 outbuf[2] = 3; /* uncompressed grayscale image */ | |
99 outbuf[16] = 8; /* bpp */ | |
100 break; | |
4676
046456cf7d31
Add 15 bit support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4673
diff
changeset
|
101 case PIX_FMT_RGB555: |
046456cf7d31
Add 15 bit support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4673
diff
changeset
|
102 outbuf[2] = 2; /* uncompresses true-color image */ |
046456cf7d31
Add 15 bit support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4673
diff
changeset
|
103 outbuf[16] = 16; /* bpp */ |
046456cf7d31
Add 15 bit support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4673
diff
changeset
|
104 break; |
4673 | 105 case PIX_FMT_BGR24: |
106 outbuf[2] = 2; /* uncompressed true-color image */ | |
107 outbuf[16] = 24; /* bpp */ | |
108 break; | |
109 default: | |
110 return -1; | |
111 } | |
4677
47237f2638b2
Move the encoding of the image data to its own function.
diego
parents:
4676
diff
changeset
|
112 bpp = outbuf[16] >> 3; |
4673 | 113 |
114 out = outbuf + 18; /* skip past the header we just output */ | |
115 | |
4678
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
116 /* try RLE compression */ |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
117 datasize = targa_encode_rle(out, picsize, p, bpp, avctx->width, avctx->height); |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
118 |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
119 /* if that worked well, mark the picture as RLE compressed */ |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
120 if(datasize >= 0) |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
121 outbuf[2] |= 8; |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
122 |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
123 /* if RLE didn't make it smaller, go back to no compression */ |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
124 else datasize = targa_encode_normal(out, p, bpp, avctx->width, avctx->height); |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
125 |
ae5abc4dc946
Add RLE encoding support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4677
diff
changeset
|
126 out += datasize; |
4673 | 127 |
128 /* The standard recommends including this section, even if we don't use | |
129 * any of the features it affords. TODO: take advantage of the pixel | |
130 * aspect ratio and encoder ID fields available? */ | |
131 memcpy(out, "\0\0\0\0\0\0\0\0TRUEVISION-XFILE.", 26); | |
132 | |
133 return out + 26 - outbuf; | |
134 } | |
135 | |
136 static int targa_encode_init(AVCodecContext *avctx) | |
137 { | |
138 return 0; | |
139 } | |
140 | |
141 AVCodec targa_encoder = { | |
142 .name = "targa", | |
143 .type = CODEC_TYPE_VIDEO, | |
144 .id = CODEC_ID_TARGA, | |
145 .priv_data_size = 0, | |
146 .init = targa_encode_init, | |
147 .encode = targa_encode_frame, | |
4676
046456cf7d31
Add 15 bit support, patch by Bobby Bingham, uhmmmm gmail com.
diego
parents:
4673
diff
changeset
|
148 .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_GRAY8, -1}, |
4673 | 149 }; |