diff options
author | Victorien Le Couviour--Tuffet <victorien@videolan.org> | 2021-01-08 18:58:45 +0300 |
---|---|---|
committer | Victorien Le Couviour--Tuffet <victorien@videolan.org> | 2021-02-01 13:18:04 +0300 |
commit | 288ed4b8ec47eeee7f888bf8c6f3758d0391eda1 (patch) | |
tree | efdfecacd91ee14eae5799bd9a052e4e9655f801 /examples | |
parent | 7c316a70358aa3d1b361471d11a1b2671067faca (diff) |
dav1dplay: Add pause and seek features
Diffstat (limited to 'examples')
-rw-r--r-- | examples/dav1dplay.c | 414 | ||||
-rw-r--r-- | examples/dp_fifo.c | 28 | ||||
-rw-r--r-- | examples/dp_fifo.h | 2 | ||||
-rw-r--r-- | examples/dp_renderer.h | 7 |
4 files changed, 338 insertions, 113 deletions
diff --git a/examples/dav1dplay.c b/examples/dav1dplay.c index a7eca93..b3ab40e 100644 --- a/examples/dav1dplay.c +++ b/examples/dav1dplay.c @@ -39,6 +39,11 @@ #include "dp_fifo.h" #include "dp_renderer.h" +#define FRAME_OFFSET_TO_PTS(foff) \ + (uint64_t)(((foff) * rd_ctx->spf) * 1000000000.0 + .5) +#define TS_TO_PTS(ts) \ + (uint64_t)(((ts) * rd_ctx->timebase) * 1000000000.0 + .5) + // Selected renderer callbacks and cookie static const Dav1dPlayRenderInfo *renderer_info = { NULL }; @@ -59,27 +64,43 @@ typedef struct render_context // Lock to protect access to the context structure SDL_mutex *lock; - // Timestamp of previous decoded frame - int64_t last_pts; - // Timestamp of current decoded frame - int64_t current_pts; + // Timestamp of last displayed frame (in timebase unit) + int64_t last_ts; + // Timestamp of last decoded frame (in timebase unit) + int64_t current_ts; // Ticks when last frame was received uint32_t last_ticks; // PTS time base double timebase; + // Seconds per frame + double spf; + // Number of frames + uint32_t total; // Fifo Dav1dPlayPtrFifo *fifo; - // Custom SDL2 event type - uint32_t renderer_event_type; + // Custom SDL2 event types + uint32_t event_types; + + // User pause state + uint8_t user_paused; + // Internal pause state + uint8_t paused; + // Start of internal pause state + uint32_t pause_start; + // Duration of internal pause state + uint32_t pause_time; + + // Seek accumulator + int seek; // Indicates if termination of the decoder thread was requested uint8_t dec_should_terminate; } Dav1dPlayRenderContext; static void dp_settings_print_usage(const char *const app, - const char *const reason, ...) + const char *const reason, ...) { if (reason) { va_list args; @@ -116,7 +137,7 @@ static unsigned parse_unsigned(const char *const optarg, const int option, } static void dp_rd_ctx_parse_args(Dav1dPlayRenderContext *rd_ctx, - const int argc, char *const *const argv) + const int argc, char *const *const argv) { int o; Dav1dPlaySettings *settings = &rd_ctx->settings; @@ -220,16 +241,16 @@ static Dav1dPlayRenderContext *dp_rd_ctx_create(int argc, char **argv) Dav1dPlayRenderContext *rd_ctx; // Alloc - rd_ctx = malloc(sizeof(Dav1dPlayRenderContext)); + rd_ctx = calloc(1, sizeof(Dav1dPlayRenderContext)); if (rd_ctx == NULL) { return NULL; } // Register a custom event to notify our SDL main thread // about new frames - rd_ctx->renderer_event_type = SDL_RegisterEvents(1); - if (rd_ctx->renderer_event_type == UINT32_MAX) { - fprintf(stderr, "Failure to create custom SDL event type!\n"); + rd_ctx->event_types = SDL_RegisterEvents(3); + if (rd_ctx->event_types == UINT32_MAX) { + fprintf(stderr, "Failure to create custom SDL event types!\n"); free(rd_ctx); return NULL; } @@ -272,24 +293,17 @@ static Dav1dPlayRenderContext *dp_rd_ctx_create(int argc, char **argv) return NULL; } - rd_ctx->last_pts = 0; - rd_ctx->last_ticks = 0; - rd_ctx->current_pts = 0; - rd_ctx->timebase = 0; - rd_ctx->dec_should_terminate = 0; - return rd_ctx; } /** - * Notify about new available frame + * Notify about new event */ -static void dp_rd_ctx_post_event(Dav1dPlayRenderContext *rd_ctx, uint32_t code) +static void dp_rd_ctx_post_event(Dav1dPlayRenderContext *rd_ctx, uint32_t type) { SDL_Event event; SDL_zero(event); - event.type = rd_ctx->renderer_event_type; - event.user.code = code; + event.type = type; SDL_PushEvent(&event); } @@ -301,10 +315,137 @@ static void dp_rd_ctx_post_event(Dav1dPlayRenderContext *rd_ctx, uint32_t code) * new picture. */ static void dp_rd_ctx_update_with_dav1d_picture(Dav1dPlayRenderContext *rd_ctx, - Dav1dPicture *dav1d_pic) + Dav1dPicture *dav1d_pic) { renderer_info->update_frame(rd_ctx->rd_priv, dav1d_pic, &rd_ctx->settings); - rd_ctx->current_pts = dav1d_pic->m.timestamp; + rd_ctx->current_ts = dav1d_pic->m.timestamp; +} + +/** + * Toggle pause state + */ +static void dp_rd_ctx_toggle_pause(Dav1dPlayRenderContext *rd_ctx) +{ + SDL_LockMutex(rd_ctx->lock); + rd_ctx->user_paused = !rd_ctx->user_paused; + if (rd_ctx->seek) + goto out; + rd_ctx->paused = rd_ctx->user_paused; + uint32_t now = SDL_GetTicks(); + if (rd_ctx->paused) + rd_ctx->pause_start = now; + else { + rd_ctx->pause_time += now - rd_ctx->pause_start; + rd_ctx->pause_start = 0; + rd_ctx->last_ticks = now; + } +out: + SDL_UnlockMutex(rd_ctx->lock); +} + +/** + * Query pause state + */ +static int dp_rd_ctx_is_paused(Dav1dPlayRenderContext *rd_ctx) +{ + int ret; + SDL_LockMutex(rd_ctx->lock); + ret = rd_ctx->paused; + SDL_UnlockMutex(rd_ctx->lock); + return ret; +} + +/** + * Request seeking, in seconds + */ +static void dp_rd_ctx_seek(Dav1dPlayRenderContext *rd_ctx, int sec) +{ + SDL_LockMutex(rd_ctx->lock); + rd_ctx->seek += sec; + if (!rd_ctx->paused) + rd_ctx->pause_start = SDL_GetTicks(); + rd_ctx->paused = 1; + SDL_UnlockMutex(rd_ctx->lock); +} + +static int decode_frame(Dav1dPicture **p, Dav1dContext *c, + Dav1dData *data, DemuxerContext *in_ctx); +static inline void destroy_pic(void *a); + +/** + * Seek the stream, if requested + */ +static int dp_rd_ctx_handle_seek(Dav1dPlayRenderContext *rd_ctx, + DemuxerContext *in_ctx, + Dav1dContext *c, Dav1dData *data) +{ + int res = 0; + SDL_LockMutex(rd_ctx->lock); + if (!rd_ctx->seek) + goto out; + int64_t seek = rd_ctx->seek * 1000000000ULL; + uint64_t pts = TS_TO_PTS(rd_ctx->current_ts); + pts = ((int64_t)pts > -seek) ? pts + seek : 0; + int end = pts >= FRAME_OFFSET_TO_PTS(rd_ctx->total); + if (end) + pts = FRAME_OFFSET_TO_PTS(rd_ctx->total - 1); + uint64_t target_pts = pts; + dav1d_flush(c); + uint64_t shift = FRAME_OFFSET_TO_PTS(5); + while (1) { + if (shift > pts) + shift = pts; + if ((res = input_seek(in_ctx, pts - shift))) + goto out; + Dav1dSequenceHeader seq; + uint64_t cur_pts; + do { + if ((res = input_read(in_ctx, data))) + break; + cur_pts = TS_TO_PTS(data->m.timestamp); + res = dav1d_parse_sequence_header(&seq, data->data, data->sz); + } while (res && cur_pts < pts); + if (!res && cur_pts <= pts) + break; + if (shift > pts) + shift = pts; + pts -= shift; + } + if (!res) { + pts = TS_TO_PTS(data->m.timestamp); + while (pts < target_pts) { + Dav1dPicture *p; + if ((res = decode_frame(&p, c, data, in_ctx))) + break; + if (p) { + pts = TS_TO_PTS(p->m.timestamp); + if (pts < target_pts) + destroy_pic(p); + else { + dp_fifo_push(rd_ctx->fifo, p); + uint32_t type = rd_ctx->event_types + DAV1D_EVENT_SEEK_FRAME; + dp_rd_ctx_post_event(rd_ctx, type); + } + } + } + if (!res) { + rd_ctx->last_ts = data->m.timestamp - rd_ctx->spf / rd_ctx->timebase; + rd_ctx->current_ts = data->m.timestamp; + } + } +out: + rd_ctx->paused = rd_ctx->user_paused; + if (!rd_ctx->paused && rd_ctx->seek) { + uint32_t now = SDL_GetTicks(); + rd_ctx->pause_time += now - rd_ctx->pause_start; + rd_ctx->pause_start = 0; + rd_ctx->last_ticks = now; + } + rd_ctx->seek = 0; + SDL_UnlockMutex(rd_ctx->lock); + if (res) + fprintf(stderr, "Error seeking, aborting\n"); + return res; } /** @@ -336,14 +477,15 @@ static int dp_rd_ctx_should_terminate(Dav1dPlayRenderContext *rd_ctx) */ static void dp_rd_ctx_render(Dav1dPlayRenderContext *rd_ctx) { + SDL_LockMutex(rd_ctx->lock); // Calculate time since last frame was received uint32_t ticks_now = SDL_GetTicks(); uint32_t ticks_diff = (rd_ctx->last_ticks != 0) ? ticks_now - rd_ctx->last_ticks : 0; // Calculate when to display the frame - int64_t pts_diff = rd_ctx->current_pts - rd_ctx->last_pts; - int32_t wait_time = (pts_diff * rd_ctx->timebase) * 1000 - ticks_diff; - rd_ctx->last_pts = rd_ctx->current_pts; + int64_t ts_diff = rd_ctx->current_ts - rd_ctx->last_ts; + int32_t pts_diff = (ts_diff * rd_ctx->timebase) * 1000.0 + .5; + int32_t wait_time = pts_diff - ticks_diff; // In untimed mode, simply don't wait if (rd_ctx->settings.untimed) @@ -354,13 +496,59 @@ static void dp_rd_ctx_render(Dav1dPlayRenderContext *rd_ctx) // accurate player this would need to be done in a better way. if (wait_time > 0) { SDL_Delay(wait_time); - } else if (wait_time < -10) { // Do not warn for minor time drifts - fprintf(stderr, "Frame displayed %f seconds too late\n", wait_time/(float)1000); + } else if (wait_time < -10 && !rd_ctx->paused) { // Do not warn for minor time drifts + fprintf(stderr, "Frame displayed %f seconds too late\n", wait_time / 1000.0); } renderer_info->render(rd_ctx->rd_priv, &rd_ctx->settings); + rd_ctx->last_ts = rd_ctx->current_ts; rd_ctx->last_ticks = SDL_GetTicks(); + + SDL_UnlockMutex(rd_ctx->lock); +} + +static int decode_frame(Dav1dPicture **p, Dav1dContext *c, + Dav1dData *data, DemuxerContext *in_ctx) +{ + int res; + // Send data packets we got from the demuxer to dav1d + if ((res = dav1d_send_data(c, data)) < 0) { + // On EAGAIN, dav1d can not consume more data and + // dav1d_get_picture needs to be called first, which + // will happen below, so just keep going in that case + // and do not error out. + if (res != DAV1D_ERR(EAGAIN)) { + dav1d_data_unref(data); + goto err; + } + } + *p = calloc(1, sizeof(**p)); + // Try to get a decoded frame + if ((res = dav1d_get_picture(c, *p)) < 0) { + // In all error cases, even EAGAIN, p needs to be freed as + // it is never added to the queue and would leak. + free(*p); + *p = NULL; + // On EAGAIN, it means dav1d has not enough data to decode + // therefore this is not a decoding error but just means + // we need to feed it more data, which happens in the next + // run of the decoder loop. + if (res != DAV1D_ERR(EAGAIN)) + goto err; + } + return data->sz == 0 ? input_read(in_ctx, data) : 0; +err: + fprintf(stderr, "Error decoding frame: %s\n", + strerror(-res)); + return res; +} + +static inline void destroy_pic(void *a) +{ + Dav1dPicture *p = (Dav1dPicture *)a; + dav1d_picture_unref(p); + free(p); } /* Decoder thread "main" function */ @@ -373,10 +561,7 @@ static int decoder_thread_main(void *cookie) Dav1dData data; DemuxerContext *in_ctx = NULL; int res = 0; - unsigned n_out = 0, total, timebase[2], fps[2]; - - // Store current ticks for stats calculation - uint32_t decoder_start = SDL_GetTicks(); + unsigned total, timebase[2], fps[2]; Dav1dPlaySettings settings = rd_ctx->settings; @@ -389,8 +574,9 @@ static int decoder_thread_main(void *cookie) goto cleanup; } - double timebase_d = timebase[1]/(double)timebase[0]; - rd_ctx->timebase = timebase_d; + rd_ctx->timebase = (double)timebase[1] / timebase[0]; + rd_ctx->spf = (double)fps[1] / fps[0]; + rd_ctx->total = total; if ((res = dav1d_open(&c, &rd_ctx->lib_settings))) { fprintf(stderr, "Failed opening dav1d decoder\n"); @@ -405,55 +591,29 @@ static int decoder_thread_main(void *cookie) } // Decoder loop - do { - if (dp_rd_ctx_should_terminate(rd_ctx)) + while (1) { + if (dp_rd_ctx_should_terminate(rd_ctx) || + (res = dp_rd_ctx_handle_seek(rd_ctx, in_ctx, c, &data)) || + (res = decode_frame(&p, c, &data, in_ctx))) + { break; - - // Send data packets we got from the demuxer to dav1d - if ((res = dav1d_send_data(c, &data)) < 0) { - // On EAGAIN, dav1d can not consume more data and - // dav1d_get_picture needs to be called first, which - // will happen below, so just keep going in that case - // and do not error out. - if (res != DAV1D_ERR(EAGAIN)) { - dav1d_data_unref(&data); - fprintf(stderr, "Error decoding frame: %s\n", - strerror(-res)); - break; - } } - - p = calloc(1, sizeof(*p)); - - // Try to get a decoded frame - if ((res = dav1d_get_picture(c, p)) < 0) { - // In all error cases, even EAGAIN, p needs to be freed as - // it is never added to the queue and would leak. - free(p); - - // On EAGAIN, it means dav1d has not enough data to decode - // therefore this is not a decoding error but just means - // we need to feed it more data, which happens in the next - // run of this decoder loop. - if (res != DAV1D_ERR(EAGAIN)) { - fprintf(stderr, "Error decoding frame: %s\n", - strerror(-res)); - break; - } - res = 0; - } else { - + else if (p) { // Queue frame - dp_fifo_push(rd_ctx->fifo, p); - dp_rd_ctx_post_event(rd_ctx, DAV1D_EVENT_NEW_FRAME); - - n_out++; + SDL_LockMutex(rd_ctx->lock); + int seek = rd_ctx->seek; + SDL_UnlockMutex(rd_ctx->lock); + if (!seek) { + dp_fifo_push(rd_ctx->fifo, p); + uint32_t type = rd_ctx->event_types + DAV1D_EVENT_NEW_FRAME; + dp_rd_ctx_post_event(rd_ctx, type); + } } - } while ((data.sz > 0 || !input_read(in_ctx, &data))); + } // Release remaining data - if (data.sz > 0) dav1d_data_unref(&data); - + if (data.sz > 0) + dav1d_data_unref(&data); // Do not drain in case an error occured and caused us to leave the // decoding loop early. if (res < 0) @@ -468,7 +628,6 @@ static int decoder_thread_main(void *cookie) do { if (dp_rd_ctx_should_terminate(rd_ctx)) break; - p = calloc(1, sizeof(*p)); res = dav1d_get_picture(c, p); if (res < 0) { @@ -481,19 +640,13 @@ static int decoder_thread_main(void *cookie) } else { // Queue frame dp_fifo_push(rd_ctx->fifo, p); - dp_rd_ctx_post_event(rd_ctx, DAV1D_EVENT_NEW_FRAME); - - n_out++; + uint32_t type = rd_ctx->event_types + DAV1D_EVENT_NEW_FRAME; + dp_rd_ctx_post_event(rd_ctx, type); } } while (res != DAV1D_ERR(EAGAIN)); - // Print stats - uint32_t decoding_time_ms = SDL_GetTicks() - decoder_start; - printf("Decoded %u frames in %d seconds, avg %.02f fps\n", - n_out, decoding_time_ms/1000, n_out / (decoding_time_ms / 1000.0)); - cleanup: - dp_rd_ctx_post_event(rd_ctx, DAV1D_EVENT_DEC_QUIT); + dp_rd_ctx_post_event(rd_ctx, rd_ctx->event_types + DAV1D_EVENT_DEC_QUIT); if (in_ctx) input_close(in_ctx); @@ -550,41 +703,84 @@ int main(int argc, char **argv) decoder_thread = SDL_CreateThread(decoder_thread_main, "Decoder thread", rd_ctx); // Main loop +#define NUM_MAX_EVENTS 8 + SDL_Event events[NUM_MAX_EVENTS]; + int num_frame_events = 0; + uint32_t start_time = 0, n_out = 0; while (1) { - - SDL_Event e; - if (SDL_WaitEvent(&e)) { - if (e.type == SDL_QUIT) { + int num_events = 0; + SDL_WaitEvent(NULL); + while (num_events < NUM_MAX_EVENTS && SDL_PollEvent(&events[num_events++])) + break; + for (int i = 0; i < num_events; ++i) { + SDL_Event *e = &events[i]; + if (e->type == SDL_QUIT) { dp_rd_ctx_request_shutdown(rd_ctx); - } else if (e.type == SDL_WINDOWEVENT) { - if (e.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) { + dp_fifo_flush(rd_ctx->fifo, destroy_pic); + SDL_FlushEvent(rd_ctx->event_types + DAV1D_EVENT_NEW_FRAME); + SDL_FlushEvent(rd_ctx->event_types + DAV1D_EVENT_SEEK_FRAME); + num_frame_events = 0; + } else if (e->type == SDL_WINDOWEVENT) { + if (e->window.event == SDL_WINDOWEVENT_SIZE_CHANGED) { // TODO: Handle window resizes } - } else if (e.type == rd_ctx->renderer_event_type) { - if (e.user.code == DAV1D_EVENT_NEW_FRAME) { - // Dequeue frame and update the render context with it - Dav1dPicture *p = dp_fifo_shift(rd_ctx->fifo); - - // Do not update textures during termination - if (!dp_rd_ctx_should_terminate(rd_ctx)) - dp_rd_ctx_update_with_dav1d_picture(rd_ctx, p); - dav1d_picture_unref(p); - free(p); - } else if (e.user.code == DAV1D_EVENT_DEC_QUIT) { - break; + } else if (e->type == SDL_KEYDOWN) { + SDL_KeyboardEvent *kbde = (SDL_KeyboardEvent *)e; + if (kbde->keysym.sym == SDLK_SPACE) { + dp_rd_ctx_toggle_pause(rd_ctx); + } else if (kbde->keysym.sym == SDLK_LEFT || + kbde->keysym.sym == SDLK_RIGHT) + { + if (kbde->keysym.sym == SDLK_LEFT) + dp_rd_ctx_seek(rd_ctx, -5); + else if (kbde->keysym.sym == SDLK_RIGHT) + dp_rd_ctx_seek(rd_ctx, +5); + dp_fifo_flush(rd_ctx->fifo, destroy_pic); + SDL_FlushEvent(rd_ctx->event_types + DAV1D_EVENT_NEW_FRAME); + num_frame_events = 0; } + } else if (e->type == rd_ctx->event_types + DAV1D_EVENT_NEW_FRAME) { + num_frame_events++; + // Store current ticks for stats calculation + if (start_time == 0) + start_time = SDL_GetTicks(); + } else if (e->type == rd_ctx->event_types + DAV1D_EVENT_SEEK_FRAME) { + // Dequeue frame and update the render context with it + Dav1dPicture *p = dp_fifo_shift(rd_ctx->fifo); + // Do not update textures during termination + if (!dp_rd_ctx_should_terminate(rd_ctx)) { + dp_rd_ctx_update_with_dav1d_picture(rd_ctx, p); + n_out++; + } + destroy_pic(p); + } else if (e->type == rd_ctx->event_types + DAV1D_EVENT_DEC_QUIT) { + goto out; } } - + if (num_frame_events && !dp_rd_ctx_is_paused(rd_ctx)) { + // Dequeue frame and update the render context with it + Dav1dPicture *p = dp_fifo_shift(rd_ctx->fifo); + // Do not update textures during termination + if (!dp_rd_ctx_should_terminate(rd_ctx)) { + dp_rd_ctx_update_with_dav1d_picture(rd_ctx, p); + n_out++; + } + destroy_pic(p); + num_frame_events--; + } // Do not render during termination if (!dp_rd_ctx_should_terminate(rd_ctx)) dp_rd_ctx_render(rd_ctx); } +out:; + // Print stats + uint32_t time_ms = SDL_GetTicks() - start_time - rd_ctx->pause_time; + printf("Decoded %u frames in %d seconds, avg %.02f fps\n", + n_out, time_ms / 1000, n_out/ (time_ms / 1000.0)); + int decoder_ret = 0; SDL_WaitThread(decoder_thread, &decoder_ret); - dp_rd_ctx_destroy(rd_ctx); - return decoder_ret; } diff --git a/examples/dp_fifo.c b/examples/dp_fifo.c index 243d2e9..0de00fc 100644 --- a/examples/dp_fifo.c +++ b/examples/dp_fifo.c @@ -37,6 +37,8 @@ struct dp_fifo size_t capacity; size_t count; void **entries; + int push_wait; + int flush; }; @@ -54,6 +56,8 @@ Dav1dPlayPtrFifo *dp_fifo_create(size_t capacity) fifo->capacity = capacity; fifo->count = 0; + fifo->push_wait = 0; + fifo->flush = 0; fifo->lock = SDL_CreateMutex(); if (fifo->lock == NULL) { @@ -90,8 +94,16 @@ void dp_fifo_destroy(Dav1dPlayPtrFifo *fifo) void dp_fifo_push(Dav1dPlayPtrFifo *fifo, void *element) { SDL_LockMutex(fifo->lock); - while (fifo->count == fifo->capacity) + while (fifo->count == fifo->capacity) { + fifo->push_wait = 1; SDL_CondWait(fifo->cond_change, fifo->lock); + fifo->push_wait = 0; + if (fifo->flush) { + SDL_CondSignal(fifo->cond_change); + SDL_UnlockMutex(fifo->lock); + return; + } + } fifo->entries[fifo->count++] = element; if (fifo->count == 1) SDL_CondSignal(fifo->cond_change); @@ -120,4 +132,16 @@ void *dp_fifo_shift(Dav1dPlayPtrFifo *fifo) return res; } - +void dp_fifo_flush(Dav1dPlayPtrFifo *fifo, void (*destroy_elem)(void *)) +{ + SDL_LockMutex(fifo->lock); + fifo->flush = 1; + if (fifo->push_wait) { + SDL_CondSignal(fifo->cond_change); + SDL_CondWait(fifo->cond_change, fifo->lock); + } + while (fifo->count) + destroy_elem(fifo->entries[--fifo->count]); + fifo->flush = 0; + SDL_UnlockMutex(fifo->lock); +} diff --git a/examples/dp_fifo.h b/examples/dp_fifo.h index a94b089..03d8e47 100644 --- a/examples/dp_fifo.h +++ b/examples/dp_fifo.h @@ -59,3 +59,5 @@ void *dp_fifo_shift(Dav1dPlayPtrFifo *fifo); * other thread will call dp_fifo_shift will lead to a deadlock. */ void dp_fifo_push(Dav1dPlayPtrFifo *fifo, void *element); + +void dp_fifo_flush(Dav1dPlayPtrFifo *fifo, void (*destroy_elem)(void *)); diff --git a/examples/dp_renderer.h b/examples/dp_renderer.h index 4c6f295..19dcf07 100644 --- a/examples/dp_renderer.h +++ b/examples/dp_renderer.h @@ -66,8 +66,11 @@ typedef struct { #define WINDOW_WIDTH 910 #define WINDOW_HEIGHT 512 -#define DAV1D_EVENT_NEW_FRAME 1 -#define DAV1D_EVENT_DEC_QUIT 2 +enum { + DAV1D_EVENT_NEW_FRAME, + DAV1D_EVENT_SEEK_FRAME, + DAV1D_EVENT_DEC_QUIT +}; /** * Renderer info |