mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-08-13 09:36:46 +00:00
[libvpx] Update to v1.8.1 from https://chromium.googlesource.com/webm/libvpx
This commit is contained in:
Anthony Minessale
committed by
Andrey Volk
Andrey Volk
parent
34fcadbd53
commit
ceb051af4e
@@ -46,6 +46,14 @@
|
||||
va_end(ap); \
|
||||
} while (0)
|
||||
|
||||
#if CONFIG_ENCODERS
|
||||
/* Swallow warnings about unused results of fread/fwrite */
|
||||
static size_t wrap_fread(void *ptr, size_t size, size_t nmemb, FILE *stream) {
|
||||
return fread(ptr, size, nmemb, stream);
|
||||
}
|
||||
#define fread wrap_fread
|
||||
#endif
|
||||
|
||||
FILE *set_binary_mode(FILE *stream) {
|
||||
(void)stream;
|
||||
#if defined(_WIN32) || defined(__OS2__)
|
||||
@@ -200,8 +208,6 @@ const VpxInterface *get_vpx_decoder_by_fourcc(uint32_t fourcc) {
|
||||
|
||||
#endif // CONFIG_DECODERS
|
||||
|
||||
// TODO(dkovalev): move this function to vpx_image.{c, h}, so it will be part
|
||||
// of vpx_image_t support
|
||||
int vpx_img_plane_width(const vpx_image_t *img, int plane) {
|
||||
if (plane > 0 && img->x_chroma_shift > 0)
|
||||
return (img->d_w + 1) >> img->x_chroma_shift;
|
||||
@@ -266,6 +272,88 @@ double sse_to_psnr(double samples, double peak, double sse) {
|
||||
}
|
||||
}
|
||||
|
||||
#if CONFIG_ENCODERS
|
||||
int read_frame(struct VpxInputContext *input_ctx, vpx_image_t *img) {
|
||||
FILE *f = input_ctx->file;
|
||||
y4m_input *y4m = &input_ctx->y4m;
|
||||
int shortread = 0;
|
||||
|
||||
if (input_ctx->file_type == FILE_TYPE_Y4M) {
|
||||
if (y4m_input_fetch_frame(y4m, f, img) < 1) return 0;
|
||||
} else {
|
||||
shortread = read_yuv_frame(input_ctx, img);
|
||||
}
|
||||
|
||||
return !shortread;
|
||||
}
|
||||
|
||||
int file_is_y4m(const char detect[4]) {
|
||||
if (memcmp(detect, "YUV4", 4) == 0) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int fourcc_is_ivf(const char detect[4]) {
|
||||
if (memcmp(detect, "DKIF", 4) == 0) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void open_input_file(struct VpxInputContext *input) {
|
||||
/* Parse certain options from the input file, if possible */
|
||||
input->file = strcmp(input->filename, "-") ? fopen(input->filename, "rb")
|
||||
: set_binary_mode(stdin);
|
||||
|
||||
if (!input->file) fatal("Failed to open input file");
|
||||
|
||||
if (!fseeko(input->file, 0, SEEK_END)) {
|
||||
/* Input file is seekable. Figure out how long it is, so we can get
|
||||
* progress info.
|
||||
*/
|
||||
input->length = ftello(input->file);
|
||||
rewind(input->file);
|
||||
}
|
||||
|
||||
/* Default to 1:1 pixel aspect ratio. */
|
||||
input->pixel_aspect_ratio.numerator = 1;
|
||||
input->pixel_aspect_ratio.denominator = 1;
|
||||
|
||||
/* For RAW input sources, these bytes will applied on the first frame
|
||||
* in read_frame().
|
||||
*/
|
||||
input->detect.buf_read = fread(input->detect.buf, 1, 4, input->file);
|
||||
input->detect.position = 0;
|
||||
|
||||
if (input->detect.buf_read == 4 && file_is_y4m(input->detect.buf)) {
|
||||
if (y4m_input_open(&input->y4m, input->file, input->detect.buf, 4,
|
||||
input->only_i420) >= 0) {
|
||||
input->file_type = FILE_TYPE_Y4M;
|
||||
input->width = input->y4m.pic_w;
|
||||
input->height = input->y4m.pic_h;
|
||||
input->pixel_aspect_ratio.numerator = input->y4m.par_n;
|
||||
input->pixel_aspect_ratio.denominator = input->y4m.par_d;
|
||||
input->framerate.numerator = input->y4m.fps_n;
|
||||
input->framerate.denominator = input->y4m.fps_d;
|
||||
input->fmt = input->y4m.vpx_fmt;
|
||||
input->bit_depth = input->y4m.bit_depth;
|
||||
} else {
|
||||
fatal("Unsupported Y4M stream.");
|
||||
}
|
||||
} else if (input->detect.buf_read == 4 && fourcc_is_ivf(input->detect.buf)) {
|
||||
fatal("IVF is not supported as input.");
|
||||
} else {
|
||||
input->file_type = FILE_TYPE_RAW;
|
||||
}
|
||||
}
|
||||
|
||||
void close_input_file(struct VpxInputContext *input) {
|
||||
fclose(input->file);
|
||||
if (input->file_type == FILE_TYPE_Y4M) y4m_input_close(&input->y4m);
|
||||
}
|
||||
#endif
|
||||
|
||||
// TODO(debargha): Consolidate the functions below into a separate file.
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
static void highbd_img_upshift(vpx_image_t *dst, vpx_image_t *src,
|
||||
@@ -459,3 +547,225 @@ void vpx_img_downshift(vpx_image_t *dst, vpx_image_t *src, int down_shift) {
|
||||
}
|
||||
}
|
||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||
|
||||
int compare_img(const vpx_image_t *const img1, const vpx_image_t *const img2) {
|
||||
uint32_t l_w = img1->d_w;
|
||||
uint32_t c_w = (img1->d_w + img1->x_chroma_shift) >> img1->x_chroma_shift;
|
||||
const uint32_t c_h =
|
||||
(img1->d_h + img1->y_chroma_shift) >> img1->y_chroma_shift;
|
||||
uint32_t i;
|
||||
int match = 1;
|
||||
|
||||
match &= (img1->fmt == img2->fmt);
|
||||
match &= (img1->d_w == img2->d_w);
|
||||
match &= (img1->d_h == img2->d_h);
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
if (img1->fmt & VPX_IMG_FMT_HIGHBITDEPTH) {
|
||||
l_w *= 2;
|
||||
c_w *= 2;
|
||||
}
|
||||
#endif
|
||||
|
||||
for (i = 0; i < img1->d_h; ++i)
|
||||
match &= (memcmp(img1->planes[VPX_PLANE_Y] + i * img1->stride[VPX_PLANE_Y],
|
||||
img2->planes[VPX_PLANE_Y] + i * img2->stride[VPX_PLANE_Y],
|
||||
l_w) == 0);
|
||||
|
||||
for (i = 0; i < c_h; ++i)
|
||||
match &= (memcmp(img1->planes[VPX_PLANE_U] + i * img1->stride[VPX_PLANE_U],
|
||||
img2->planes[VPX_PLANE_U] + i * img2->stride[VPX_PLANE_U],
|
||||
c_w) == 0);
|
||||
|
||||
for (i = 0; i < c_h; ++i)
|
||||
match &= (memcmp(img1->planes[VPX_PLANE_V] + i * img1->stride[VPX_PLANE_V],
|
||||
img2->planes[VPX_PLANE_V] + i * img2->stride[VPX_PLANE_V],
|
||||
c_w) == 0);
|
||||
|
||||
return match;
|
||||
}
|
||||
|
||||
#define mmin(a, b) ((a) < (b) ? (a) : (b))
|
||||
|
||||
#if CONFIG_VP9_HIGHBITDEPTH
|
||||
void find_mismatch_high(const vpx_image_t *const img1,
|
||||
const vpx_image_t *const img2, int yloc[4], int uloc[4],
|
||||
int vloc[4]) {
|
||||
uint16_t *plane1, *plane2;
|
||||
uint32_t stride1, stride2;
|
||||
const uint32_t bsize = 64;
|
||||
const uint32_t bsizey = bsize >> img1->y_chroma_shift;
|
||||
const uint32_t bsizex = bsize >> img1->x_chroma_shift;
|
||||
const uint32_t c_w =
|
||||
(img1->d_w + img1->x_chroma_shift) >> img1->x_chroma_shift;
|
||||
const uint32_t c_h =
|
||||
(img1->d_h + img1->y_chroma_shift) >> img1->y_chroma_shift;
|
||||
int match = 1;
|
||||
uint32_t i, j;
|
||||
yloc[0] = yloc[1] = yloc[2] = yloc[3] = -1;
|
||||
plane1 = (uint16_t *)img1->planes[VPX_PLANE_Y];
|
||||
plane2 = (uint16_t *)img2->planes[VPX_PLANE_Y];
|
||||
stride1 = img1->stride[VPX_PLANE_Y] / 2;
|
||||
stride2 = img2->stride[VPX_PLANE_Y] / 2;
|
||||
for (i = 0, match = 1; match && i < img1->d_h; i += bsize) {
|
||||
for (j = 0; match && j < img1->d_w; j += bsize) {
|
||||
int k, l;
|
||||
const int si = mmin(i + bsize, img1->d_h) - i;
|
||||
const int sj = mmin(j + bsize, img1->d_w) - j;
|
||||
for (k = 0; match && k < si; ++k) {
|
||||
for (l = 0; match && l < sj; ++l) {
|
||||
if (*(plane1 + (i + k) * stride1 + j + l) !=
|
||||
*(plane2 + (i + k) * stride2 + j + l)) {
|
||||
yloc[0] = i + k;
|
||||
yloc[1] = j + l;
|
||||
yloc[2] = *(plane1 + (i + k) * stride1 + j + l);
|
||||
yloc[3] = *(plane2 + (i + k) * stride2 + j + l);
|
||||
match = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
uloc[0] = uloc[1] = uloc[2] = uloc[3] = -1;
|
||||
plane1 = (uint16_t *)img1->planes[VPX_PLANE_U];
|
||||
plane2 = (uint16_t *)img2->planes[VPX_PLANE_U];
|
||||
stride1 = img1->stride[VPX_PLANE_U] / 2;
|
||||
stride2 = img2->stride[VPX_PLANE_U] / 2;
|
||||
for (i = 0, match = 1; match && i < c_h; i += bsizey) {
|
||||
for (j = 0; match && j < c_w; j += bsizex) {
|
||||
int k, l;
|
||||
const int si = mmin(i + bsizey, c_h - i);
|
||||
const int sj = mmin(j + bsizex, c_w - j);
|
||||
for (k = 0; match && k < si; ++k) {
|
||||
for (l = 0; match && l < sj; ++l) {
|
||||
if (*(plane1 + (i + k) * stride1 + j + l) !=
|
||||
*(plane2 + (i + k) * stride2 + j + l)) {
|
||||
uloc[0] = i + k;
|
||||
uloc[1] = j + l;
|
||||
uloc[2] = *(plane1 + (i + k) * stride1 + j + l);
|
||||
uloc[3] = *(plane2 + (i + k) * stride2 + j + l);
|
||||
match = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
vloc[0] = vloc[1] = vloc[2] = vloc[3] = -1;
|
||||
plane1 = (uint16_t *)img1->planes[VPX_PLANE_V];
|
||||
plane2 = (uint16_t *)img2->planes[VPX_PLANE_V];
|
||||
stride1 = img1->stride[VPX_PLANE_V] / 2;
|
||||
stride2 = img2->stride[VPX_PLANE_V] / 2;
|
||||
for (i = 0, match = 1; match && i < c_h; i += bsizey) {
|
||||
for (j = 0; match && j < c_w; j += bsizex) {
|
||||
int k, l;
|
||||
const int si = mmin(i + bsizey, c_h - i);
|
||||
const int sj = mmin(j + bsizex, c_w - j);
|
||||
for (k = 0; match && k < si; ++k) {
|
||||
for (l = 0; match && l < sj; ++l) {
|
||||
if (*(plane1 + (i + k) * stride1 + j + l) !=
|
||||
*(plane2 + (i + k) * stride2 + j + l)) {
|
||||
vloc[0] = i + k;
|
||||
vloc[1] = j + l;
|
||||
vloc[2] = *(plane1 + (i + k) * stride1 + j + l);
|
||||
vloc[3] = *(plane2 + (i + k) * stride2 + j + l);
|
||||
match = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||
|
||||
void find_mismatch(const vpx_image_t *const img1, const vpx_image_t *const img2,
|
||||
int yloc[4], int uloc[4], int vloc[4]) {
|
||||
const uint32_t bsize = 64;
|
||||
const uint32_t bsizey = bsize >> img1->y_chroma_shift;
|
||||
const uint32_t bsizex = bsize >> img1->x_chroma_shift;
|
||||
const uint32_t c_w =
|
||||
(img1->d_w + img1->x_chroma_shift) >> img1->x_chroma_shift;
|
||||
const uint32_t c_h =
|
||||
(img1->d_h + img1->y_chroma_shift) >> img1->y_chroma_shift;
|
||||
int match = 1;
|
||||
uint32_t i, j;
|
||||
yloc[0] = yloc[1] = yloc[2] = yloc[3] = -1;
|
||||
for (i = 0, match = 1; match && i < img1->d_h; i += bsize) {
|
||||
for (j = 0; match && j < img1->d_w; j += bsize) {
|
||||
int k, l;
|
||||
const int si = mmin(i + bsize, img1->d_h) - i;
|
||||
const int sj = mmin(j + bsize, img1->d_w) - j;
|
||||
for (k = 0; match && k < si; ++k) {
|
||||
for (l = 0; match && l < sj; ++l) {
|
||||
if (*(img1->planes[VPX_PLANE_Y] +
|
||||
(i + k) * img1->stride[VPX_PLANE_Y] + j + l) !=
|
||||
*(img2->planes[VPX_PLANE_Y] +
|
||||
(i + k) * img2->stride[VPX_PLANE_Y] + j + l)) {
|
||||
yloc[0] = i + k;
|
||||
yloc[1] = j + l;
|
||||
yloc[2] = *(img1->planes[VPX_PLANE_Y] +
|
||||
(i + k) * img1->stride[VPX_PLANE_Y] + j + l);
|
||||
yloc[3] = *(img2->planes[VPX_PLANE_Y] +
|
||||
(i + k) * img2->stride[VPX_PLANE_Y] + j + l);
|
||||
match = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
uloc[0] = uloc[1] = uloc[2] = uloc[3] = -1;
|
||||
for (i = 0, match = 1; match && i < c_h; i += bsizey) {
|
||||
for (j = 0; match && j < c_w; j += bsizex) {
|
||||
int k, l;
|
||||
const int si = mmin(i + bsizey, c_h - i);
|
||||
const int sj = mmin(j + bsizex, c_w - j);
|
||||
for (k = 0; match && k < si; ++k) {
|
||||
for (l = 0; match && l < sj; ++l) {
|
||||
if (*(img1->planes[VPX_PLANE_U] +
|
||||
(i + k) * img1->stride[VPX_PLANE_U] + j + l) !=
|
||||
*(img2->planes[VPX_PLANE_U] +
|
||||
(i + k) * img2->stride[VPX_PLANE_U] + j + l)) {
|
||||
uloc[0] = i + k;
|
||||
uloc[1] = j + l;
|
||||
uloc[2] = *(img1->planes[VPX_PLANE_U] +
|
||||
(i + k) * img1->stride[VPX_PLANE_U] + j + l);
|
||||
uloc[3] = *(img2->planes[VPX_PLANE_U] +
|
||||
(i + k) * img2->stride[VPX_PLANE_U] + j + l);
|
||||
match = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
vloc[0] = vloc[1] = vloc[2] = vloc[3] = -1;
|
||||
for (i = 0, match = 1; match && i < c_h; i += bsizey) {
|
||||
for (j = 0; match && j < c_w; j += bsizex) {
|
||||
int k, l;
|
||||
const int si = mmin(i + bsizey, c_h - i);
|
||||
const int sj = mmin(j + bsizex, c_w - j);
|
||||
for (k = 0; match && k < si; ++k) {
|
||||
for (l = 0; match && l < sj; ++l) {
|
||||
if (*(img1->planes[VPX_PLANE_V] +
|
||||
(i + k) * img1->stride[VPX_PLANE_V] + j + l) !=
|
||||
*(img2->planes[VPX_PLANE_V] +
|
||||
(i + k) * img2->stride[VPX_PLANE_V] + j + l)) {
|
||||
vloc[0] = i + k;
|
||||
vloc[1] = j + l;
|
||||
vloc[2] = *(img1->planes[VPX_PLANE_V] +
|
||||
(i + k) * img1->stride[VPX_PLANE_V] + j + l);
|
||||
vloc[3] = *(img2->planes[VPX_PLANE_V] +
|
||||
(i + k) * img2->stride[VPX_PLANE_V] + j + l);
|
||||
match = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user