mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-17 23:08:35 +00:00
[libvpx] Update to v1.12.0
This commit is contained in:
1 parent
287a71dc66
commit
b5046d2a76
572 files changed
+52900
-29493
No files matched your search
@@ -425,20 +425,24 @@ int main(int argc, char *argv[]) {
|
||||
break;
|
||||
}
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
#define psnr_and_ssim(ssim, psnr, buf0, buf1, w, h) \
|
||||
if (bit_depth < 9) { \
|
||||
ssim = ssim2(buf0, buf1, w, w, w, h); \
|
||||
psnr = calc_plane_error(buf0, w, buf1, w, w, h); \
|
||||
} else { \
|
||||
ssim = highbd_ssim2(CONVERT_TO_BYTEPTR(buf0), CONVERT_TO_BYTEPTR(buf1), w, \
|
||||
w, w, h, bit_depth); \
|
||||
psnr = calc_plane_error16(CAST_TO_SHORTPTR(buf0), w, \
|
||||
CAST_TO_SHORTPTR(buf1), w, w, h); \
|
||||
}
|
||||
#define psnr_and_ssim(ssim, psnr, buf0, buf1, w, h) \
|
||||
do { \
|
||||
if (bit_depth < 9) { \
|
||||
ssim = ssim2(buf0, buf1, w, w, w, h); \
|
||||
psnr = calc_plane_error(buf0, w, buf1, w, w, h); \
|
||||
} else { \
|
||||
ssim = highbd_ssim2(CONVERT_TO_BYTEPTR(buf0), CONVERT_TO_BYTEPTR(buf1), \
|
||||
w, w, w, h, bit_depth); \
|
||||
psnr = calc_plane_error16(CAST_TO_SHORTPTR(buf0), w, \
|
||||
CAST_TO_SHORTPTR(buf1), w, w, h); \
|
||||
} \
|
||||
} while (0)
|
||||
#else
|
||||
#define psnr_and_ssim(ssim, psnr, buf0, buf1, w, h) \
|
||||
ssim = ssim2(buf0, buf1, w, w, w, h); \
|
||||
psnr = calc_plane_error(buf0, w, buf1, w, w, h);
|
||||
#define psnr_and_ssim(ssim, psnr, buf0, buf1, w, h) \
|
||||
do { \
|
||||
ssim = ssim2(buf0, buf1, w, w, w, h); \
|
||||
psnr = calc_plane_error(buf0, w, buf1, w, w, h); \
|
||||
} while (0)
|
||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||
|
||||
if (n_frames == allocated_frames) {
|
||||
@@ -449,6 +453,10 @@ int main(int argc, char *argv[]) {
|
||||
psnry = realloc(psnry, allocated_frames * sizeof(*psnry));
|
||||
psnru = realloc(psnru, allocated_frames * sizeof(*psnru));
|
||||
psnrv = realloc(psnrv, allocated_frames * sizeof(*psnrv));
|
||||
if (!(ssimy && ssimu && ssimv && psnry && psnru && psnrv)) {
|
||||
fprintf(stderr, "Error allocating SSIM/PSNR data.\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
psnr_and_ssim(ssimy[n_frames], psnry[n_frames], y[0], y[1], w, h);
|
||||
psnr_and_ssim(ssimu[n_frames], psnru[n_frames], u[0], u[1], (w + 1) / 2,
|
||||
|
||||
Reference in new issue
Block a user