Mercurial > libavcodec.hg

comparison xan.c @ 9489:f4fdab353f6f libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some more simplifications of xan_unpack
author reimar
date Fri, 17 Apr 2009 19:03:43 +0000
parents bae097827a6d
children 9999ab77829b
comparison
equal deleted inserted replaced
9488:bae097827a6d 9489:f4fdab353f6f
33 #include <string.h> 33 #include <string.h>
34 #include <unistd.h> 34 #include <unistd.h>
35 35
36 #include "libavutil/intreadwrite.h" 36 #include "libavutil/intreadwrite.h"
37 #include "avcodec.h" 37 #include "avcodec.h"
38 #include "bytestream.h"
38 // for av_memcpy_backptr 39 // for av_memcpy_backptr
39 #include "libavutil/lzo.h" 40 #include "libavutil/lzo.h"
40 41
41 typedef struct XanContext { 42 typedef struct XanContext {
42 43
126 */ 127 */
127 static void xan_unpack(unsigned char *dest, const unsigned char *src, int dest_len) 128 static void xan_unpack(unsigned char *dest, const unsigned char *src, int dest_len)
128 { 129 {
129 unsigned char opcode; 130 unsigned char opcode;
130 int size; 131 int size;
131 int offset;
132 int byte1, byte2, byte3;
133 unsigned char *dest_end = dest + dest_len; 132 unsigned char *dest_end = dest + dest_len;
134 133
135 while (dest < dest_end) { 134 while (dest < dest_end) {
136 opcode = *src++; 135 opcode = *src++;
137 136
138 if (opcode < 0xe0) { 137 if (opcode < 0xe0) {
139 int size2, back; 138 int size2, back;
140 if ( (opcode & 0x80) == 0 ) { 139 if ( (opcode & 0x80) == 0 ) {
141 140
142 offset = *src++;
143
144 size = opcode & 3; 141 size = opcode & 3;
145 142
146 size2 = ((opcode & 0x1c) >> 2) + 3; 143 size2 = ((opcode & 0x1c) >> 2) + 3;
147 back = ((opcode & 0x60) << 3) + offset + 1; 144 back = ((opcode & 0x60) << 3) + *src++ + 1;
148 145
149 } else if ( (opcode & 0x40) == 0 ) { 146 } else if ( (opcode & 0x40) == 0 ) {
150 147
151 byte1 = *src++; 148 size = *src >> 6;
152 byte2 = *src++;
153
154 size = byte1 >> 6;
155 149
156 size2 = (opcode & 0x3f) + 4; 150 size2 = (opcode & 0x3f) + 4;
157 back = ((byte1 & 0x3f) << 8) + byte2 + 1; 151 back = (bytestream_get_be16(&src) & 0x3fff) + 1;
158 152
159 } else { 153 } else {
160 154
161 byte1 = *src++;
162 byte2 = *src++;
163 byte3 = *src++;
164
165 size = opcode & 3; 155 size = opcode & 3;
166 156
167 size2 = byte3 + 5 + ((opcode & 0xc) << 6); 157 back = ((opcode & 0x10) << 12) + 1 + bytestream_get_be16(&src);
168 back = ((opcode & 0x10) << 12) + 1 + (byte1 << 8) + byte2; 158 size2 = *src++ + 5 + ((opcode & 0xc) << 6);
169 if (dest >= dest_end || size > dest_end - dest) 159 if (dest >= dest_end || size > dest_end - dest)
170 return; 160 return;
171 } 161 }
172 memcpy(dest, src, size); dest += size; src += size; 162 memcpy(dest, src, size); dest += size; src += size;
173 av_memcpy_backptr(dest, back, size2); 163 av_memcpy_backptr(dest, back, size2);