annotate xl.c @ 7891:13ee9bb85721 libavcodec

Zero 'idx' for each iteration of the coupling gain loop and as it is only used within this loop, we can move its declaration there too. This fixes bitstream desync when decoding streams containing CCEs. Based on a patch by Alex Converse (alex converse gmail com)
author superdump
date Thu, 18 Sep 2008 16:02:51 +0000
parents e943e1409077
children 2acf0ae7b041
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
1 /*
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
2 * Miro VideoXL codec
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
3 * Copyright (c) 2004 Konstantin Shishkov
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
15 * Lesser General Public License for more details.
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
16 *
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2967
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
20 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2453
diff changeset
21
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
22 /**
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
23 * @file xl.c
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
24 * Miro VideoXL codec.
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
25 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2453
diff changeset
26
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
27 #include "avcodec.h"
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
28
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
29 typedef struct VideoXLContext{
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
30 AVCodecContext *avctx;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
31 AVFrame pic;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
32 } VideoXLContext;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
33
4170
f97a2081b5b1 make some symbols static
mru
parents: 3947
diff changeset
34 static const int xl_table[32] = {
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
35 0, 1, 2, 3, 4, 5, 6, 7,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
36 8, 9, 12, 15, 20, 25, 34, 46,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
37 64, 82, 94, 103, 108, 113, 116, 119,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
38 120, 121, 122, 123, 124, 125, 126, 127};
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
39
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2453
diff changeset
40 static int decode_frame(AVCodecContext *avctx,
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
41 void *data, int *data_size,
6300
michael
parents: 5215
diff changeset
42 const uint8_t *buf, int buf_size)
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
43 {
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
44 VideoXLContext * const a = avctx->priv_data;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
45 AVFrame * const p= (AVFrame*)&a->pic;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
46 uint8_t *Y, *U, *V;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
47 int i, j;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
48 int stride;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
49 uint32_t val;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
50 int y0, y1, y2, y3, c0, c1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
51
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
52 if(p->data[0])
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
53 avctx->release_buffer(avctx, p);
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
54
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
55 p->reference = 0;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
56 if(avctx->get_buffer(avctx, p) < 0){
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
57 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
58 return -1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
59 }
6450
c32be43b52b2 remove more useless mpegvideo.h includes
aurel
parents: 6300
diff changeset
60 p->pict_type= FF_I_TYPE;
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
61 p->key_frame= 1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
62
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
63 Y = a->pic.data[0];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
64 U = a->pic.data[1];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
65 V = a->pic.data[2];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2453
diff changeset
66
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
67 stride = avctx->width - 4;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
68 for (i = 0; i < avctx->height; i++) {
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
69 /* lines are stored in reversed order */
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
70 buf += stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2453
diff changeset
71
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
72 for (j = 0; j < avctx->width; j += 4) {
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
73 /* value is stored in LE dword with word swapped */
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4170
diff changeset
74 val = AV_RL32(buf);
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
75 buf -= 4;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
76 val = ((val >> 16) & 0xFFFF) | ((val & 0xFFFF) << 16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2453
diff changeset
77
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
78 if(!j)
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
79 y0 = (val & 0x1F) << 2;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
80 else
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
81 y0 = y3 + xl_table[val & 0x1F];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
82 val >>= 5;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
83 y1 = y0 + xl_table[val & 0x1F];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
84 val >>= 5;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
85 y2 = y1 + xl_table[val & 0x1F];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
86 val >>= 6; /* align to word */
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
87 y3 = y2 + xl_table[val & 0x1F];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
88 val >>= 5;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
89 if(!j)
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
90 c0 = (val & 0x1F) << 2;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
91 else
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
92 c0 += xl_table[val & 0x1F];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
93 val >>= 5;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
94 if(!j)
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
95 c1 = (val & 0x1F) << 2;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
96 else
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
97 c1 += xl_table[val & 0x1F];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2453
diff changeset
98
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
99 Y[j + 0] = y0 << 1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
100 Y[j + 1] = y1 << 1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
101 Y[j + 2] = y2 << 1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
102 Y[j + 3] = y3 << 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2453
diff changeset
103
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
104 U[j >> 2] = c0 << 1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
105 V[j >> 2] = c1 << 1;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
106 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2453
diff changeset
107
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
108 buf += avctx->width + 4;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
109 Y += a->pic.linesize[0];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
110 U += a->pic.linesize[1];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
111 V += a->pic.linesize[2];
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
112 }
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
113
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
114 *data_size = sizeof(AVFrame);
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
115 *(AVFrame*)data = a->pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2453
diff changeset
116
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
117 return buf_size;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
118 }
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
119
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6450
diff changeset
120 static av_cold int decode_init(AVCodecContext *avctx){
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
121 // VideoXLContext * const a = avctx->priv_data;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
122
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
123 avctx->pix_fmt= PIX_FMT_YUV411P;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
124
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
125 return 0;
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
126 }
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
127
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
128 AVCodec xl_decoder = {
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
129 "xl",
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
130 CODEC_TYPE_VIDEO,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
131 CODEC_ID_VIXL,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
132 sizeof(VideoXLContext),
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
133 decode_init,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
134 NULL,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
135 NULL,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
136 decode_frame,
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
137 CODEC_CAP_DR1,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6710
diff changeset
138 .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"),
2325
1180a04d64c5 Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
melanson
parents:
diff changeset
139 };