Skip to content

Commit 4f23d60

Browse files
wberubewberube
committed
Couple of functions for CVITEK video inputs, formatting
1 parent b617452 commit 4f23d60

File tree

25 files changed

+385
-370
lines changed

25 files changed

+385
-370
lines changed

‎src/fmt/amf.c‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ static enum BufError AMFWriteInt32(struct BitBuf* buf, uint32_t value)
1515
static enum BufError AMFWriteString16(struct BitBuf* buf, const char* string, size_t length)
1616
{
1717
enum BufError err;
18-
err = put_u16_be(buf, (uint16_t)length);
18+
err = put_u16_be(buf, (uint16_t)length);
1919
chk_err;
2020

2121
return put(buf, string, length);
@@ -24,7 +24,7 @@ static enum BufError AMFWriteString16(struct BitBuf* buf, const char* string, si
2424
static enum BufError AMFWriteString32(struct BitBuf* buf, const char* string, size_t length)
2525
{
2626
enum BufError err;
27-
err = put_u32_be(buf, (uint32_t)length);
27+
err = put_u32_be(buf, (uint32_t)length);
2828
chk_err;
2929

3030
return put(buf, string, length);
@@ -48,11 +48,11 @@ enum BufError AMFWriteObject(struct BitBuf* buf)
4848
enum BufError AMFWriteObjectEnd(struct BitBuf* buf)
4949
{
5050
enum BufError err;
51-
err = put_u8(buf, 0);
51+
err = put_u8(buf, 0);
5252
chk_err;
5353

5454
err = put_u8(buf, 0);
55-
chk_err;
55+
chk_err;
5656

5757
return put_u8(buf, AMF_OBJECT_END);
5858
}
@@ -65,7 +65,7 @@ enum BufError AMFWriteTypedObject(struct BitBuf* buf)
6565
enum BufError AMFWriteECMAArray(struct BitBuf* buf)
6666
{
6767
enum BufError err;
68-
err = put_u8(buf, AMF_ECMA_ARRAY);
68+
err = put_u8(buf, AMF_ECMA_ARRAY);
6969
chk_err;
7070

7171
return put_u32_be(buf, 0); // U32 associative-count
@@ -82,22 +82,22 @@ enum BufError AMFWriteBoolean(struct BitBuf* buf, uint8_t value)
8282

8383
enum BufError AMFWriteDouble(struct BitBuf* buf, double value)
8484
{
85-
enum BufError err;
86-
uint8_t bytes[8];
85+
enum BufError err;
86+
uint8_t bytes[8];
8787

8888
err = put_u8(buf, AMF_NUMBER);
8989
chk_err;
9090

91-
// Little-Endian
92-
if (0x00 == *(char*)&s_double) {
91+
// Little-Endian
92+
if (0x00 == *(char*)&s_double) {
9393
uint8_t* v = (uint8_t*)&value;
9494
for (int i = 0; i < 8; ++i)
9595
bytes[i] = v[7 - i];
96-
} else {
97-
memcpy(bytes, &value, 8);
98-
}
96+
} else {
97+
memcpy(bytes, &value, 8);
98+
}
9999

100-
return put(buf, (const char*)bytes, 8);
100+
return put(buf, (const char*)bytes, 8);
101101
}
102102

103103
enum BufError AMFWriteString(struct BitBuf* buf, const char* string, size_t length)
@@ -121,57 +121,57 @@ enum BufError AMFWriteString(struct BitBuf* buf, const char* string, size_t leng
121121

122122
enum BufError AMFWriteDate(struct BitBuf *buf, double milliseconds, int16_t timezone)
123123
{
124-
enum BufError err;
125-
uint8_t bytes[8];
124+
enum BufError err;
125+
uint8_t bytes[8];
126126

127-
err = put_u8(buf, AMF_DATE);
127+
err = put_u8(buf, AMF_DATE);
128128
chk_err;
129129

130-
// Little-Endian
131-
if (0x00 == *(char*)&s_double) {
130+
// Little-Endian
131+
if (0x00 == *(char*)&s_double) {
132132
uint8_t* v = (uint8_t*)&milliseconds;
133133
for (int i = 0; i < 8; ++i)
134134
bytes[i] = v[7 - i];
135-
} else {
136-
memcpy(bytes, &milliseconds, 8);
137-
}
135+
} else {
136+
memcpy(bytes, &milliseconds, 8);
137+
}
138138

139-
err = put(buf, (const char*)bytes, 8);
140-
chk_err;
139+
err = put(buf, (const char*)bytes, 8);
140+
chk_err;
141141

142-
return put_u16_be(buf, (uint16_t)timezone);
142+
return put_u16_be(buf, (uint16_t)timezone);
143143
}
144144

145145
enum BufError AMFWriteNamed(struct BitBuf *buf, const char* name, size_t length)
146146
{
147-
return AMFWriteString16(buf, name, length);
147+
return AMFWriteString16(buf, name, length);
148148
}
149149

150150
enum BufError AMFWriteNamedBoolean(struct BitBuf *buf, const char* name, size_t length, uint8_t value)
151151
{
152-
enum BufError err;
153-
err = AMFWriteString16(buf, name, length);
154-
chk_err;
152+
enum BufError err;
153+
err = AMFWriteString16(buf, name, length);
154+
chk_err;
155155

156-
return AMFWriteBoolean(buf, value);
156+
return AMFWriteBoolean(buf, value);
157157
}
158158

159159
enum BufError AMFWriteNamedDouble(struct BitBuf *buf, const char* name, size_t length, double value)
160160
{
161-
enum BufError err;
162-
err = AMFWriteString16(buf, name, length);
163-
chk_err;
161+
enum BufError err;
162+
err = AMFWriteString16(buf, name, length);
163+
chk_err;
164164

165-
return AMFWriteDouble(buf, value);
165+
return AMFWriteDouble(buf, value);
166166
}
167167

168168
enum BufError AMFWriteNamedString(struct BitBuf *buf, const char* name, size_t length, const char* value, size_t length2)
169169
{
170-
enum BufError err;
171-
err = AMFWriteString16(buf, name, length);
172-
chk_err;
170+
enum BufError err;
171+
err = AMFWriteString16(buf, name, length);
172+
chk_err;
173173

174-
return AMFWriteString(buf, value, length2);
174+
return AMFWriteString(buf, value, length2);
175175
}
176176

177177
static enum BufError AMFReadInt16(struct BitBuf* buf, uint32_t* value)
@@ -236,31 +236,31 @@ enum BufError AMFReadDouble(struct BitBuf *buf, double* value)
236236
if (!buf || buf->offset + 8 > buf->size)
237237
return BUF_ENDOFBUF_ERROR;
238238

239-
if (value) {
240-
if (0x00 == *(char*)&s_double) {
241-
// Little-Endian
239+
if (value) {
240+
if (0x00 == *(char*)&s_double) {
241+
// Little-Endian
242242
uint8_t* p = (uint8_t*)value;
243243
for (int i = 0; i < 8; ++i)
244244
p[i] = buf->buf[buf->offset + 7 - i];
245-
} else {
245+
} else {
246246
memcpy(value, buf->buf + buf->offset, 8);
247-
}
248-
}
247+
}
248+
}
249249

250-
buf->offset += 8;
251-
return BUF_OK;
250+
buf->offset += 8;
251+
return BUF_OK;
252252
}
253253

254254
enum BufError AMFReadString(struct BitBuf *buf, int isLongString, char* string, size_t length)
255255
{
256-
uint32_t len = 0;
256+
uint32_t len = 0;
257257
enum BufError err;
258258

259259
if (isLongString)
260260
err = AMFReadInt32(buf, &len);
261261
else
262262
err = AMFReadInt16(buf, &len);
263-
chk_err;
263+
chk_err;
264264

265265
if (string && length > len)
266266
{
@@ -312,11 +312,11 @@ enum BufError AMF3ReadBoolean(struct BitBuf *buf, uint8_t *value)
312312

313313
enum BufError AMF3ReadInteger(struct BitBuf *buf, int32_t* value)
314314
{
315-
uint8_t b;
316-
int i;
317-
int32_t v = 0;
315+
uint8_t b;
316+
int i;
317+
int32_t v = 0;
318318

319-
for (i = 0; i < 3; i++) {
319+
for (i = 0; i < 3; i++) {
320320
if (buf->offset >= buf->size)
321321
return BUF_ENDOFBUF_ERROR;
322322

@@ -329,7 +329,7 @@ enum BufError AMF3ReadInteger(struct BitBuf *buf, int32_t* value)
329329
return BUF_OK;
330330
}
331331
v |= (b & 0x7F);
332-
}
332+
}
333333

334334
if (buf->offset >= buf->size)
335335
return BUF_ENDOFBUF_ERROR;
@@ -349,18 +349,18 @@ enum BufError AMF3ReadDouble(struct BitBuf *buf, double* value)
349349
if (!buf || buf->offset + 8 > buf->size)
350350
return BUF_ENDOFBUF_ERROR;
351351

352-
if (value) {
353-
if (0x00 == *(char*)&s_double) {
354-
// Little-Endian
352+
if (value) {
353+
if (0x00 == *(char*)&s_double) {
354+
// Little-Endian
355355
uint8_t* p = (uint8_t*)value;
356356
for (int i = 0; i < 8; ++i)
357357
p[i] = buf->buf[buf->offset + 7 - i];
358-
} else {
358+
} else {
359359
memcpy(value, buf->buf + buf->offset, 8);
360-
}
361-
}
360+
}
361+
}
362362

363-
buf->offset += 8;
363+
buf->offset += 8;
364364
return BUF_OK;
365365
}
366366

@@ -369,15 +369,15 @@ enum BufError AMF3ReadString(struct BitBuf *buf, char* string, uint32_t* length)
369369
enum BufError err;
370370
int32_t v = 0;
371371

372-
err = AMF3ReadInteger(buf, (int32_t*)&v);
372+
err = AMF3ReadInteger(buf, (int32_t*)&v);
373373
chk_err;
374374

375-
if (v & 0x01) {
376-
// reference
375+
if (v & 0x01) {
376+
// reference
377377
if (length) *length = 0;
378378
if (string) string[0] = 0;
379379
return BUF_OK;
380-
} else {
380+
} else {
381381
uint32_t len = (uint32_t)(v >> 1);
382382

383383
if (length) *length = len;
@@ -391,7 +391,7 @@ enum BufError AMF3ReadString(struct BitBuf *buf, char* string, uint32_t* length)
391391

392392
buf->offset += len;
393393
return BUF_OK;
394-
}
394+
}
395395
}
396396

397397
static enum BufError amf_read_object(struct BitBuf* buf, struct amf_object_item_t* items, size_t n);
@@ -454,7 +454,7 @@ static enum BufError amf_read_strict_array(struct BitBuf* buf, struct amf_object
454454
for (i = 0; i < count && buf && buf->offset < buf->size; i++) {
455455
if (buf->offset >= buf->size)
456456
return BUF_ENDOFBUF_ERROR;
457-
457+
458458
uint8_t type = buf->buf[buf->offset++];
459459
err = amf_read_item(buf, type, (i < n && amf_read_item_type_check(type, items[i].type)) ? &items[i] : NULL);
460460
chk_err;

‎src/fmt/amf.h‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -9,46 +9,46 @@
99

1010
enum AMFDataType
1111
{
12-
AMF_NUMBER = 0x00,
13-
AMF_BOOLEAN,
14-
AMF_STRING,
15-
AMF_OBJECT,
16-
AMF_MOVIECLIP,
17-
AMF_NULL,
18-
AMF_UNDEFINED,
19-
AMF_REFERENCE,
20-
AMF_ECMA_ARRAY,
21-
AMF_OBJECT_END,
22-
AMF_STRICT_ARRAY,
23-
AMF_DATE,
24-
AMF_LONG_STRING,
25-
AMF_UNSUPPORTED,
26-
AMF_RECORDSET,
27-
AMF_XML_DOCUMENT,
28-
AMF_TYPED_OBJECT,
29-
AMF_AVMPLUS_OBJECT,
12+
AMF_NUMBER = 0x00,
13+
AMF_BOOLEAN,
14+
AMF_STRING,
15+
AMF_OBJECT,
16+
AMF_MOVIECLIP,
17+
AMF_NULL,
18+
AMF_UNDEFINED,
19+
AMF_REFERENCE,
20+
AMF_ECMA_ARRAY,
21+
AMF_OBJECT_END,
22+
AMF_STRICT_ARRAY,
23+
AMF_DATE,
24+
AMF_LONG_STRING,
25+
AMF_UNSUPPORTED,
26+
AMF_RECORDSET,
27+
AMF_XML_DOCUMENT,
28+
AMF_TYPED_OBJECT,
29+
AMF_AVMPLUS_OBJECT,
3030
};
3131

3232
enum AMF3DataType
3333
{
34-
AMF3_UNDEFINED = 0x00,
35-
AMF3_NULL,
36-
AMF3_FALSE,
37-
AMF3_TRUE,
38-
AMF3_INTEGER,
39-
AMF3_DOUBLE,
40-
AMF3_STRING,
41-
AMF3_XML_DOCUMENT,
42-
AMF3_DATE,
43-
AMF3_ARRAY,
44-
AMF3_OBJECT,
45-
AMF3_XML,
46-
AMF3_BYTE_ARRAY,
47-
AMF3_VECTOR_INT,
48-
AMF3_VECTOR_UINT,
49-
AMF3_VECTOR_DOUBLE,
50-
AMF3_VECTOR_OBJECT,
51-
AMF3_DICTIONARY,
34+
AMF3_UNDEFINED = 0x00,
35+
AMF3_NULL,
36+
AMF3_FALSE,
37+
AMF3_TRUE,
38+
AMF3_INTEGER,
39+
AMF3_DOUBLE,
40+
AMF3_STRING,
41+
AMF3_XML_DOCUMENT,
42+
AMF3_DATE,
43+
AMF3_ARRAY,
44+
AMF3_OBJECT,
45+
AMF3_XML,
46+
AMF3_BYTE_ARRAY,
47+
AMF3_VECTOR_INT,
48+
AMF3_VECTOR_UINT,
49+
AMF3_VECTOR_DOUBLE,
50+
AMF3_VECTOR_OBJECT,
51+
AMF3_DICTIONARY,
5252
};
5353

5454
enum BufError AMFWriteNull(struct BitBuf* buf);
@@ -83,9 +83,9 @@ enum BufError AMF3ReadString(struct BitBuf *buf, char* string, uint32_t* length)
8383

8484
struct amf_object_item_t
8585
{
86-
enum AMFDataType type;
87-
const char* name;
88-
void* value;
89-
size_t size;
86+
enum AMFDataType type;
87+
const char* name;
88+
void* value;
89+
size_t size;
9090
};
9191
static enum BufError amf_read_item(struct BitBuf* buf, enum AMFDataType type, struct amf_object_item_t* item);

0 commit comments

Comments
 (0)