Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=59fc7f52898fb35eb053bc7b54430d81629b5966
Commit:     59fc7f52898fb35eb053bc7b54430d81629b5966
Parent:     31a7c549eda6bf0a38d8fc12c903a8535a9f27ca
Author:     Ian Armstrong <[EMAIL PROTECTED]>
AuthorDate: Fri Mar 16 07:40:48 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Apr 27 15:44:47 2007 -0300

    V4L/DVB (5437): Update cx23415 documentation
    
    Adds more osd mode switching information.
    Corrects some information regarding mode selection & local alpha operation 
for
    16 bit modes.
    
    Signed-off-by: Ian Armstrong <[EMAIL PROTECTED]>
    Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 .../video4linux/cx2341x/fw-decoder-regs.txt        |   12 +++++++-----
 Documentation/video4linux/cx2341x/fw-osd-api.txt   |   12 ++++++++++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Documentation/video4linux/cx2341x/fw-decoder-regs.txt 
b/Documentation/video4linux/cx2341x/fw-decoder-regs.txt
index db2366c..cf52c8f 100644
--- a/Documentation/video4linux/cx2341x/fw-decoder-regs.txt
+++ b/Documentation/video4linux/cx2341x/fw-decoder-regs.txt
@@ -624,11 +624,11 @@ out what values are bad when it hangs.
 2A00
       bits 0:2
        osd colour mode
+         000 = 8 bit indexed
          001 = 16 bit (565)
          010 = 15 bit (555)
          011 = 12 bit (444)
          100 = 32 bit (8888)
-         101 = 8 bit indexed
 
       bits 4:5
        osd display bpp
@@ -676,9 +676,11 @@ out what values are bad when it hangs.
      completely transparent. When using 565, 555 or 444 colour modes, the
      colour key is always 16 bits wide. The colour to key on is set in Reg 
2A18.
 
-     Local alpha is a per-pixel 256 step transparency, with 0 being transparent
-     and 255 being solid. This is only available in 32 bit & 8 bit indexed
-     colour modes.
+     Local alpha works differently depending on the colour mode. For 32bpp & 8
+     bit indexed, local alpha is a per-pixel 256 step transparency, with 0 
being
+     transparent and 255 being solid. For the 16bpp modes 555 & 444, the unused
+     bit(s) act as a simple transparency switch, with 0 being solid & 1 being
+     fully transparent. There is no local alpha support for 16bit 565.
 
      Global alpha is a 256 step transparency that applies to the entire osd,
      with 0 being transparent & 255 being solid.
@@ -811,5 +813,5 @@ out what values are bad when it hangs.
 
 
--------------------------------------------------------------------------------
 
-v0.3 - 2 February 2007 - Ian Armstrong ([EMAIL PROTECTED])
+v0.4 - 12 March 2007 - Ian Armstrong ([EMAIL PROTECTED])
 
diff --git a/Documentation/video4linux/cx2341x/fw-osd-api.txt 
b/Documentation/video4linux/cx2341x/fw-osd-api.txt
index 0a602f3..89c4601 100644
--- a/Documentation/video4linux/cx2341x/fw-osd-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-osd-api.txt
@@ -21,7 +21,11 @@ Enum         66/0x42
 Description
        Query OSD format
 Result[0]
-       0=8bit index, 4=AlphaRGB 8:8:8:8
+       0=8bit index
+       1=16bit RGB 5:6:5
+       2=16bit ARGB 1:5:5:5
+       3=16bit ARGB 1:4:4:4
+       4=32bit ARGB 8:8:8:8
 
 -------------------------------------------------------------------------------
 
@@ -30,7 +34,11 @@ Enum         67/0x43
 Description
        Assign pixel format
 Param[0]
-       0=8bit index, 4=AlphaRGB 8:8:8:8
+       0=8bit index
+       1=16bit RGB 5:6:5
+       2=16bit ARGB 1:5:5:5
+       3=16bit ARGB 1:4:4:4
+       4=32bit ARGB 8:8:8:8
 
 -------------------------------------------------------------------------------
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to