|
@@ -38,28 +38,28 @@
|
|
|
#define DMA_ALIGN 4096
|
|
|
|
|
|
/* 6010 M4V */
|
|
|
-static unsigned char vop_6010_ntsc_d1[] = {
|
|
|
+static u8 vop_6010_ntsc_d1[] = {
|
|
|
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20,
|
|
|
0x02, 0x48, 0x1d, 0xc0, 0x00, 0x40, 0x00, 0x40,
|
|
|
0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04,
|
|
|
0x1f, 0x4c, 0x58, 0x10, 0xf0, 0x71, 0x18, 0x3f,
|
|
|
};
|
|
|
|
|
|
-static unsigned char vop_6010_ntsc_cif[] = {
|
|
|
+static u8 vop_6010_ntsc_cif[] = {
|
|
|
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20,
|
|
|
0x02, 0x48, 0x1d, 0xc0, 0x00, 0x40, 0x00, 0x40,
|
|
|
0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04,
|
|
|
0x1f, 0x4c, 0x2c, 0x10, 0x78, 0x51, 0x18, 0x3f,
|
|
|
};
|
|
|
|
|
|
-static unsigned char vop_6010_pal_d1[] = {
|
|
|
+static u8 vop_6010_pal_d1[] = {
|
|
|
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20,
|
|
|
0x02, 0x48, 0x15, 0xc0, 0x00, 0x40, 0x00, 0x40,
|
|
|
0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04,
|
|
|
0x1f, 0x4c, 0x58, 0x11, 0x20, 0x71, 0x18, 0x3f,
|
|
|
};
|
|
|
|
|
|
-static unsigned char vop_6010_pal_cif[] = {
|
|
|
+static u8 vop_6010_pal_cif[] = {
|
|
|
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20,
|
|
|
0x02, 0x48, 0x15, 0xc0, 0x00, 0x40, 0x00, 0x40,
|
|
|
0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04,
|
|
@@ -67,25 +67,25 @@ static unsigned char vop_6010_pal_cif[] = {
|
|
|
};
|
|
|
|
|
|
/* 6110 h.264 */
|
|
|
-static unsigned char vop_6110_ntsc_d1[] = {
|
|
|
+static u8 vop_6110_ntsc_d1[] = {
|
|
|
0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e,
|
|
|
0x9a, 0x74, 0x05, 0x81, 0xec, 0x80, 0x00, 0x00,
|
|
|
0x00, 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00,
|
|
|
};
|
|
|
|
|
|
-static unsigned char vop_6110_ntsc_cif[] = {
|
|
|
+static u8 vop_6110_ntsc_cif[] = {
|
|
|
0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e,
|
|
|
0x9a, 0x74, 0x0b, 0x0f, 0xc8, 0x00, 0x00, 0x00,
|
|
|
0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, 0x00,
|
|
|
};
|
|
|
|
|
|
-static unsigned char vop_6110_pal_d1[] = {
|
|
|
+static u8 vop_6110_pal_d1[] = {
|
|
|
0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e,
|
|
|
0x9a, 0x74, 0x05, 0x80, 0x93, 0x20, 0x00, 0x00,
|
|
|
0x00, 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00,
|
|
|
};
|
|
|
|
|
|
-static unsigned char vop_6110_pal_cif[] = {
|
|
|
+static u8 vop_6110_pal_cif[] = {
|
|
|
0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e,
|
|
|
0x9a, 0x74, 0x0b, 0x04, 0xb2, 0x00, 0x00, 0x00,
|
|
|
0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, 0x00,
|
|
@@ -149,7 +149,7 @@ void solo_update_mode(struct solo_enc_dev *solo_enc)
|
|
|
{
|
|
|
struct solo_dev *solo_dev = solo_enc->solo_dev;
|
|
|
int vop_len;
|
|
|
- unsigned char *vop;
|
|
|
+ u8 *vop;
|
|
|
|
|
|
solo_enc->interlaced = (solo_enc->mode & 0x08) ? 1 : 0;
|
|
|
solo_enc->bw_weight = max(solo_dev->fps / solo_enc->interval, 1);
|