korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 01:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (13903): cx18: Encapsulate check for a stream being enabled into an inline function

Browse Source 
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Andy Walls 2009-12-31 00:26:49 -03:00 committed by Mauro Carvalho Chehab
parent efc0b127b2
commit 540bab93b7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/video/cx18/cx18-streams.c
View File

@ -340,6 +340,11 @@ void cx18_streams_cleanup(struct cx18 *cx, int unregister)
} }
} }
static inline bool cx18_stream_enabled(struct cx18_stream *s)
{
return s->video_dev || s->dvb.enabled;
}
static void cx18_vbi_setup(struct cx18_stream *s) static void cx18_vbi_setup(struct cx18_stream *s)
{ {
struct cx18 *cx = s->cx; struct cx18 *cx = s->cx;
@ -547,7 +552,7 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
int captype = 0; int captype = 0;
struct cx18_api_func_private priv; struct cx18_api_func_private priv;
if (s->video_dev == NULL && s->dvb.enabled == 0) if (!cx18_stream_enabled(s))
return -EINVAL; return -EINVAL;
CX18_DEBUG_INFO("Start encoder stream %s\n", s->name); CX18_DEBUG_INFO("Start encoder stream %s\n", s->name);
@ -705,7 +710,7 @@ void cx18_stop_all_captures(struct cx18 *cx)
for (i = CX18_MAX_STREAMS - 1; i >= 0; i--) { for (i = CX18_MAX_STREAMS - 1; i >= 0; i--) {
struct cx18_stream *s = &cx->streams[i]; struct cx18_stream *s = &cx->streams[i];
if (s->video_dev == NULL && s->dvb.enabled == 0) if (!cx18_stream_enabled(s))
continue; continue;
if (test_bit(CX18_F_S_STREAMING, &s->s_flags)) if (test_bit(CX18_F_S_STREAMING, &s->s_flags))
cx18_stop_v4l2_encode_stream(s, 0); cx18_stop_v4l2_encode_stream(s, 0);
@ -717,7 +722,7 @@ int cx18_stop_v4l2_encode_stream(struct cx18_stream *s, int gop_end)
struct cx18 *cx = s->cx; struct cx18 *cx = s->cx;
unsigned long then; unsigned long then;
if (s->video_dev == NULL && s->dvb.enabled == 0) if (!cx18_stream_enabled(s))
return -EINVAL; return -EINVAL;
/* This function assumes that you are allowed to stop the capture /* This function assumes that you are allowed to stop the capture
@ -789,7 +794,7 @@ struct cx18_stream *cx18_handle_to_stream(struct cx18 *cx, u32 handle)
s = &cx->streams[i]; s = &cx->streams[i];
if (s->handle != handle) if (s->handle != handle)
continue; continue;
if (s->video_dev || s->dvb.enabled) if (cx18_stream_enabled(s))
return s; return s;
} }
return NULL; return NULL;