diff options
| author | angiebird <angiebird@google.com> | 2019-10-31 15:52:43 -0700 |
|---|---|---|
| committer | angiebird <angiebird@google.com> | 2019-11-13 13:47:52 -0800 |
| commit | 53a0b134a6aa8a4577816c85a60b2a697bc5cdfd (patch) | |
| tree | 1aba755b375233c0c8b8c3dd5fc5f491a5e72a0c /vp9 | |
| parent | b1021be91504af8b4842d1b075aba1fdab39b402 (diff) | |
| download | libvpx-53a0b134a6aa8a4577816c85a60b2a697bc5cdfd.tar libvpx-53a0b134a6aa8a4577816c85a60b2a697bc5cdfd.tar.gz libvpx-53a0b134a6aa8a4577816c85a60b2a697bc5cdfd.tar.bz2 libvpx-53a0b134a6aa8a4577816c85a60b2a697bc5cdfd.zip | |
Remove the macro of vp9_lookahead_push
Change-Id: Iffc06e53714165cbd8e509ca6d2114e9c4d4ab96
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 5 | ||||
| -rw-r--r-- | vp9/encoder/vp9_lookahead.c | 9 | ||||
| -rw-r--r-- | vp9/encoder/vp9_lookahead.h | 5 |
3 files changed, 7 insertions, 12 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 3c7db4a3d..59059b8e6 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -5365,10 +5365,7 @@ int vp9_receive_raw_frame(VP9_COMP *cpi, vpx_enc_frame_flags_t frame_flags, vpx_usec_timer_start(&timer); if (vp9_lookahead_push(cpi->lookahead, sd, time_stamp, end_time, -#if CONFIG_VP9_HIGHBITDEPTH - use_highbitdepth, -#endif // CONFIG_VP9_HIGHBITDEPTH - frame_flags)) + use_highbitdepth, frame_flags)) res = -1; vpx_usec_timer_mark(&timer); cpi->time_receive_data += vpx_usec_timer_elapsed(&timer); diff --git a/vp9/encoder/vp9_lookahead.c b/vp9/encoder/vp9_lookahead.c index 392cd5d41..f016a59d7 100644 --- a/vp9/encoder/vp9_lookahead.c +++ b/vp9/encoder/vp9_lookahead.c @@ -83,10 +83,7 @@ bail: #define USE_PARTIAL_COPY 0 int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, - int64_t ts_start, int64_t ts_end, -#if CONFIG_VP9_HIGHBITDEPTH - int use_highbitdepth, -#endif + int64_t ts_start, int64_t ts_end, int use_highbitdepth, vpx_enc_frame_flags_t flags) { struct lookahead_entry *buf; #if USE_PARTIAL_COPY @@ -101,6 +98,10 @@ int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, int subsampling_x = src->subsampling_x; int subsampling_y = src->subsampling_y; int larger_dimensions, new_dimensions; +#if !CONFIG_VP9_HIGHBITDEPTH + (void)use_highbitdepth; + assert(use_highbitdepth == 0); +#endif if (ctx->sz + 1 + MAX_PRE_FRAMES > ctx->max_sz) return 1; ctx->sz++; diff --git a/vp9/encoder/vp9_lookahead.h b/vp9/encoder/vp9_lookahead.h index c627bede2..e149918b5 100644 --- a/vp9/encoder/vp9_lookahead.h +++ b/vp9/encoder/vp9_lookahead.h @@ -73,10 +73,7 @@ void vp9_lookahead_destroy(struct lookahead_ctx *ctx); * \param[in] active_map Map that specifies which macroblock is active */ int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, - int64_t ts_start, int64_t ts_end, -#if CONFIG_VP9_HIGHBITDEPTH - int use_highbitdepth, -#endif + int64_t ts_start, int64_t ts_end, int use_highbitdepth, vpx_enc_frame_flags_t flags); /**\brief Get the next source buffer to encode |