Update of /cvsroot/freevo/freevo/WIP/RobShortt
In directory sc8-pr-cvs1:/tmp/cvs-serv4686
Modified Files:
ivtv.h
Log Message:
Developing against an updated ivtv.h.
Index: ivtv.h
===================================================================
RCS file: /cvsroot/freevo/freevo/WIP/RobShortt/ivtv.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ivtv.h 30 May 2003 18:51:19 -0000 1.1
--- ivtv.h 7 Jul 2003 01:57:25 -0000 1.2
***************
*** 49,53 ****
#define IVTV_DRIVER_NAME "ivtv"
#define IVTV_DRIVER_VERSION KERNEL_VERSION(0,0,1)
! #define IVTV_MAX_CARDS 2
#define IVTV_PCI_ID_250_V1 0x4001 /* subsystem id */
#define IVTV_PCI_ID_250_V2 0x4009
--- 49,53 ----
#define IVTV_DRIVER_NAME "ivtv"
#define IVTV_DRIVER_VERSION KERNEL_VERSION(0,0,1)
! #define IVTV_MAX_CARDS 3
#define IVTV_PCI_ID_250_V1 0x4001 /* subsystem id */
#define IVTV_PCI_ID_250_V2 0x4009
***************
*** 222,226 ****
/* Temp saa7115 hack FIXME */
! #define DECODER_SET_SIZE 76598
/* External API stuff */
--- 222,227 ----
/* Temp saa7115 hack FIXME */
! #define DECODER_SET_SIZE 76598
! #define DECODER_GET_PICTURE 76599
/* External API stuff */
***************
*** 230,233 ****
--- 231,239 ----
#define IVTV_IOC_S_CODEC 0xFFEE7704
+ #define DECODER_SET_AUDIO 0xFFEE7707
+ #define DECODER_AUDIO_32_KHZ 0
+ #define DECODER_AUDIO_441_KHZ 1
+ #define DECODER_AUDIO_48_KHZ 2
+
/* Stream types */
#define IVTV_STREAM_PS 0
***************
*** 239,242 ****
--- 245,261 ----
#define IVTV_STREAM_DVD 10
+ /* Custom v4l controls */
+ #define V4L2_CID_IVTV_FREQ (V4L2_CID_PRIVATE_BASE)
+ #define V4L2_CID_IVTV_ENC (V4L2_CID_PRIVATE_BASE + 1)
+ #define V4L2_CID_IVTV_BITRATE (V4L2_CID_PRIVATE_BASE + 2)
+ #define V4L2_CID_IVTV_MONO (V4L2_CID_PRIVATE_BASE + 3)
+ #define V4L2_CID_IVTV_JOINT (V4L2_CID_PRIVATE_BASE + 4)
+ #define V4L2_CID_IVTV_EMPHASIS (V4L2_CID_PRIVATE_BASE + 5)
+ #define V4L2_CID_IVTV_CRC (V4L2_CID_PRIVATE_BASE + 6)
+ #define V4L2_CID_IVTV_COPYRIGHT (V4L2_CID_PRIVATE_BASE + 7)
+ #define V4L2_CID_IVTV_GEN (V4L2_CID_PRIVATE_BASE + 8)
+
+ #define IVTV_V4L2_AUDIO_MENUCOUNT 9 /* # of v4l controls */
+
#ifdef SAA7115_REGTEST
/* allow direct access to the saa7115 registers for testing */
***************
*** 249,252 ****
--- 268,282 ----
};
#endif
+ struct saa7114 {
+ int norm;
+ int input;
+ int enable;
+ int bright;
+ int contrast;
+ int hue;
+ int sat;
+ int playback;
+ };
+
struct ivtv_ioctl_fwapi {
***************
*** 257,265 ****
};
/* For use with IVTV_IOC_G_CODEC and IVTV_IOC_S_CODEC */
struct ivtv_ioctl_codec {
u32 aspect;
! u32 audio;
u32 bframes;
u32 bitrate;
u32 bitrate_peak;
--- 287,304 ----
};
+ struct ivtv_audio_meta {
+ struct v4l2_queryctrl *ctrl;
+ struct v4l2_querymenu *menu;
+ u32 *table;
+ u32 mask;
+ s32 setting;
+ };
+
/* For use with IVTV_IOC_G_CODEC and IVTV_IOC_S_CODEC */
struct ivtv_ioctl_codec {
u32 aspect;
! u32 audio_bitmask;
u32 bframes;
+ u32 bitrate_mode;
u32 bitrate;
u32 bitrate_peak;
***************
*** 328,331 ****
--- 367,371 ----
int yuv_buffers; /* How many yuv buffers to allocate? */
int mpg_buffers; /* how many mpg buffers to allocate? */
+ int vbi_buffers; /* how many vbi buffers to allocate? */
int num_devices; /* how many cards to detect? */
};
***************
*** 383,386 ****
--- 423,428 ----
/* codec settings */
struct ivtv_ioctl_codec codec;
+ struct ivtv_audio_meta audio_meta[IVTV_V4L2_AUDIO_MENUCOUNT];
+
/* FIXME probably should get rid of this */
wait_queue_head_t waitq;
***************
*** 415,418 ****
--- 457,462 ----
u32 enc_fw_ver, dec_fw_ver, base_addr; /*is base_addr needed? */
+ u32 irqmask;
+
struct ivtv_mailbox *enc_mbox, *dec_mbox;
unsigned char card_rev, *io_mem;
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
