diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2014-07-02 22:23:38 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-07-02 22:23:38 -0700 |
commit | 79199e465af4c61ffb2d0bf6844cf0b0fe422eb8 (patch) | |
tree | 9332a87c44c70da7aaddaa6977cb46677853fc69 /y4menc.c | |
parent | 82dc1332af4b16d3e4ad3c4358498820637b7add (diff) | |
download | libvpx-79199e465af4c61ffb2d0bf6844cf0b0fe422eb8.tar libvpx-79199e465af4c61ffb2d0bf6844cf0b0fe422eb8.tar.gz libvpx-79199e465af4c61ffb2d0bf6844cf0b0fe422eb8.tar.bz2 libvpx-79199e465af4c61ffb2d0bf6844cf0b0fe422eb8.zip |
Reverting "Adds support for reading and writing 10/12-bit y4m" for now because of Mac Build Failure.
This reverts commit 82dc1332af4b16d3e4ad3c4358498820637b7add
Change-Id: I824bf42bf47c7df6985c79e451d6af913030d374
Diffstat (limited to 'y4menc.c')
-rw-r--r-- | y4menc.c | 44 |
1 files changed, 6 insertions, 38 deletions
@@ -8,48 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <assert.h> #include "./y4menc.h" int y4m_write_file_header(char *buf, size_t len, int width, int height, const struct VpxRational *framerate, - vpx_img_fmt_t fmt, unsigned int bit_depth) { - const char *color; - switch (bit_depth) { - case 8: - color = fmt == VPX_IMG_FMT_444A ? "C444alpha\n" : - fmt == VPX_IMG_FMT_I444 ? "C444\n" : - fmt == VPX_IMG_FMT_I422 ? "C422\n" : - "C420jpeg\n"; - break; - case 9: - color = fmt == VPX_IMG_FMT_I44416 ? "C444p9 XYSCSS=444P9\n" : - fmt == VPX_IMG_FMT_I42216 ? "C422p9 XYSCSS=422P9\n" : - "C420p9 XYSCSS=420P9\n"; - break; - case 10: - color = fmt == VPX_IMG_FMT_I44416 ? "C444p10 XYSCSS=444P10\n" : - fmt == VPX_IMG_FMT_I42216 ? "C422p10 XYSCSS=422P10\n" : - "C420p10 XYSCSS=420P10\n"; - break; - case 12: - color = fmt == VPX_IMG_FMT_I44416 ? "C444p12 XYSCSS=444P12\n" : - fmt == VPX_IMG_FMT_I42216 ? "C422p12 XYSCSS=422P12\n" : - "C420p12 XYSCSS=420P12\n"; - break; - case 14: - color = fmt == VPX_IMG_FMT_I44416 ? "C444p14 XYSCSS=444P14\n" : - fmt == VPX_IMG_FMT_I42216 ? "C422p14 XYSCSS=422P14\n" : - "C420p14 XYSCSS=420P14\n"; - break; - case 16: - color = fmt == VPX_IMG_FMT_I44416 ? "C444p16 XYSCSS=444P16\n" : - fmt == VPX_IMG_FMT_I42216 ? "C422p16 XYSCSS=422P16\n" : - "C420p16 XYSCSS=420P16\n"; - break; - default: - assert(0); - } + vpx_img_fmt_t fmt) { + const char *const color = fmt == VPX_IMG_FMT_444A ? "C444alpha\n" : + fmt == VPX_IMG_FMT_I444 ? "C444\n" : + fmt == VPX_IMG_FMT_I422 ? "C422\n" : + "C420jpeg\n"; + return snprintf(buf, len, "YUV4MPEG2 W%u H%u F%u:%u I%c %s", width, height, framerate->numerator, framerate->denominator, 'p', color); } |