diff options
| author | Deb Mukherjee <debargha@google.com> | 2014-09-02 15:41:27 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-09-02 15:41:27 -0700 |
| commit | a4ef1a08191bd71a9783219da612addf38f31c9f (patch) | |
| tree | 5774b0de5bd78e77e05c02605cce75c01e4a5c15 /vp9/encoder/vp9_encoder.c | |
| parent | dc8252ae0f855291a97bc3c43d6ee6dd9f659ca5 (diff) | |
| parent | 5acfafb18e1720abfc0dc5baafce8e1a1b292b14 (diff) | |
| download | libvpx-a4ef1a08191bd71a9783219da612addf38f31c9f.tar libvpx-a4ef1a08191bd71a9783219da612addf38f31c9f.tar.gz libvpx-a4ef1a08191bd71a9783219da612addf38f31c9f.tar.bz2 libvpx-a4ef1a08191bd71a9783219da612addf38f31c9f.zip | |
Merge "Adds config opt for highbitdepth + misc. vpx"
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 0c422a3a1..8a74aec5f 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -443,6 +443,9 @@ static void alloc_raw_frame_buffers(VP9_COMP *cpi) { cpi->lookahead = vp9_lookahead_init(oxcf->width, oxcf->height, cm->subsampling_x, cm->subsampling_y, +#if CONFIG_VP9_HIGHBITDEPTH + cm->use_highbitdepth, +#endif oxcf->lag_in_frames); if (!cpi->lookahead) vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, @@ -451,6 +454,9 @@ static void alloc_raw_frame_buffers(VP9_COMP *cpi) { if (vp9_realloc_frame_buffer(&cpi->alt_ref_buffer, oxcf->width, oxcf->height, cm->subsampling_x, cm->subsampling_y, +#if CONFIG_VP9_HIGHBITDEPTH + cm->use_highbitdepth, +#endif VP9_ENC_BORDER_IN_PIXELS, NULL, NULL, NULL)) vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, "Failed to allocate altref buffer"); @@ -468,6 +474,9 @@ static void alloc_util_frame_buffers(VP9_COMP *cpi) { if (vp9_realloc_frame_buffer(&cpi->last_frame_uf, cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, +#if CONFIG_VP9_HIGHBITDEPTH + cm->use_highbitdepth, +#endif VP9_ENC_BORDER_IN_PIXELS, NULL, NULL, NULL)) vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, "Failed to allocate last frame buffer"); @@ -475,6 +484,9 @@ static void alloc_util_frame_buffers(VP9_COMP *cpi) { if (vp9_realloc_frame_buffer(&cpi->scaled_source, cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, +#if CONFIG_VP9_HIGHBITDEPTH + cm->use_highbitdepth, +#endif VP9_ENC_BORDER_IN_PIXELS, NULL, NULL, NULL)) vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, "Failed to allocate scaled source buffer"); @@ -482,6 +494,9 @@ static void alloc_util_frame_buffers(VP9_COMP *cpi) { if (vp9_realloc_frame_buffer(&cpi->scaled_last_source, cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, +#if CONFIG_VP9_HIGHBITDEPTH + cm->use_highbitdepth, +#endif VP9_ENC_BORDER_IN_PIXELS, NULL, NULL, NULL)) vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, "Failed to allocate scaled last source buffer"); @@ -514,6 +529,9 @@ static void update_frame_size(VP9_COMP *cpi) { if (vp9_realloc_frame_buffer(&cpi->alt_ref_buffer, cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, +#if CONFIG_VP9_HIGHBITDEPTH + cm->use_highbitdepth, +#endif VP9_ENC_BORDER_IN_PIXELS, NULL, NULL, NULL)) vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, "Failed to reallocate alt_ref_buffer"); @@ -600,9 +618,9 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { cm->bit_depth = oxcf->bit_depth; if (cm->profile <= PROFILE_1) - assert(cm->bit_depth == BITS_8); + assert(cm->bit_depth == VPX_BITS_8); else - assert(cm->bit_depth > BITS_8); + assert(cm->bit_depth > VPX_BITS_8); cpi->oxcf = *oxcf; @@ -677,6 +695,9 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { if (cpi->oxcf.noise_sensitivity > 0) { vp9_denoiser_alloc(&(cpi->denoiser), cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, +#if CONFIG_VP9_HIGHBITDEPTH + cm->use_highbitdepth, +#endif VP9_ENC_BORDER_IN_PIXELS); } #endif @@ -1604,6 +1625,9 @@ void vp9_scale_references(VP9_COMP *cpi) { vp9_realloc_frame_buffer(&cm->frame_bufs[new_fb].buf, cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, +#if CONFIG_VP9_HIGHBITDEPTH + cm->use_highbitdepth, +#endif VP9_ENC_BORDER_IN_PIXELS, NULL, NULL, NULL); scale_and_extend_frame(ref, &cm->frame_bufs[new_fb].buf); cpi->scaled_ref_idx[ref_frame - 1] = new_fb; @@ -2697,6 +2721,9 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, vp9_realloc_frame_buffer(get_frame_new_buffer(cm), cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, +#if CONFIG_VP9_HIGHBITDEPTH + cm->use_highbitdepth, +#endif VP9_ENC_BORDER_IN_PIXELS, NULL, NULL, NULL); alloc_util_frame_buffers(cpi); |