Merge "mips msa optimize vpx_scaled_2d function"

[libvpx] / vpxenc.h

diff --git a/vpxenc.h b/vpxenc.h
index 5cb3f853ac4925be30d38399ab17700472ea75a1..d867e9d9548a5a0bc915e6790da28d9f96d15b33 100644 (file)
--- a/vpxenc.h
+++ b/vpxenc.h
@@ -12,20 +12,34 @@
 
 #include "vpx/vpx_encoder.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum TestDecodeFatality {
   TEST_DECODE_OFF,
   TEST_DECODE_FATAL,
   TEST_DECODE_WARN,
 };
 
+typedef enum {
+  I420,  // 4:2:0 8+ bit-depth
+  I422,  // 4:2:2 8+ bit-depth
+  I444,  // 4:4:4 8+ bit-depth
+  I440,  // 4:4:0 8+ bit-depth
+  YV12,  // 4:2:0 with uv flipped, only 8-bit depth
+} ColorInputType;
+
+struct VpxInterface;
+
 /* Configuration elements common to all streams. */
 struct VpxEncoderConfig {
-  const struct codec_item *codec;
+  const struct VpxInterface *codec;
   int passes;
   int pass;
   int usage;
   int deadline;
-  int use_i420;
+  ColorInputType color_type;
   int quiet;
   int verbose;
   int limit;
@@ -40,6 +54,11 @@ struct VpxEncoderConfig {
   int show_rate_hist_buckets;
   int disable_warnings;
   int disable_warning_prompt;
+  int experimental_bitstream;
 };
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
 #endif  // VPXENC_H_