diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-25 10:09:33 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-25 10:09:33 -0200 |
commit | dc6e8817d776cdb670fd1db1cb48f2ee25c91717 (patch) | |
tree | 677d3c5ec66470c67ef759f05bc10651b19be25e /linux/Documentation | |
parent | 72fadf90dd75161b532265142351354510a62e3c (diff) | |
parent | 29dc3ffaee320cff68d0ef8a2d9e2e0f112df29d (diff) | |
download | mediapointer-dvb-s2-dc6e8817d776cdb670fd1db1cb48f2ee25c91717.tar.gz mediapointer-dvb-s2-dc6e8817d776cdb670fd1db1cb48f2ee25c91717.tar.bz2 |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
There's something weird with mercurial... sometimes, hg merge doesn't
work. Instead, I need to do:
hg update
hg merge -r <the other head>
hg commit
This way, the diff patch will show what happened with the first head,
instead of the merging changes added by the newer one :(
Anyway, since each individual patch can be seem at the history, it will
work.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/Documentation')
-rw-r--r-- | linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt index 242104ce5..5dd3109a8 100644 --- a/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt +++ b/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt @@ -663,12 +663,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 +683,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 +697,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 |