* qatar/master:
avio: K&R cosmetic formatting
Conflicts:
libavformat/aviobuf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
... | ... |
@@ -77,28 +77,32 @@ int ffio_init_context(AVIOContext *s, |
77 | 77 |
int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), |
78 | 78 |
int64_t (*seek)(void *opaque, int64_t offset, int whence)) |
79 | 79 |
{ |
80 |
- s->buffer = buffer; |
|
80 |
+ s->buffer = buffer; |
|
81 | 81 |
s->buffer_size = buffer_size; |
82 |
- s->buf_ptr = buffer; |
|
83 |
- s->opaque = opaque; |
|
84 |
- s->direct = 0; |
|
82 |
+ s->buf_ptr = buffer; |
|
83 |
+ s->opaque = opaque; |
|
84 |
+ s->direct = 0; |
|
85 |
+ |
|
85 | 86 |
url_resetbuf(s, write_flag ? AVIO_FLAG_WRITE : AVIO_FLAG_READ); |
86 |
- s->write_packet = write_packet; |
|
87 |
- s->read_packet = read_packet; |
|
88 |
- s->seek = seek; |
|
89 |
- s->pos = 0; |
|
90 |
- s->must_flush = 0; |
|
91 |
- s->eof_reached = 0; |
|
92 |
- s->error = 0; |
|
93 |
- s->seekable = AVIO_SEEKABLE_NORMAL; |
|
87 |
+ |
|
88 |
+ s->write_packet = write_packet; |
|
89 |
+ s->read_packet = read_packet; |
|
90 |
+ s->seek = seek; |
|
91 |
+ s->pos = 0; |
|
92 |
+ s->must_flush = 0; |
|
93 |
+ s->eof_reached = 0; |
|
94 |
+ s->error = 0; |
|
95 |
+ s->seekable = AVIO_SEEKABLE_NORMAL; |
|
94 | 96 |
s->max_packet_size = 0; |
95 |
- s->update_checksum= NULL; |
|
96 |
- if(!read_packet && !write_flag){ |
|
97 |
- s->pos = buffer_size; |
|
97 |
+ s->update_checksum = NULL; |
|
98 |
+ |
|
99 |
+ if (!read_packet && !write_flag) { |
|
100 |
+ s->pos = buffer_size; |
|
98 | 101 |
s->buf_end = s->buffer + buffer_size; |
99 | 102 |
} |
100 | 103 |
s->read_pause = NULL; |
101 | 104 |
s->read_seek = NULL; |
105 |
+ |
|
102 | 106 |
return 0; |
103 | 107 |
} |
104 | 108 |
|
... | ... |
@@ -121,9 +125,9 @@ AVIOContext *avio_alloc_context( |
121 | 121 |
|
122 | 122 |
static void writeout(AVIOContext *s, const uint8_t *data, int len) |
123 | 123 |
{ |
124 |
- if (s->write_packet && !s->error){ |
|
125 |
- int ret= s->write_packet(s->opaque, (uint8_t *)data, len); |
|
126 |
- if(ret < 0){ |
|
124 |
+ if (s->write_packet && !s->error) { |
|
125 |
+ int ret = s->write_packet(s->opaque, (uint8_t *)data, len); |
|
126 |
+ if (ret < 0) { |
|
127 | 127 |
s->error = ret; |
128 | 128 |
} |
129 | 129 |
} |
... | ... |
@@ -134,9 +138,10 @@ static void flush_buffer(AVIOContext *s) |
134 | 134 |
{ |
135 | 135 |
if (s->buf_ptr > s->buffer) { |
136 | 136 |
writeout(s, s->buffer, s->buf_ptr - s->buffer); |
137 |
- if(s->update_checksum){ |
|
138 |
- s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_ptr - s->checksum_ptr); |
|
139 |
- s->checksum_ptr= s->buffer; |
|
137 |
+ if (s->update_checksum) { |
|
138 |
+ s->checksum = s->update_checksum(s->checksum, s->checksum_ptr, |
|
139 |
+ s->buf_ptr - s->checksum_ptr); |
|
140 |
+ s->checksum_ptr = s->buffer; |
|
140 | 141 |
} |
141 | 142 |
} |
142 | 143 |
s->buf_ptr = s->buffer; |
... | ... |
@@ -256,13 +261,13 @@ int64_t avio_size(AVIOContext *s) |
256 | 256 |
{ |
257 | 257 |
int64_t size; |
258 | 258 |
|
259 |
- if(!s) |
|
259 |
+ if (!s) |
|
260 | 260 |
return AVERROR(EINVAL); |
261 | 261 |
|
262 | 262 |
if (!s->seek) |
263 | 263 |
return AVERROR(ENOSYS); |
264 | 264 |
size = s->seek(s->opaque, 0, AVSEEK_SIZE); |
265 |
- if(size<0){ |
|
265 |
+ if (size < 0) { |
|
266 | 266 |
if ((size = s->seek(s->opaque, -1, SEEK_END)) < 0) |
267 | 267 |
return size; |
268 | 268 |
size++; |
... | ... |
@@ -319,29 +324,31 @@ int avio_put_str16le(AVIOContext *s, const char *str) |
319 | 319 |
uint16_t tmp; |
320 | 320 |
|
321 | 321 |
GET_UTF8(ch, *q++, break;) |
322 |
- PUT_UTF16(ch, tmp, avio_wl16(s, tmp);ret += 2;) |
|
322 |
+ PUT_UTF16(ch, tmp, avio_wl16(s, tmp); ret += 2;) |
|
323 | 323 |
} |
324 | 324 |
avio_wl16(s, 0); |
325 | 325 |
ret += 2; |
326 | 326 |
return ret; |
327 | 327 |
} |
328 | 328 |
|
329 |
-int ff_get_v_length(uint64_t val){ |
|
330 |
- int i=1; |
|
329 |
+int ff_get_v_length(uint64_t val) |
|
330 |
+{ |
|
331 |
+ int i = 1; |
|
331 | 332 |
|
332 |
- while(val>>=7) |
|
333 |
+ while (val >>= 7) |
|
333 | 334 |
i++; |
334 | 335 |
|
335 | 336 |
return i; |
336 | 337 |
} |
337 | 338 |
|
338 |
-void ff_put_v(AVIOContext *bc, uint64_t val){ |
|
339 |
- int i= ff_get_v_length(val); |
|
339 |
+void ff_put_v(AVIOContext *bc, uint64_t val) |
|
340 |
+{ |
|
341 |
+ int i = ff_get_v_length(val); |
|
340 | 342 |
|
341 |
- while(--i>0) |
|
342 |
- avio_w8(bc, 128 | (uint8_t)(val>>(7*i))); |
|
343 |
+ while (--i > 0) |
|
344 |
+ avio_w8(bc, 128 | (uint8_t)(val >> (7*i))); |
|
343 | 345 |
|
344 |
- avio_w8(bc, val&127); |
|
346 |
+ avio_w8(bc, val & 127); |
|
345 | 347 |
} |
346 | 348 |
|
347 | 349 |
void avio_wl64(AVIOContext *s, uint64_t val) |
... | ... |
@@ -384,9 +391,12 @@ void avio_wb24(AVIOContext *s, unsigned int val) |
384 | 384 |
|
385 | 385 |
static void fill_buffer(AVIOContext *s) |
386 | 386 |
{ |
387 |
- uint8_t *dst= !s->max_packet_size && s->buf_end - s->buffer < s->buffer_size ? s->buf_end : s->buffer; |
|
388 |
- int len= s->buffer_size - (dst - s->buffer); |
|
389 |
- int max_buffer_size = s->max_packet_size ? s->max_packet_size : IO_BUFFER_SIZE; |
|
387 |
+ uint8_t *dst = !s->max_packet_size && |
|
388 |
+ s->buf_end - s->buffer < s->buffer_size ? |
|
389 |
+ s->buf_end : s->buffer; |
|
390 |
+ int len = s->buffer_size - (dst - s->buffer); |
|
391 |
+ int max_buffer_size = s->max_packet_size ? |
|
392 |
+ s->max_packet_size : IO_BUFFER_SIZE; |
|
390 | 393 |
|
391 | 394 |
/* can't fill the buffer without read_packet, just set EOF if appropriate */ |
392 | 395 |
if (!s->read_packet && s->buf_ptr >= s->buf_end) |
... | ... |
@@ -396,10 +406,11 @@ static void fill_buffer(AVIOContext *s) |
396 | 396 |
if (s->eof_reached) |
397 | 397 |
return; |
398 | 398 |
|
399 |
- if(s->update_checksum && dst == s->buffer){ |
|
400 |
- if(s->buf_end > s->checksum_ptr) |
|
401 |
- s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_end - s->checksum_ptr); |
|
402 |
- s->checksum_ptr= s->buffer; |
|
399 |
+ if (s->update_checksum && dst == s->buffer) { |
|
400 |
+ if (s->buf_end > s->checksum_ptr) |
|
401 |
+ s->checksum = s->update_checksum(s->checksum, s->checksum_ptr, |
|
402 |
+ s->buf_end - s->checksum_ptr); |
|
403 |
+ s->checksum_ptr = s->buffer; |
|
403 | 404 |
} |
404 | 405 |
|
405 | 406 |
/* make buffer smaller in case it ended up large after probing */ |
... | ... |
@@ -410,7 +421,7 @@ static void fill_buffer(AVIOContext *s) |
410 | 410 |
len = s->buffer_size; |
411 | 411 |
} |
412 | 412 |
|
413 |
- if(s->read_packet) |
|
413 |
+ if (s->read_packet) |
|
414 | 414 |
len = s->read_packet(s->opaque, dst, len); |
415 | 415 |
else |
416 | 416 |
len = 0; |
... | ... |
@@ -418,8 +429,8 @@ static void fill_buffer(AVIOContext *s) |
418 | 418 |
/* do not modify buffer if EOF reached so that a seek back can |
419 | 419 |
be done without rereading data */ |
420 | 420 |
s->eof_reached = 1; |
421 |
- if(len<0) |
|
422 |
- s->error= len; |
|
421 |
+ if (len < 0) |
|
422 |
+ s->error = len; |
|
423 | 423 |
} else { |
424 | 424 |
s->pos += len; |
425 | 425 |
s->buf_ptr = dst; |
... | ... |
@@ -436,8 +447,9 @@ unsigned long ff_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf, |
436 | 436 |
|
437 | 437 |
unsigned long ffio_get_checksum(AVIOContext *s) |
438 | 438 |
{ |
439 |
- s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_ptr - s->checksum_ptr); |
|
440 |
- s->update_checksum= NULL; |
|
439 |
+ s->checksum = s->update_checksum(s->checksum, s->checksum_ptr, |
|
440 |
+ s->buf_ptr - s->checksum_ptr); |
|
441 |
+ s->update_checksum = NULL; |
|
441 | 442 |
return s->checksum; |
442 | 443 |
} |
443 | 444 |
|
... | ... |
@@ -445,10 +457,10 @@ void ffio_init_checksum(AVIOContext *s, |
445 | 445 |
unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), |
446 | 446 |
unsigned long checksum) |
447 | 447 |
{ |
448 |
- s->update_checksum= update_checksum; |
|
449 |
- if(s->update_checksum){ |
|
450 |
- s->checksum= checksum; |
|
451 |
- s->checksum_ptr= s->buf_ptr; |
|
448 |
+ s->update_checksum = update_checksum; |
|
449 |
+ if (s->update_checksum) { |
|
450 |
+ s->checksum = checksum; |
|
451 |
+ s->checksum_ptr = s->buf_ptr; |
|
452 | 452 |
} |
453 | 453 |
} |
454 | 454 |
|
... | ... |
@@ -490,7 +502,7 @@ int avio_read(AVIOContext *s, unsigned char *buf, int size) |
490 | 490 |
s->buf_ptr = s->buffer; |
491 | 491 |
s->buf_end = s->buffer/* + len*/; |
492 | 492 |
} |
493 |
- }else{ |
|
493 |
+ } else { |
|
494 | 494 |
fill_buffer(s); |
495 | 495 |
len = s->buf_end - s->buf_ptr; |
496 | 496 |
if (len == 0) |
... | ... |
@@ -514,7 +526,7 @@ int ffio_read_partial(AVIOContext *s, unsigned char *buf, int size) |
514 | 514 |
{ |
515 | 515 |
int len; |
516 | 516 |
|
517 |
- if(size<0) |
|
517 |
+ if (size < 0) |
|
518 | 518 |
return -1; |
519 | 519 |
|
520 | 520 |
len = s->buf_end - s->buf_ptr; |
... | ... |
@@ -842,7 +854,7 @@ int64_t avio_seek_time(AVIOContext *s, int stream_index, |
842 | 842 |
if (!s->read_seek) |
843 | 843 |
return AVERROR(ENOSYS); |
844 | 844 |
ret = s->read_seek(h, stream_index, timestamp, flags); |
845 |
- if(ret >= 0) { |
|
845 |
+ if (ret >= 0) { |
|
846 | 846 |
int64_t pos; |
847 | 847 |
s->buf_ptr = s->buf_end; // Flush buffer |
848 | 848 |
pos = s->seek(h, 0, SEEK_CUR); |
... | ... |
@@ -871,7 +883,7 @@ static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size) |
871 | 871 |
/* reallocate buffer if needed */ |
872 | 872 |
new_size = d->pos + buf_size; |
873 | 873 |
new_allocated_size = d->allocated_size; |
874 |
- if(new_size < d->pos || new_size > INT_MAX/2) |
|
874 |
+ if (new_size < d->pos || new_size > INT_MAX/2) |
|
875 | 875 |
return -1; |
876 | 876 |
while (new_size > new_allocated_size) { |
877 | 877 |
if (!new_allocated_size) |
... | ... |
@@ -900,8 +912,8 @@ static int dyn_packet_buf_write(void *opaque, uint8_t *buf, int buf_size) |
900 | 900 |
|
901 | 901 |
/* packetized write: output the header */ |
902 | 902 |
AV_WB32(buf1, buf_size); |
903 |
- ret= dyn_buf_write(opaque, buf1, 4); |
|
904 |
- if(ret < 0) |
|
903 |
+ ret = dyn_buf_write(opaque, buf1, 4); |
|
904 |
+ if (ret < 0) |
|
905 | 905 |
return ret; |
906 | 906 |
|
907 | 907 |
/* then the data */ |
... | ... |
@@ -927,7 +939,7 @@ static int url_open_dyn_buf_internal(AVIOContext **s, int max_packet_size) |
927 | 927 |
DynBuffer *d; |
928 | 928 |
unsigned io_buffer_size = max_packet_size ? max_packet_size : 1024; |
929 | 929 |
|
930 |
- if(sizeof(DynBuffer) + io_buffer_size < io_buffer_size) |
|
930 |
+ if (sizeof(DynBuffer) + io_buffer_size < io_buffer_size) |
|
931 | 931 |
return -1; |
932 | 932 |
d = av_mallocz(sizeof(DynBuffer) + io_buffer_size); |
933 | 933 |
if (!d) |