generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "fix CONFIG_SPATIAL_SVC warning"

Browse Source
This commit is contained in:
James Zern 2014-10-16 01:09:15 -07:00 committed by Gerrit Code Review
commit 2c133152f7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vpx/vpx_encoder.h
View File

@ -161,7 +161,9 @@ extern "C" {
VPX_CODEC_STATS_PKT, /**< Two-pass statistics for this frame */
VPX_CODEC_FPMB_STATS_PKT, /**< first pass mb statistics for this frame */
VPX_CODEC_PSNR_PKT, /**< PSNR statistics for this frame */
#if CONFIG_SPATIAL_SVC
// TODO(minghai): This is for testing purporses. The released library can't
// depend on vpx_config.h
#if defined(CONFIG_SPATIAL_SVC) && CONFIG_SPATIAL_SVC
VPX_CODEC_SPATIAL_SVC_LAYER_SIZES, /**< Sizes for each layer in this frame*/
VPX_CODEC_SPATIAL_SVC_LAYER_PSNR, /**< PSNR for each layer in this frame*/
#endif
@ -201,7 +203,9 @@ extern "C" {
double psnr[4]; /**< PSNR, total/y/u/v */
} psnr; /**< data for PSNR packet */
vpx_fixed_buf_t raw; /**< data for arbitrary packets */
#if CONFIG_SPATIAL_SVC
// TODO(minghai): This is for testing purporses. The released library
// can't depend on vpx_config.h
#if defined(CONFIG_SPATIAL_SVC) && CONFIG_SPATIAL_SVC
size_t layer_sizes[VPX_SS_MAX_LAYERS];
struct vpx_psnr_pkt layer_psnr[VPX_SS_MAX_LAYERS];
#endif