Commit 0d82fe80 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10276): cx18, cx2341x, ivtv: Add AC-3 audio encoding control to cx18 



Initial addition of controls to set AC-3 audio encoding for the CX23418 - it
does not work yet due to firmware or cx18 driver issues.  This change affects
the common cx2341x and ivtv modules due to shared structures and
common functions.

Signed-off-by: default avatarAndy Walls <awalls@radix.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 50299994

drivers/media/video/cx18/cx18-driver.c

+2 −1
Original line number Diff line number Diff line
@@ -587,7 +587,8 @@ static int __devinit cx18_init_struct1(struct cx18 *cx) 
		(cx->params.video_temporal_filter_mode << 1) |

		(cx->params.video_median_filter_type << 2);

	cx->params.port = CX2341X_PORT_MEMORY;

	cx->params.capabilities = CX2341X_CAP_HAS_TS;

	cx->params.capabilities = CX2341X_CAP_HAS_TS   | CX2341X_CAP_HAS_AC3 |

				  CX2341X_CAP_HAS_LPCM;

	init_waitqueue_head(&cx->cap_w);

	init_waitqueue_head(&cx->mb_apu_waitq);

	init_waitqueue_head(&cx->mb_cpu_waitq);

drivers/media/video/cx18/cx18-driver.h

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ struct cx18 { 


	/* dualwatch */

	unsigned long dualwatch_jiffies;

	u16 dualwatch_stereo_mode;

	u32 dualwatch_stereo_mode;



	/* Digitizer type */

	int digitizer;		/* 0x00EF = saa7114 0x00FO = saa7115 0x0106 = mic */

drivers/media/video/cx18/cx18-fileops.c

+4 −4
Original line number Diff line number Diff line
@@ -128,10 +128,10 @@ static void cx18_release_stream(struct cx18_stream *s) 
static void cx18_dualwatch(struct cx18 *cx)

{

	struct v4l2_tuner vt;

	u16 new_bitmap;

	u16 new_stereo_mode;

	const u16 stereo_mask = 0x0300;

	const u16 dual = 0x0200;

	u32 new_bitmap;

	u32 new_stereo_mode;

	const u32 stereo_mask = 0x0300;

	const u32 dual = 0x0200;

	u32 h;



	new_stereo_mode = cx->params.audio_properties & stereo_mask;

drivers/media/video/cx2341x.c

+67 −6
Original line number Diff line number Diff line 
/*

 * cx2341x - generic code for cx23415/6 based devices

 * cx2341x - generic code for cx23415/6/8 based devices

 *

 * Copyright (C) 2006 Hans Verkuil <hverkuil@xs4all.nl>

 *
@@ -30,7 +30,7 @@ 
#include <media/cx2341x.h>

#include <media/v4l2-common.h>



MODULE_DESCRIPTION("cx23415/6 driver");

MODULE_DESCRIPTION("cx23415/6/8 driver");

MODULE_AUTHOR("Hans Verkuil");

MODULE_LICENSE("GPL");
@@ -45,6 +45,7 @@ const u32 cx2341x_mpeg_ctrls[] = { 
	V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ,

	V4L2_CID_MPEG_AUDIO_ENCODING,

	V4L2_CID_MPEG_AUDIO_L2_BITRATE,

	V4L2_CID_MPEG_AUDIO_AC3_BITRATE,

	V4L2_CID_MPEG_AUDIO_MODE,

	V4L2_CID_MPEG_AUDIO_MODE_EXTENSION,

	V4L2_CID_MPEG_AUDIO_EMPHASIS,
@@ -94,6 +95,7 @@ static const struct cx2341x_mpeg_params default_params = { 
	.audio_sampling_freq = V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000,

	.audio_encoding = V4L2_MPEG_AUDIO_ENCODING_LAYER_2,

	.audio_l2_bitrate = V4L2_MPEG_AUDIO_L2_BITRATE_224K,

	.audio_ac3_bitrate = V4L2_MPEG_AUDIO_AC3_BITRATE_224K,

	.audio_mode = V4L2_MPEG_AUDIO_MODE_STEREO,

	.audio_mode_extension = V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4,

	.audio_emphasis = V4L2_MPEG_AUDIO_EMPHASIS_NONE,
@@ -148,6 +150,9 @@ static int cx2341x_get_ctrl(const struct cx2341x_mpeg_params *params, 
	case V4L2_CID_MPEG_AUDIO_L2_BITRATE:

		ctrl->value = params->audio_l2_bitrate;

		break;

	case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:

		ctrl->value = params->audio_ac3_bitrate;

		break;

	case V4L2_CID_MPEG_AUDIO_MODE:

		ctrl->value = params->audio_mode;

		break;
@@ -256,6 +261,12 @@ static int cx2341x_set_ctrl(struct cx2341x_mpeg_params *params, int busy, 
		params->audio_sampling_freq = ctrl->value;

		break;

	case V4L2_CID_MPEG_AUDIO_ENCODING:

		if (busy)

			return -EBUSY;

		if (params->capabilities & CX2341X_CAP_HAS_AC3 &&

		    ctrl->value != V4L2_MPEG_AUDIO_ENCODING_LAYER_2 &&

		    ctrl->value != V4L2_MPEG_AUDIO_ENCODING_AC3)

			return -EINVAL;

		params->audio_encoding = ctrl->value;

		break;

	case V4L2_CID_MPEG_AUDIO_L2_BITRATE:
@@ -263,6 +274,11 @@ static int cx2341x_set_ctrl(struct cx2341x_mpeg_params *params, int busy, 
			return -EBUSY;

		params->audio_l2_bitrate = ctrl->value;

		break;

	case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:

		if (busy)

			return -EBUSY;

		params->audio_ac3_bitrate = ctrl->value;

		break;

	case V4L2_CID_MPEG_AUDIO_MODE:

		params->audio_mode = ctrl->value;

		break;
@@ -482,6 +498,12 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params, 


	switch (qctrl->id) {

	case V4L2_CID_MPEG_AUDIO_ENCODING:

		if (params->capabilities & CX2341X_CAP_HAS_AC3)

			return v4l2_ctrl_query_fill(qctrl,

					V4L2_MPEG_AUDIO_ENCODING_LAYER_2,

					V4L2_MPEG_AUDIO_ENCODING_AC3, 1,

					default_params.audio_encoding);



		return v4l2_ctrl_query_fill(qctrl,

				V4L2_MPEG_AUDIO_ENCODING_LAYER_2,

				V4L2_MPEG_AUDIO_ENCODING_LAYER_2, 1,
@@ -497,6 +519,12 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params, 
	case V4L2_CID_MPEG_AUDIO_L3_BITRATE:

		return -EINVAL;



	case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:

		return v4l2_ctrl_query_fill(qctrl,

				V4L2_MPEG_AUDIO_AC3_BITRATE_48K,

				V4L2_MPEG_AUDIO_AC3_BITRATE_448K, 1,

				default_params.audio_ac3_bitrate);



	case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:

		err = v4l2_ctrl_query_fill_std(qctrl);

		if (err == 0 &&
@@ -671,6 +699,15 @@ const char **cx2341x_ctrl_get_menu(const struct cx2341x_mpeg_params *p, u32 id) 
		NULL

	};



	static const char *mpeg_audio_encoding_l2_ac3[] = {

		"",

		"MPEG-1/2 Layer II",

		"",

		"",

		"AC-3",

		NULL

	};



	static const char *cx2341x_video_spatial_filter_mode_menu[] = {

		"Manual",

		"Auto",
@@ -711,6 +748,9 @@ const char **cx2341x_ctrl_get_menu(const struct cx2341x_mpeg_params *p, u32 id) 
	case V4L2_CID_MPEG_STREAM_TYPE:

		return (p->capabilities & CX2341X_CAP_HAS_TS) ?

			mpeg_stream_type_with_ts : mpeg_stream_type_without_ts;

	case V4L2_CID_MPEG_AUDIO_ENCODING:

		return (p->capabilities & CX2341X_CAP_HAS_AC3) ?

			mpeg_audio_encoding_l2_ac3 : v4l2_ctrl_get_menu(id);

	case V4L2_CID_MPEG_AUDIO_L1_BITRATE:

	case V4L2_CID_MPEG_AUDIO_L3_BITRATE:

		return NULL;
@@ -730,16 +770,34 @@ const char **cx2341x_ctrl_get_menu(const struct cx2341x_mpeg_params *p, u32 id) 
}

EXPORT_SYMBOL(cx2341x_ctrl_get_menu);



/* definitions for audio properties bits 29-28 */

#define CX2341X_AUDIO_ENCDING_METHOD_MPEG	0

#define CX2341X_AUDIO_ENCDING_METHOD_AC3	1

#define CX2341X_AUDIO_ENCDING_METHOD_LPCM	2



static void cx2341x_calc_audio_properties(struct cx2341x_mpeg_params *params)

{

	params->audio_properties = (params->audio_sampling_freq << 0) |

		((3 - params->audio_encoding) << 2) |

		((1 + params->audio_l2_bitrate) << 4) |

	params->audio_properties =

		(params->audio_sampling_freq << 0) |

		(params->audio_mode << 8) |

		(params->audio_mode_extension << 10) |

		(((params->audio_emphasis == V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17)

		  ? 3 : params->audio_emphasis) << 12) |

		(params->audio_crc << 14);



	if ((params->capabilities & CX2341X_CAP_HAS_AC3) &&

	    params->audio_encoding == V4L2_MPEG_AUDIO_ENCODING_AC3) {

		params->audio_properties |=

			/* Not sure if this MPEG Layer II setting is required */

			((3 - V4L2_MPEG_AUDIO_ENCODING_LAYER_2) << 2) |

			(params->audio_ac3_bitrate << 4) |

			(CX2341X_AUDIO_ENCDING_METHOD_AC3 << 28);

	} else {

		/* Assuming MPEG Layer II */

		params->audio_properties |=

			((3 - params->audio_encoding) << 2) |

			((1 + params->audio_l2_bitrate) << 4);

	}

}



int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params, int busy,
@@ -1022,7 +1080,10 @@ void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix) 
		prefix,

		cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ),

		cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_ENCODING),

		cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_L2_BITRATE),

		cx2341x_menu_item(p,

			   p->audio_encoding == V4L2_MPEG_AUDIO_ENCODING_AC3

					      ? V4L2_CID_MPEG_AUDIO_AC3_BITRATE

					      : V4L2_CID_MPEG_AUDIO_L2_BITRATE),

		cx2341x_menu_item(p, V4L2_CID_MPEG_AUDIO_MODE),

		p->audio_mute ? " (muted)" : "");

	if (p->audio_mode == V4L2_MPEG_AUDIO_MODE_JOINT_STEREO)

drivers/media/video/ivtv/ivtv-driver.h

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ struct ivtv { 
	u64 vbi_data_inserted;          /* number of VBI bytes inserted into the MPEG stream */

	u32 last_dec_timing[3];         /* cache last retrieved pts/scr/frame values */

	unsigned long dualwatch_jiffies;/* jiffies value of the previous dualwatch check */

	u16 dualwatch_stereo_mode;      /* current detected dualwatch stereo mode */

	u32 dualwatch_stereo_mode;      /* current detected dualwatch stereo mode */





	/* VBI state info */