Mercurial > libavutil.hg
annotate fifo.c @ 683:0bba880f7c22 libavutil
Replace all uses of the replaced av_fifo_read by av_fifo_generic_read
author | reimar |
---|---|
date | Sun, 08 Mar 2009 14:42:11 +0000 |
parents | cb5d78a798ac |
children | b084f8cd043f |
rev | line source |
---|---|
110 | 1 /* |
633 | 2 * a very simple circular buffer FIFO implementation |
110 | 3 * Copyright (c) 2000, 2001, 2002 Fabrice Bellard |
4 * Copyright (c) 2006 Roman Shaposhnik | |
5 * | |
116
d76a36742464
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
110
diff
changeset
|
6 * This file is part of FFmpeg. |
d76a36742464
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
110
diff
changeset
|
7 * |
d76a36742464
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
110
diff
changeset
|
8 * FFmpeg is free software; you can redistribute it and/or |
110 | 9 * modify it under the terms of the GNU Lesser General Public |
10 * License as published by the Free Software Foundation; either | |
116
d76a36742464
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
110
diff
changeset
|
11 * version 2.1 of the License, or (at your option) any later version. |
110 | 12 * |
116
d76a36742464
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
110
diff
changeset
|
13 * FFmpeg is distributed in the hope that it will be useful, |
110 | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 * Lesser General Public License for more details. | |
17 * | |
18 * You should have received a copy of the GNU Lesser General Public | |
116
d76a36742464
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
110
diff
changeset
|
19 * License along with FFmpeg; if not, write to the Free Software |
110 | 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
21 */ | |
22 #include "common.h" | |
23 #include "fifo.h" | |
24 | |
679
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
25 AVFifoBuffer *av_fifo_alloc(unsigned int size) |
110 | 26 { |
679
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
27 AVFifoBuffer *f= av_mallocz(sizeof(AVFifoBuffer)); |
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
28 if(!f) |
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
29 return NULL; |
226
fb0c5c158c67
better to set things to NULL instead of random in case of out of mem
michael
parents:
225
diff
changeset
|
30 f->wptr = f->rptr = |
110 | 31 f->buffer = av_malloc(size); |
229
3f5c648b82c4
simpler branch structure in init (16 bytes smaller object file)
michael
parents:
228
diff
changeset
|
32 f->end = f->buffer + size; |
110 | 33 if (!f->buffer) |
679
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
34 av_freep(&f); |
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
35 return f; |
110 | 36 } |
37 | |
38 void av_fifo_free(AVFifoBuffer *f) | |
39 { | |
679
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
40 if(f){ |
110 | 41 av_free(f->buffer); |
679
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
42 av_free(f); |
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
43 } |
110 | 44 } |
45 | |
46 int av_fifo_size(AVFifoBuffer *f) | |
47 { | |
676 | 48 return (uint32_t)(f->wndx - f->rndx); |
110 | 49 } |
50 | |
565
a0dab9157d6a
Deprecate av_fifo_realloc(). av_fifo_realloc2() should be used instead.
stefano
parents:
564
diff
changeset
|
51 #if LIBAVUTIL_VERSION_MAJOR < 50 |
110 | 52 void av_fifo_realloc(AVFifoBuffer *f, unsigned int new_size) { |
564 | 53 av_fifo_realloc2(f, new_size); |
54 } | |
565
a0dab9157d6a
Deprecate av_fifo_realloc(). av_fifo_realloc2() should be used instead.
stefano
parents:
564
diff
changeset
|
55 #endif |
564 | 56 |
57 int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { | |
110 | 58 unsigned int old_size= f->end - f->buffer; |
59 | |
676 | 60 if(old_size < new_size){ |
225 | 61 int len= av_fifo_size(f); |
679
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
62 AVFifoBuffer *f2= av_fifo_alloc(new_size); |
110 | 63 |
679
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
64 if (!f2) |
564 | 65 return -1; |
683
0bba880f7c22
Replace all uses of the replaced av_fifo_read by av_fifo_generic_read
reimar
parents:
680
diff
changeset
|
66 av_fifo_generic_read(f, len, NULL, f2->buffer); |
679
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
67 f2->wptr += len; |
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
68 f2->wndx += len; |
225 | 69 av_free(f->buffer); |
679
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
70 *f= *f2; |
58a5033060c3
Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues.
michael
parents:
677
diff
changeset
|
71 av_free(f2); |
110 | 72 } |
564 | 73 return 0; |
110 | 74 } |
75 | |
623
5a8d0e6cdcfb
Drop deprecated av_fifo_write function with the next libavutil version bump.
diego
parents:
566
diff
changeset
|
76 #if LIBAVUTIL_VERSION_MAJOR < 50 |
110 | 77 void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size) |
78 { | |
492 | 79 av_fifo_generic_write(f, (void *)buf, size, NULL); |
80 } | |
623
5a8d0e6cdcfb
Drop deprecated av_fifo_write function with the next libavutil version bump.
diego
parents:
566
diff
changeset
|
81 #endif |
492 | 82 |
493 | 83 int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int)) |
492 | 84 { |
85 int total = size; | |
230
4c85ac99ab37
change while loops to do-while as the condition is true the first time and the check just wastes cpu cycles
michael
parents:
229
diff
changeset
|
86 do { |
223 | 87 int len = FFMIN(f->end - f->wptr, size); |
492 | 88 if(func) { |
493 | 89 if(func(src, f->wptr, len) <= 0) |
492 | 90 break; |
91 } else { | |
493 | 92 memcpy(f->wptr, src, len); |
93 src = (uint8_t*)src + len; | |
492 | 94 } |
677
5dd1730abf98
Comments to indicate where memory barriers may be needed.
michael
parents:
676
diff
changeset
|
95 // Write memory barrier needed for SMP here in theory |
110 | 96 f->wptr += len; |
97 if (f->wptr >= f->end) | |
98 f->wptr = f->buffer; | |
676 | 99 f->wndx += len; |
110 | 100 size -= len; |
230
4c85ac99ab37
change while loops to do-while as the condition is true the first time and the check just wastes cpu cycles
michael
parents:
229
diff
changeset
|
101 } while (size > 0); |
492 | 102 return total - size; |
110 | 103 } |
104 | |
105 | |
106 int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest) | |
107 { | |
677
5dd1730abf98
Comments to indicate where memory barriers may be needed.
michael
parents:
676
diff
changeset
|
108 // Read memory barrier needed for SMP here in theory |
230
4c85ac99ab37
change while loops to do-while as the condition is true the first time and the check just wastes cpu cycles
michael
parents:
229
diff
changeset
|
109 do { |
223 | 110 int len = FFMIN(f->end - f->rptr, buf_size); |
224 | 111 if(func) func(dest, f->rptr, len); |
112 else{ | |
113 memcpy(dest, f->rptr, len); | |
114 dest = (uint8_t*)dest + len; | |
115 } | |
677
5dd1730abf98
Comments to indicate where memory barriers may be needed.
michael
parents:
676
diff
changeset
|
116 // memory barrier needed for SMP here in theory |
227 | 117 av_fifo_drain(f, len); |
110 | 118 buf_size -= len; |
230
4c85ac99ab37
change while loops to do-while as the condition is true the first time and the check just wastes cpu cycles
michael
parents:
229
diff
changeset
|
119 } while (buf_size > 0); |
110 | 120 return 0; |
121 } | |
122 | |
633 | 123 /** Discard data from the FIFO. */ |
110 | 124 void av_fifo_drain(AVFifoBuffer *f, int size) |
125 { | |
126 f->rptr += size; | |
127 if (f->rptr >= f->end) | |
128 f->rptr -= f->end - f->buffer; | |
676 | 129 f->rndx += size; |
110 | 130 } |