V4L/DVB (13909): cx18: Clean up dead code from ivtv once used for IDX processing
Signed-off-by: Andy Walls <awalls@radix.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Родитель
82acdc84cc
Коммит
9bff2d6171
|
@ -246,16 +246,8 @@ struct cx18_enc_idx_entry {
|
||||||
#define CX18_WARN_DEV(dev, fmt, args...) v4l2_warn(dev, fmt , ## args)
|
#define CX18_WARN_DEV(dev, fmt, args...) v4l2_warn(dev, fmt , ## args)
|
||||||
#define CX18_INFO_DEV(dev, fmt, args...) v4l2_info(dev, fmt , ## args)
|
#define CX18_INFO_DEV(dev, fmt, args...) v4l2_info(dev, fmt , ## args)
|
||||||
|
|
||||||
/* Values for CX18_API_DEC_PLAYBACK_SPEED mpeg_frame_type_mask parameter: */
|
|
||||||
#define MPEG_FRAME_TYPE_IFRAME 1
|
|
||||||
#define MPEG_FRAME_TYPE_IFRAME_PFRAME 3
|
|
||||||
#define MPEG_FRAME_TYPE_ALL 7
|
|
||||||
|
|
||||||
#define CX18_MAX_PGM_INDEX (400)
|
|
||||||
|
|
||||||
extern int cx18_debug;
|
extern int cx18_debug;
|
||||||
|
|
||||||
|
|
||||||
struct cx18_options {
|
struct cx18_options {
|
||||||
int megabytes[CX18_MAX_STREAMS]; /* Size in megabytes of each stream */
|
int megabytes[CX18_MAX_STREAMS]; /* Size in megabytes of each stream */
|
||||||
int cardtype; /* force card type on load */
|
int cardtype; /* force card type on load */
|
||||||
|
@ -599,12 +591,6 @@ struct cx18 {
|
||||||
|
|
||||||
struct vbi_info vbi;
|
struct vbi_info vbi;
|
||||||
|
|
||||||
u32 pgm_info_offset;
|
|
||||||
u32 pgm_info_num;
|
|
||||||
u32 pgm_info_write_idx;
|
|
||||||
u32 pgm_info_read_idx;
|
|
||||||
struct v4l2_enc_idx_entry pgm_info[CX18_MAX_PGM_INDEX];
|
|
||||||
|
|
||||||
u64 mpg_data_received;
|
u64 mpg_data_received;
|
||||||
u64 vbi_data_inserted;
|
u64 vbi_data_inserted;
|
||||||
|
|
||||||
|
|
|
@ -207,9 +207,7 @@ static struct cx18_mdl *cx18_get_mdl(struct cx18_stream *s, int non_block,
|
||||||
*err = 0;
|
*err = 0;
|
||||||
while (1) {
|
while (1) {
|
||||||
if (s->type == CX18_ENC_STREAM_TYPE_MPG) {
|
if (s->type == CX18_ENC_STREAM_TYPE_MPG) {
|
||||||
/* Process pending program info updates and pending
|
/* Process pending program updates and VBI data */
|
||||||
VBI data */
|
|
||||||
|
|
||||||
if (time_after(jiffies, cx->dualwatch_jiffies + msecs_to_jiffies(1000))) {
|
if (time_after(jiffies, cx->dualwatch_jiffies + msecs_to_jiffies(1000))) {
|
||||||
cx->dualwatch_jiffies = jiffies;
|
cx->dualwatch_jiffies = jiffies;
|
||||||
cx18_dualwatch(cx);
|
cx18_dualwatch(cx);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче