diff options
| -rw-r--r-- | linux/Documentation/video4linux/cx2341x/fw-decoder-api.txt | 2 | ||||
| -rw-r--r-- | linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt | 14 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx2341x.h | 12 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
4 files changed, 23 insertions, 14 deletions
diff --git a/linux/Documentation/video4linux/cx2341x/fw-decoder-api.txt b/linux/Documentation/video4linux/cx2341x/fw-decoder-api.txt index 34b5c3c7d..59193b6b5 100644 --- a/linux/Documentation/video4linux/cx2341x/fw-decoder-api.txt +++ b/linux/Documentation/video4linux/cx2341x/fw-decoder-api.txt @@ -89,7 +89,7 @@ Param[0] ------------------------------------------------------------------------------- -Name CX2341X_DEC_SET_DMA_BLOCKSIZE +Name CX2341X_DEC_SET_DMA_BLOCK_SIZE Enum 8/0x08 Description Set DMA transfer block size. Counterpart to API 0xC9 diff --git a/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt index cac7c2f7b..20e00e81f 100644 --- a/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt +++ b/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt @@ -10,7 +10,7 @@ Description ------------------------------------------------------------------------------- -Name CX2341X_ENC_BEGIN_CAPTURE +Name CX2341X_ENC_START_CAPTURE Enum 129/0x81 Description Commences the capture of video, audio and/or VBI data. All encoding @@ -35,7 +35,7 @@ Param[1] ------------------------------------------------------------------------------- -Name CX2341X_ENC_END_CAPTURE +Name CX2341X_ENC_STOP_CAPTURE Enum 130/0x82 Description Ends a capture in progress @@ -76,7 +76,7 @@ Param[0] ------------------------------------------------------------------------------- -Name CX2341X_ENC_SET_FRAMERATE +Name CX2341X_ENC_SET_FRAME_RATE Enum 143/0x8F Description Set video frames per second. Change occurs at start of new GOP. @@ -97,7 +97,7 @@ Param[1] ------------------------------------------------------------------------------- -Name CX2341X_ENC_SET_BITRATES +Name CX2341X_ENC_SET_BIT_RATE Enum 149/0x95 Description Assign average video stream bitrate. @@ -329,11 +329,11 @@ Param[0] '0' off '1' on - 15 Copyright: + 15 Copyright: '0' off '1' on - 16 Generation: + 16 Generation: '0' copy '1' original @@ -437,7 +437,7 @@ Result[2] ------------------------------------------------------------------------------- -Name CX2341X_ENC_SET_DMA_BLOCKLEN +Name CX2341X_ENC_SET_DMA_BLOCK_SIZE Enum 201/0xC9 Description Set DMA transfer block size diff --git a/linux/drivers/media/video/cx2341x.h b/linux/drivers/media/video/cx2341x.h index a6cffa1ed..7e7dcc072 100644 --- a/linux/drivers/media/video/cx2341x.h +++ b/linux/drivers/media/video/cx2341x.h @@ -32,7 +32,7 @@ #define CX2341X_DEC_STOP_PLAYBACK 0x02 #define CX2341X_DEC_SET_PLAYBACK_SPEED 0x03 #define CX2341X_DEC_STEP_VIDEO 0x05 -#define CX2341X_DEC_SET_DMA_BLOCKSIZE 0x08 +#define CX2341X_DEC_SET_DMA_BLOCK_SIZE 0x08 #define CX2341X_DEC_GET_XFER_INFO 0x09 #define CX2341X_DEC_GET_DMA_STATUS 0x0a #define CX2341X_DEC_SCHED_DMA_FROM_HOST 0x0b @@ -53,14 +53,14 @@ /* MPEG encoder API */ #define CX2341X_ENC_PING_FW 0x80 -#define CX2341X_ENC_BEGIN_CAPTURE 0x81 -#define CX2341X_ENC_END_CAPTURE 0x82 +#define CX2341X_ENC_START_CAPTURE 0x81 +#define CX2341X_ENC_STOP_CAPTURE 0x82 #define CX2341X_ENC_SET_AUDIO_ID 0x89 #define CX2341X_ENC_SET_VIDEO_ID 0x8b #define CX2341X_ENC_SET_PCR_ID 0x8d -#define CX2341X_ENC_SET_FRAMERATE 0x8f +#define CX2341X_ENC_SET_FRAME_RATE 0x8f #define CX2341X_ENC_SET_FRAME_SIZE 0x91 -#define CX2341X_ENC_SET_BITRATES 0x95 +#define CX2341X_ENC_SET_BIT_RATE 0x95 #define CX2341X_ENC_SET_GOP_PROPERTIES 0x97 #define CX2341X_ENC_SET_ASPECT_RATIO 0x99 #define CX2341X_ENC_SET_DNR_FILTER_MODE 0x9b @@ -78,7 +78,7 @@ #define CX2341X_ENC_GET_SEQ_END 0xc6 #define CX2341X_ENC_SET_PGM_INDEX_INFO 0xc7 #define CX2341X_ENC_SET_VBI_CONFIG 0xc8 -#define CX2341X_ENC_SET_DMA_BLOCKLEN 0xc9 +#define CX2341X_ENC_SET_DMA_BLOCK_SIZE 0xc9 #define CX2341X_ENC_GET_PREV_DMA_INFO_MB_10 0xca #define CX2341X_ENC_GET_PREV_DMA_INFO_MB_9 0xcb #define CX2341X_ENC_SCHED_DMA_TO_HOST 0xcc diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 09a40c0fb..e9c3cae2a 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2006-01-01 13:53 hverkuil + + * linux/Documentation/video4linux/cx2341x/fw-decoder-api.txt: + * linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt: + * linux/drivers/media/video/cx2341x.h: + - Improve consistency between similar decoder and encoder API names. + + Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> + 2006-01-01 13:18 hverkuil * linux/Documentation/video4linux/cx2341x/fw-decoder-api.txt: |