dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-28 14:38:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "demux: keep a frame tail pointer; used in AddFrame" into 0.3.0

Browse Source
This commit is contained in:
James Zern 2013-03-26 13:30:10 -07:00 committed by Gerrit Code Review
commit 33f9a692d9
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/demux/demux.c
View File

@ -69,6 +69,7 @@ struct WebPDemuxer {
uint32_t bgcolor_; uint32_t bgcolor_;
int num_frames_; int num_frames_;
Frame* frames_; Frame* frames_;
Frame** frames_tail_;
Chunk* chunks_; // non-image chunks Chunk* chunks_; // non-image chunks
}; };
@ -183,15 +184,12 @@ static void AddChunk(WebPDemuxer* const dmux, Chunk* const chunk) {
// Add a frame to the end of the list, ensuring the last frame is complete. // Add a frame to the end of the list, ensuring the last frame is complete.
// Returns true on success, false otherwise. // Returns true on success, false otherwise.
static int AddFrame(WebPDemuxer* const dmux, Frame* const frame) { static int AddFrame(WebPDemuxer* const dmux, Frame* const frame) {
const Frame* last_frame = NULL; const Frame* const last_frame = *dmux->frames_tail_;
Frame** f = &dmux->frames_;
while (*f != NULL) {
last_frame = *f;
f = &(*f)->next_;
}
if (last_frame != NULL && !last_frame->complete_) return 0; if (last_frame != NULL && !last_frame->complete_) return 0;
*f = frame;
*dmux->frames_tail_ = frame;
frame->next_ = NULL; frame->next_ = NULL;
dmux->frames_tail_ = &frame->next_;
return 1; return 1;
} }
@ -660,6 +658,7 @@ static void InitDemux(WebPDemuxer* const dmux, const MemBuffer* const mem) {
dmux->bgcolor_ = 0xFFFFFFFF; // White background by default. dmux->bgcolor_ = 0xFFFFFFFF; // White background by default.
dmux->canvas_width_ = -1; dmux->canvas_width_ = -1;
dmux->canvas_height_ = -1; dmux->canvas_height_ = -1;
dmux->frames_tail_ = &dmux->frames_;
dmux->mem_ = *mem; dmux->mem_ = *mem;
} }