Update libaom to commit ID 1e227d41f0616de9548a673a83a21ef990b62591

This commit is contained in:
trav90 2018-10-19 23:05:00 -05:00 • committed by Roy Tam
commit 368651059a
526 changed files with 34535 additions and 15900 deletions

View file

@ -11,56 +11,93 @@
#include <assert.h>
#include "common/rawenc.h"
#include "common/y4menc.h"
int y4m_write_file_header(char *buf, size_t len, int width, int height,
const struct AvxRational *framerate,
aom_img_fmt_t fmt, unsigned int bit_depth) {
const char *color;
// Returns the Y4M name associated with the monochrome colorspace.
const char *monochrome_colorspace(unsigned int bit_depth) {
switch (bit_depth) {
case 8:
color = fmt == AOM_IMG_FMT_444A
? "C444alpha\n"
: fmt == AOM_IMG_FMT_I444
? "C444\n"
: fmt == AOM_IMG_FMT_I422 ? "C422\n" : "C420jpeg\n";
break;
case 9:
color = fmt == AOM_IMG_FMT_I44416
? "C444p9 XYSCSS=444P9\n"
: fmt == AOM_IMG_FMT_I42216 ? "C422p9 XYSCSS=422P9\n"
: "C420p9 XYSCSS=420P9\n";
break;
case 10:
color = fmt == AOM_IMG_FMT_I44416
? "C444p10 XYSCSS=444P10\n"
: fmt == AOM_IMG_FMT_I42216 ? "C422p10 XYSCSS=422P10\n"
: "C420p10 XYSCSS=420P10\n";
break;
case 12:
color = fmt == AOM_IMG_FMT_I44416
? "C444p12 XYSCSS=444P12\n"
: fmt == AOM_IMG_FMT_I42216 ? "C422p12 XYSCSS=422P12\n"
: "C420p12 XYSCSS=420P12\n";
break;
case 14:
color = fmt == AOM_IMG_FMT_I44416
? "C444p14 XYSCSS=444P14\n"
: fmt == AOM_IMG_FMT_I42216 ? "C422p14 XYSCSS=422P14\n"
: "C420p14 XYSCSS=420P14\n";
break;
case 16:
color = fmt == AOM_IMG_FMT_I44416
? "C444p16 XYSCSS=444P16\n"
: fmt == AOM_IMG_FMT_I42216 ? "C422p16 XYSCSS=422P16\n"
: "C420p16 XYSCSS=420P16\n";
break;
default: color = NULL; assert(0);
case 8: return "Cmono";
case 9: return "Cmono9";
case 10: return "Cmono10";
case 12: return "Cmono12";
case 16: return "Cmono16";
default: assert(0); return NULL;
}
return snprintf(buf, len, "YUV4MPEG2 W%u H%u F%u:%u I%c %s", width, height,
}
// Return the Y4M name of the 8-bit colorspace, given the chroma position and
// image format.
const char *colorspace8(aom_chroma_sample_position_t csp, aom_img_fmt_t fmt) {
switch (fmt) {
case AOM_IMG_FMT_444A: return "C444alpha";
case AOM_IMG_FMT_I444: return "C444";
case AOM_IMG_FMT_I422: return "C422";
default:
if (csp == AOM_CSP_VERTICAL) {
return "C420mpeg2 XYSCSS=420MPEG2";
} else {
return "C420jpeg";
}
}
}
// Return the Y4M name of the colorspace, given the bit depth and image format.
const char *colorspace(unsigned int bit_depth, aom_chroma_sample_position_t csp,
aom_img_fmt_t fmt) {
switch (bit_depth) {
case 8: return colorspace8(csp, fmt);
case 9:
return fmt == AOM_IMG_FMT_I44416
? "C444p9 XYSCSS=444P9"
: fmt == AOM_IMG_FMT_I42216 ? "C422p9 XYSCSS=422P9"
: "C420p9 XYSCSS=420P9";
case 10:
return fmt == AOM_IMG_FMT_I44416
? "C444p10 XYSCSS=444P10"
: fmt == AOM_IMG_FMT_I42216 ? "C422p10 XYSCSS=422P10"
: "C420p10 XYSCSS=420P10";
case 12:
return fmt == AOM_IMG_FMT_I44416
? "C444p12 XYSCSS=444P12"
: fmt == AOM_IMG_FMT_I42216 ? "C422p12 XYSCSS=422P12"
: "C420p12 XYSCSS=420P12";
case 14:
return fmt == AOM_IMG_FMT_I44416
? "C444p14 XYSCSS=444P14"
: fmt == AOM_IMG_FMT_I42216 ? "C422p14 XYSCSS=422P14"
: "C420p14 XYSCSS=420P14";
case 16:
return fmt == AOM_IMG_FMT_I44416
? "C444p16 XYSCSS=444P16"
: fmt == AOM_IMG_FMT_I42216 ? "C422p16 XYSCSS=422P16"
: "C420p16 XYSCSS=420P16";
default: assert(0); return NULL;
}
}
int y4m_write_file_header(char *buf, size_t len, int width, int height,
const struct AvxRational *framerate, int monochrome,
aom_chroma_sample_position_t csp, aom_img_fmt_t fmt,
unsigned int bit_depth) {
const char *color = monochrome ? monochrome_colorspace(bit_depth)
: colorspace(bit_depth, csp, fmt);
return snprintf(buf, len, "YUV4MPEG2 W%u H%u F%u:%u I%c %s\n", width, height,
framerate->numerator, framerate->denominator, 'p', color);
}
int y4m_write_frame_header(char *buf, size_t len) {
return snprintf(buf, len, "FRAME\n");
}
void y4m_write_image_file(const aom_image_t *img, const int *planes,
FILE *file) {
int num_planes = img->monochrome ? 1 : 3;
raw_write_image_file(img, planes, num_planes, file);
}
void y4m_update_image_md5(const aom_image_t *img, const int *planes,
MD5Context *md5) {
int num_planes = img->monochrome ? 1 : 3;
raw_update_image_md5(img, planes, num_planes, md5);
}