comparison xan.c @ 9491:28978a75c865 libavcodec

Cosmetics to improve xan_unpack readability
author reimar
date Fri, 17 Apr 2009 19:14:11 +0000
parents 9999ab77829b
children 2c6a58787aeb
comparison
equal deleted inserted replaced
9490:9999ab77829b 9491:28978a75c865
138 int size2, back; 138 int size2, back;
139 if ( (opcode & 0x80) == 0 ) { 139 if ( (opcode & 0x80) == 0 ) {
140 140
141 size = opcode & 3; 141 size = opcode & 3;
142 142
143 back = ((opcode & 0x60) << 3) + *src++ + 1;
143 size2 = ((opcode & 0x1c) >> 2) + 3; 144 size2 = ((opcode & 0x1c) >> 2) + 3;
144 back = ((opcode & 0x60) << 3) + *src++ + 1;
145 145
146 } else if ( (opcode & 0x40) == 0 ) { 146 } else if ( (opcode & 0x40) == 0 ) {
147 147
148 size = *src >> 6; 148 size = *src >> 6;
149 149
150 back = (bytestream_get_be16(&src) & 0x3fff) + 1;
150 size2 = (opcode & 0x3f) + 4; 151 size2 = (opcode & 0x3f) + 4;
151 back = (bytestream_get_be16(&src) & 0x3fff) + 1;
152 152
153 } else { 153 } else {
154 154
155 size = opcode & 3; 155 size = opcode & 3;
156 156
157 back = ((opcode & 0x10) << 12) + 1 + bytestream_get_be16(&src); 157 back = ((opcode & 0x10) << 12) + bytestream_get_be16(&src) + 1;
158 size2 = *src++ + 5 + ((opcode & 0xc) << 6); 158 size2 = ((opcode & 0x0c) << 6) + *src++ + 5;
159 if (size + size2 > dest_end - dest) 159 if (size + size2 > dest_end - dest)
160 return; 160 return;
161 } 161 }
162 memcpy(dest, src, size); dest += size; src += size; 162 memcpy(dest, src, size); dest += size; src += size;
163 av_memcpy_backptr(dest, back, size2); 163 av_memcpy_backptr(dest, back, size2);