diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-05-21 10:37:39 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-21 10:37:39 -0700 |
| commit | 66ce10c13dee8d64f4249189df450e4b14cf9ca3 (patch) | |
| tree | e11f8629de23b51a034bdcd0a96928c4616d4e94 /vp9/decoder | |
| parent | 3971967c0ba172e4cf7b87172b0d627b011294e9 (diff) | |
| parent | d31b836193cc879e1ae2613d3621416bdff731fe (diff) | |
| download | libvpx-66ce10c13dee8d64f4249189df450e4b14cf9ca3.tar libvpx-66ce10c13dee8d64f4249189df450e4b14cf9ca3.tar.gz libvpx-66ce10c13dee8d64f4249189df450e4b14cf9ca3.tar.bz2 libvpx-66ce10c13dee8d64f4249189df450e4b14cf9ca3.zip | |
Merge "Deadline is not supported in VP9 decoder, removing it completely."
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decoder.c | 7 | ||||
| -rw-r--r-- | vp9/decoder/vp9_decoder.h | 8 |
2 files changed, 3 insertions, 12 deletions
diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c index e1292c222..8902f179d 100644 --- a/vp9/decoder/vp9_decoder.c +++ b/vp9/decoder/vp9_decoder.c @@ -220,8 +220,7 @@ static void swap_frame_buffers(VP9Decoder *pbi) { } int vp9_receive_compressed_data(VP9Decoder *pbi, - size_t size, const uint8_t **psource, - int64_t time_stamp) { + size_t size, const uint8_t **psource) { VP9_COMMON *const cm = &pbi->common; const uint8_t *source = *psource; int retcode = 0; @@ -295,14 +294,12 @@ int vp9_receive_compressed_data(VP9Decoder *pbi, } pbi->ready_for_new_data = 0; - pbi->last_time_stamp = time_stamp; cm->error.setjmp = 0; return retcode; } int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd, - int64_t *time_stamp, int64_t *time_end_stamp, vp9_ppflags_t *flags) { int ret = -1; #if !CONFIG_VP9_POSTPROC @@ -317,8 +314,6 @@ int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd, return ret; pbi->ready_for_new_data = 1; - *time_stamp = pbi->last_time_stamp; - *time_end_stamp = 0; #if CONFIG_VP9_POSTPROC ret = vp9_post_proc_frame(&pbi->common, sd, flags); diff --git a/vp9/decoder/vp9_decoder.h b/vp9/decoder/vp9_decoder.h index 36fb7ea94..1a5576e5a 100644 --- a/vp9/decoder/vp9_decoder.h +++ b/vp9/decoder/vp9_decoder.h @@ -39,7 +39,6 @@ typedef struct VP9Decoder { DECLARE_ALIGNED(16, VP9_COMMON, common); - int64_t last_time_stamp; int ready_for_new_data; int refresh_frame_flags; @@ -63,12 +62,9 @@ typedef struct VP9Decoder { } VP9Decoder; int vp9_receive_compressed_data(struct VP9Decoder *pbi, - size_t size, const uint8_t **dest, - int64_t time_stamp); + size_t size, const uint8_t **dest); -int vp9_get_raw_frame(struct VP9Decoder *pbi, - YV12_BUFFER_CONFIG *sd, - int64_t *time_stamp, int64_t *time_end_stamp, +int vp9_get_raw_frame(struct VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd, vp9_ppflags_t *flags); vpx_codec_err_t vp9_copy_reference_dec(struct VP9Decoder *pbi, |