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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4673
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
1 /*
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
2 * Targa (.tga) image encoder
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
3 * Copyright (c) 2007 Bobby Bingham
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
4 *
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
5 * This file is part of FFmpeg.
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
6 *
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
11 *
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
15 * Lesser General Public License for more details.
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
16 *
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
20 */
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
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
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
69 static int targa_encode_frame(AVCodecContext *avctx,
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
70 unsigned char *outbuf,
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
71 int buf_size, void *data){
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
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
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
75
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
76 if(avctx->width > 0xffff || avctx->height > 0xffff) {
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
77 av_log(avctx, AV_LOG_ERROR, "image dimensions too large\n");
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
78 return -1;
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
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
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
82 av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n");
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
83 return -1;
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
84 }
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
85
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
86 p->pict_type= FF_I_TYPE;
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
87 p->key_frame= 1;
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
88
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
89 /* zero out the header and only set applicable fields */
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
90 memset(outbuf, 0, 11);
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
91 AV_WL16(outbuf+12, avctx->width);
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
92 AV_WL16(outbuf+14, avctx->height);
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
93 outbuf[17] = 0x20; /* origin is top-left. no alpha */
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
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
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
96 switch(avctx->pix_fmt) {
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
97 case PIX_FMT_GRAY8:
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
98 outbuf[2] = 3; /* uncompressed grayscale image */
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
99 outbuf[16] = 8; /* bpp */
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
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
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
105 case PIX_FMT_BGR24:
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
106 outbuf[2] = 2; /* uncompressed true-color image */
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
107 outbuf[16] = 24; /* bpp */
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
108 break;
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
109 default:
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
110 return -1;
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
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
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
113
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
114 out = outbuf + 18; /* skip past the header we just output */
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
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
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
127
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
128 /* The standard recommends including this section, even if we don't use
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
129 * any of the features it affords. TODO: take advantage of the pixel
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
130 * aspect ratio and encoder ID fields available? */
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
131 memcpy(out, "\0\0\0\0\0\0\0\0TRUEVISION-XFILE.", 26);
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
132
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
133 return out + 26 - outbuf;
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
134 }
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
135
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
136 static int targa_encode_init(AVCodecContext *avctx)
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
137 {
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
138 return 0;
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
139 }
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
140
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
141 AVCodec targa_encoder = {
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
142 .name = "targa",
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
143 .type = CODEC_TYPE_VIDEO,
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
144 .id = CODEC_ID_TARGA,
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
145 .priv_data_size = 0,
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
146 .init = targa_encode_init,
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
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
e7bc1cf41f9f Targa (.tga) encoder,
gpoirier
parents:
diff changeset
149 };