summaryrefslogtreecommitdiff
path: root/vpxenc.c
diff options
context:
space:
mode:
authorDeb Mukherjee <debargha@google.com>2014-06-12 16:53:13 -0700
committerDeb Mukherjee <debargha@google.com>2014-07-02 05:41:14 -0700
commit82dc1332af4b16d3e4ad3c4358498820637b7add (patch)
tree49f81b9420990a0d92067faa33a8b97bafef780d /vpxenc.c
parent08cb2b02110aa278bd984cd5db31c6e567d69d91 (diff)
downloadlibvpx-82dc1332af4b16d3e4ad3c4358498820637b7add.tar
libvpx-82dc1332af4b16d3e4ad3c4358498820637b7add.tar.gz
libvpx-82dc1332af4b16d3e4ad3c4358498820637b7add.tar.bz2
libvpx-82dc1332af4b16d3e4ad3c4358498820637b7add.zip
Adds support for reading and writing 10/12-bit y4m
The y4m extension used is the same as the one used in ffmpeg/x264. The patch is adapted from the highbitdepth branch. Also adds unit tests for y4m header parsing and md5 check of the raw frame data, as well as y4m writing. Change-Id: Ie2794daf6dbafd2f128464f9b9da520fc54c0dd6
Diffstat (limited to 'vpxenc.c')
-rw-r--r--vpxenc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/vpxenc.c b/vpxenc.c
index d46a83eb0..fce68075d 100644
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -756,6 +756,7 @@ void open_input_file(struct VpxInputContext *input) {
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)) {
@@ -1533,6 +1534,7 @@ int main(int argc, const char **argv_) {
input.framerate.numerator = 30;
input.framerate.denominator = 1;
input.only_i420 = 1;
+ input.bit_depth = 0;
/* First parse the global configuration values, because we want to apply
* other parameters on top of the default configuration provided by the