Unified · Split
| @@ -5365,10 +5365,7 @@ int vp9_receive_raw_frame(VP9_COMP *cpi, vpx_enc_frame_flags_t frame_flags, · 5364 unmodified lines | |||
| 5365 | vpx_usec_timer_start(&timer); | 5365 | vpx_usec_timer_start(&timer); |
| 5366 | 5366 | ||
| 5367 | if (vp9_lookahead_push(cpi->lookahead, sd, time_stamp, end_time, | 5367 | if (vp9_lookahead_push(cpi->lookahead, sd, time_stamp, end_time, |
| 5368 | #if CONFIG_VP9_HIGHBITDEPTH | 5368 | use_highbitdepth, frame_flags)) |
| 5369 | use_highbitdepth, | ||
| 5370 | #endif // CONFIG_VP9_HIGHBITDEPTH | ||
| 5371 | frame_flags)) | ||
| 5372 | res = -1; | 5369 | res = -1; |
| 5373 | vpx_usec_timer_mark(&timer); | 5370 | vpx_usec_timer_mark(&timer); |
| 5374 | cpi->time_receive_data += vpx_usec_timer_elapsed(&timer); | 5371 | cpi->time_receive_data += vpx_usec_timer_elapsed(&timer); |
| @@ -83,10 +83,7 @@ bail: · 82 unmodified lines | |||
| 83 | #define USE_PARTIAL_COPY 0 | 83 | #define USE_PARTIAL_COPY 0 |
| 84 | 84 | ||
| 85 | int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, | 85 | int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, |
| 86 | int64_t ts_start, int64_t ts_end, | 86 | int64_t ts_start, int64_t ts_end, int use_highbitdepth, |
| 87 | #if CONFIG_VP9_HIGHBITDEPTH | ||
| 88 | int use_highbitdepth, | ||
| 89 | #endif | ||
| 90 | vpx_enc_frame_flags_t flags) { | 87 | vpx_enc_frame_flags_t flags) { |
| 91 | struct lookahead_entry *buf; | 88 | struct lookahead_entry *buf; |
| 92 | #if USE_PARTIAL_COPY | 89 | #if USE_PARTIAL_COPY |
| @@ -101,6 +98,10 @@ int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, · 8 unmodified lines | |||
| 101 | int subsampling_x = src->subsampling_x; | 98 | int subsampling_x = src->subsampling_x; |
| 102 | int subsampling_y = src->subsampling_y; | 99 | int subsampling_y = src->subsampling_y; |
| 103 | int larger_dimensions, new_dimensions; | 100 | int larger_dimensions, new_dimensions; |
| 101 | #if !CONFIG_VP9_HIGHBITDEPTH | ||
| 102 | (void)use_highbitdepth; | ||
| 103 | assert(use_highbitdepth == 0); | ||
| 104 | #endif | ||
| 104 | 105 | ||
| 105 | if (ctx->sz + 1 + MAX_PRE_FRAMES > ctx->max_sz) return 1; | 106 | if (ctx->sz + 1 + MAX_PRE_FRAMES > ctx->max_sz) return 1; |
| 106 | ctx->sz++; | 107 | ctx->sz++; |
| @@ -73,10 +73,7 @@ void vp9_lookahead_destroy(struct lookahead_ctx *ctx); · 72 unmodified lines | |||
| 73 | * \param[in] active_map Map that specifies which macroblock is active | 73 | * \param[in] active_map Map that specifies which macroblock is active |
| 74 | */ | 74 | */ |
| 75 | int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, | 75 | int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, |
| 76 | int64_t ts_start, int64_t ts_end, | 76 | int64_t ts_start, int64_t ts_end, int use_highbitdepth, |
| 77 | #if CONFIG_VP9_HIGHBITDEPTH | ||
| 78 | int use_highbitdepth, | ||
| 79 | #endif | ||
| 80 | vpx_enc_frame_flags_t flags); | 77 | vpx_enc_frame_flags_t flags); |
| 81 | 78 | ||
| 82 | /**\brief Get the next source buffer to encode | 79 | /**\brief Get the next source buffer to encode |