diff options
| author | Jingning Han <jingning@google.com> | 2015-08-05 19:00:31 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2015-08-11 17:05:28 -0700 |
| commit | 3ee6db6c8110680c051fe7a4dca97bb27474ca00 (patch) | |
| tree | e05e37dfc10ed26a4fdaee5551b13e2d85a7a1b2 /vpx_scale | |
| parent | b04dad328c33874ae1eda72c73079519935a3feb (diff) | |
| download | libvpx-3ee6db6c8110680c051fe7a4dca97bb27474ca00.tar libvpx-3ee6db6c8110680c051fe7a4dca97bb27474ca00.tar.gz libvpx-3ee6db6c8110680c051fe7a4dca97bb27474ca00.tar.bz2 libvpx-3ee6db6c8110680c051fe7a4dca97bb27474ca00.zip | |
Fork VP9 and VP10 codebase
This commit folks the VP9 and VP10 codebase and makes libvpx
support VP8, VP9, and VP10.
Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
Diffstat (limited to 'vpx_scale')
| -rw-r--r-- | vpx_scale/generic/yv12config.c | 2 | ||||
| -rw-r--r-- | vpx_scale/generic/yv12extend.c | 4 | ||||
| -rw-r--r-- | vpx_scale/vpx_scale_rtcd.pl | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vpx_scale/generic/yv12config.c b/vpx_scale/generic/yv12config.c index 7582792d9..71906b886 100644 --- a/vpx_scale/generic/yv12config.c +++ b/vpx_scale/generic/yv12config.c @@ -114,7 +114,7 @@ int vp8_yv12_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, return -2; } -#if CONFIG_VP9 +#if CONFIG_VP9 || CONFIG_VP10 // TODO(jkoleszar): Maybe replace this with struct vpx_image int vp9_free_frame_buffer(YV12_BUFFER_CONFIG *ybf) { diff --git a/vpx_scale/generic/yv12extend.c b/vpx_scale/generic/yv12extend.c index 086e2f398..07d24d75a 100644 --- a/vpx_scale/generic/yv12extend.c +++ b/vpx_scale/generic/yv12extend.c @@ -157,7 +157,7 @@ void vp8_yv12_extend_frame_borders_c(YV12_BUFFER_CONFIG *ybf) { uv_border + ybf->uv_width - ybf->uv_crop_width); } -#if CONFIG_VP9 +#if CONFIG_VP9 || CONFIG_VP10 static void extend_frame(YV12_BUFFER_CONFIG *const ybf, int ext_size) { const int c_w = ybf->uv_crop_width; const int c_h = ybf->uv_crop_height; @@ -217,7 +217,7 @@ void memcpy_short_addr(uint8_t *dst8, const uint8_t *src8, int num) { memcpy(dst, src, num * sizeof(uint16_t)); } #endif // CONFIG_VP9_HIGHBITDEPTH -#endif // CONFIG_VP9 +#endif // CONFIG_VP9 || CONFIG_VP10 // Copies the source image into the destination image and updates the // destination's UMV borders. diff --git a/vpx_scale/vpx_scale_rtcd.pl b/vpx_scale/vpx_scale_rtcd.pl index d4a2b81a5..ab6de62eb 100644 --- a/vpx_scale/vpx_scale_rtcd.pl +++ b/vpx_scale/vpx_scale_rtcd.pl @@ -22,7 +22,7 @@ add_proto qw/void vp8_yv12_copy_frame/, "const struct yv12_buffer_config *src_yb add_proto qw/void vpx_yv12_copy_y/, "const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc"; -if (vpx_config("CONFIG_VP9") eq "yes") { +if ((vpx_config("CONFIG_VP9") eq "yes") || (vpx_config("CONFIG_VP10") eq "yes")) { add_proto qw/void vp9_extend_frame_borders/, "struct yv12_buffer_config *ybf"; specialize qw/vp9_extend_frame_borders dspr2/; |