diff options
Diffstat (limited to 'lib/frame.h')
| -rw-r--r-- | lib/frame.h | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/lib/frame.h b/lib/frame.h index ecfa308..8c8fe34 100644 --- a/lib/frame.h +++ b/lib/frame.h @@ -28,40 +28,28 @@ #ifndef __FRAME_H__ #define __FRAME_H__ +#include "format.h" + //#define START_USE_FRAME(x) x->usage++ //#define STOP_USE_FRAME(x) if(--x->usage == 0) delete x; x = NULL // Definition of vector #include <vector> -// VIDEO FORMATS -#define VF_NONE 0x00 -#define VF_DV 0x01 -#define VF_YUV422 0x02 -#define VF_YV12 0x03 -#define VF_RGB 0x04 -#define VF_BRG0 0x05 - -// AUDIO FORMATS -#define AF_NONE 0x00 // Dummy -#define AF_DV 0x01 // Audio data is in the DV video frame -#define AF_PCM_48KHZ_16BIT 0x02 // Raw pcm data in 48khz and 16bit -#define AF_MP3 0x03 // Lame encoded audio - class Frame { public: - Frame(char *aframe, int aframesize, int aformat, - char *vframe, int vframesize, int vformat); + Frame(char *vframe, int vframesize, video_format_t vformat, + char *aframe = NULL, int aframesize = 0, audio_format_t aformat = AF_NONE); // Video char* vframe; int vframesize; - int vformat; + video_format_t vformat; // Audio char *aframe; int aframesize; - int aformat; + audio_format_t aformat; /** * Old frame code... to be removed shortly |