generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Deadline is not supported in VP9 decoder, removing it completely."

Browse Source
This commit is contained in:
Dmitry Kovalev
2014-05-21 10:37:39 -07:00
committed by Gerrit Code Review
parent 3971967c0b d31b836193
commit 66ce10c13d
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vp9/decoder/vp9_decoder.c
View File

@@ -220,8 +220,7 @@ static void swap_frame_buffers(VP9Decoder *pbi) {
} }
int vp9_receive_compressed_data(VP9Decoder *pbi, int vp9_receive_compressed_data(VP9Decoder *pbi,
size_t size, const uint8_t **psource, size_t size, const uint8_t **psource) {
int64_t time_stamp) {
VP9_COMMON *const cm = &pbi->common; VP9_COMMON *const cm = &pbi->common;
const uint8_t *source = *psource; const uint8_t *source = *psource;
int retcode = 0; int retcode = 0;
@@ -295,14 +294,12 @@ int vp9_receive_compressed_data(VP9Decoder *pbi,
} }
pbi->ready_for_new_data = 0; pbi->ready_for_new_data = 0;
pbi->last_time_stamp = time_stamp;
cm->error.setjmp = 0; cm->error.setjmp = 0;
return retcode; return retcode;
} }
int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd, int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd,
int64_t *time_stamp, int64_t *time_end_stamp,
vp9_ppflags_t *flags) { vp9_ppflags_t *flags) {
int ret = -1; int ret = -1;
#if !CONFIG_VP9_POSTPROC #if !CONFIG_VP9_POSTPROC
@@ -317,8 +314,6 @@ int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd,
return ret; return ret;
pbi->ready_for_new_data = 1; pbi->ready_for_new_data = 1;
*time_stamp = pbi->last_time_stamp;
*time_end_stamp = 0;
#if CONFIG_VP9_POSTPROC #if CONFIG_VP9_POSTPROC
ret = vp9_post_proc_frame(&pbi->common, sd, flags); ret = vp9_post_proc_frame(&pbi->common, sd, flags);

8
vp9/decoder/vp9_decoder.h
View File

@@ -39,7 +39,6 @@ typedef struct VP9Decoder {
DECLARE_ALIGNED(16, VP9_COMMON, common); DECLARE_ALIGNED(16, VP9_COMMON, common);
int64_t last_time_stamp;
int ready_for_new_data; int ready_for_new_data;
int refresh_frame_flags; int refresh_frame_flags;
@@ -63,12 +62,9 @@ typedef struct VP9Decoder {
} VP9Decoder; } VP9Decoder;
int vp9_receive_compressed_data(struct VP9Decoder *pbi, int vp9_receive_compressed_data(struct VP9Decoder *pbi,
size_t size, const uint8_t **dest, size_t size, const uint8_t **dest);
int64_t time_stamp);
int vp9_get_raw_frame(struct VP9Decoder *pbi, int vp9_get_raw_frame(struct VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd,
YV12_BUFFER_CONFIG *sd,
int64_t *time_stamp, int64_t *time_end_stamp,
vp9_ppflags_t *flags); vp9_ppflags_t *flags);
vpx_codec_err_t vp9_copy_reference_dec(struct VP9Decoder *pbi, vpx_codec_err_t vp9_copy_reference_dec(struct VP9Decoder *pbi,

7
vp9/vp9_dx_iface.c
View File

@@ -244,10 +244,11 @@ static vpx_codec_err_t decode_one(vpx_codec_alg_priv_t *ctx,
const uint8_t **data, unsigned int data_sz, const uint8_t **data, unsigned int data_sz,
void *user_priv, int64_t deadline) { void *user_priv, int64_t deadline) {
YV12_BUFFER_CONFIG sd = { 0 }; YV12_BUFFER_CONFIG sd = { 0 };
int64_t time_stamp = 0, time_end_stamp = 0;
vp9_ppflags_t flags = {0}; vp9_ppflags_t flags = {0};
VP9_COMMON *cm = NULL; VP9_COMMON *cm = NULL;
(void)deadline;
ctx->img_avail = 0; ctx->img_avail = 0;
// Determine the stream parameters. Note that we rely on peek_si to // Determine the stream parameters. Note that we rely on peek_si to
@@ -275,13 +276,13 @@ static vpx_codec_err_t decode_one(vpx_codec_alg_priv_t *ctx,
cm = &ctx->pbi->common; cm = &ctx->pbi->common;
if (vp9_receive_compressed_data(ctx->pbi, data_sz, data, deadline)) if (vp9_receive_compressed_data(ctx->pbi, data_sz, data))
return update_error_state(ctx, &cm->error); return update_error_state(ctx, &cm->error);
if (ctx->base.init_flags & VPX_CODEC_USE_POSTPROC) if (ctx->base.init_flags & VPX_CODEC_USE_POSTPROC)
set_ppflags(ctx, &flags); set_ppflags(ctx, &flags);
if (vp9_get_raw_frame(ctx->pbi, &sd, &time_stamp, &time_end_stamp, &flags)) if (vp9_get_raw_frame(ctx->pbi, &sd, &flags))
return update_error_state(ctx, &cm->error); return update_error_state(ctx, &cm->error);
yuvconfig2image(&ctx->img, &sd, user_priv); yuvconfig2image(&ctx->img, &sd, user_priv);