Merge changes Ib73136b2,Ie514f663

[libvpx] / y4minput.h

diff --git a/y4minput.h b/y4minput.h
index 2fa3767c9c746f3091473620004137b2fb65fba4..a4a8b18dc53d8d522fc950b9e4901656bbb6b38a 100644 (file)
--- a/y4minput.h
+++ b/y4minput.h
@@ -10,51 +10,59 @@
  *  Based on code from the OggTheora software codec source code,
  *  Copyright (C) 2002-2010 The Xiph.Org Foundation and contributors.
  */
-#if !defined(_y4minput_H)
-# define _y4minput_H (1)
-# include <stdio.h>
-# include "vpx/vpx_image.h"
 
+#ifndef VPX_Y4MINPUT_H_
+#define VPX_Y4MINPUT_H_
 
+#include <stdio.h>
+#include "vpx/vpx_image.h"
 
-typedef struct y4m_input y4m_input;
-
+#ifdef __cplusplus
+extern "C" {
+#endif
 
+typedef struct y4m_input y4m_input;
 
 /*The function used to perform chroma conversion.*/
-typedef void (*y4m_convert_func)(y4m_input *_y4m,
-                                 unsigned char *_dst, unsigned char *_src);
-
-
+typedef void (*y4m_convert_func)(y4m_input *_y4m, unsigned char *_dst,
+                                 unsigned char *_src);
 
 struct y4m_input {
-  int               pic_w;
-  int               pic_h;
-  int               fps_n;
-  int               fps_d;
-  int               par_n;
-  int               par_d;
-  char              interlace;
-  int               src_c_dec_h;
-  int               src_c_dec_v;
-  int               dst_c_dec_h;
-  int               dst_c_dec_v;
-  char              chroma_type[16];
+  int pic_w;
+  int pic_h;
+  int fps_n;
+  int fps_d;
+  int par_n;
+  int par_d;
+  char interlace;
+  int src_c_dec_h;
+  int src_c_dec_v;
+  int dst_c_dec_h;
+  int dst_c_dec_v;
+  char chroma_type[16];
   /*The size of each converted frame buffer.*/
-  size_t            dst_buf_sz;
+  size_t dst_buf_sz;
   /*The amount to read directly into the converted frame buffer.*/
-  size_t            dst_buf_read_sz;
+  size_t dst_buf_read_sz;
   /*The size of the auxilliary buffer.*/
-  size_t            aux_buf_sz;
+  size_t aux_buf_sz;
   /*The amount to read into the auxilliary buffer.*/
-  size_t            aux_buf_read_sz;
-  y4m_convert_func  convert;
-  unsigned char    *dst_buf;
-  unsigned char    *aux_buf;
+  size_t aux_buf_read_sz;
+  y4m_convert_func convert;
+  unsigned char *dst_buf;
+  unsigned char *aux_buf;
+  enum vpx_img_fmt vpx_fmt;
+  int bps;
+  unsigned int bit_depth;
 };
 
-int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip);
+int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
+                   int only_420);
 void y4m_input_close(y4m_input *_y4m);
 int y4m_input_fetch_frame(y4m_input *_y4m, FILE *_fin, vpx_image_t *img);
 
+#ifdef __cplusplus
+}  // extern "C"
 #endif
+
+#endif  // VPX_Y4MINPUT_H_