Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

[linux-2.6-omap-h63xx.git] / Documentation / video4linux / cx2341x / fw-encoder-api.txt

diff --git a/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
index 242104ce5b61b09a82e20c24bbf44339f722d6ac..5a27af2ee1c66ee74d2032e998168ee209e19ae2 100644 (file)
--- a/Documentation/video4linux/cx2341x/fw-encoder-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
@@ -407,8 +407,10 @@ Description
                u32 length;             // Length of this frame
                u32 offset_low;         // Offset in the file of the
                u32 offset_high;        // start of this frame
-               u32 mask1;              // Bits 0-1 are the type mask:
+               u32 mask1;              // Bits 0-2 are the type mask:
                                        // 1=I, 2=P, 4=B
+                                       // 0=End of Program Index, other fields
+                                       //   are invalid.
                u32 pts;                // The PTS of the frame
                u32 mask2;              // Bit 0 is bit 32 of the pts.
        };
@@ -663,12 +665,13 @@ Param[0]
 
 -------------------------------------------------------------------------------
 
-Name   CX2341X_ENC_UNKNOWN
+Name   CX2341X_ENC_SET_VERT_CROP_LINE
 Enum   219/0xDB
 Description
-       Unknown API, it's used by Hauppauge though.
+       Something to do with 'Vertical Crop Line'
 Param[0]
-       0 This is the value Hauppauge uses, Unknown what it means.
+       If saa7114 and raw VBI capture and 60 Hz, then set to 10001.
+       Else 0.
 
 -------------------------------------------------------------------------------
 
@@ -682,11 +685,9 @@ Param[0]
        Command number:
         1=set initial SCR value when starting encoding (works).
         2=set quality mode (apparently some test setting).
-        3=setup advanced VIM protection handling (supposedly only for the cx23416
-          for raw YUV).
-          Actually it looks like this should be 0 for saa7114/5 based card and 1
-          for cx25840 based cards.
-        4=generate artificial PTS timestamps
+        3=setup advanced VIM protection handling.
+          Always 1 for the cx23416 and 0 for cx23415.
+        4=generate DVD compatible PTS timestamps
         5=USB flush mode
         6=something to do with the quantization matrix
         7=set navigation pack insertion for DVD: adds 0xbf (private stream 2)
@@ -698,7 +699,9 @@ Param[0]
         9=set history parameters of the video input module
        10=set input field order of VIM
        11=set quantization matrix
-       12=reset audio interface
+       12=reset audio interface after channel change or input switch (has no argument).
+          Needed for the cx2584x, not needed for the mspx4xx, but it doesn't seem to
+          do any harm calling it regardless.
        13=set audio volume delay
        14=set audio delay