summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-28 09:41:08 +0000
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-28 09:41:08 +0000
commit42a150036e0f0f58c5882319cec52b76a401471c (patch)
tree2ca86af6cc3773ecd13806b6fa321ad7e548bf50 /linux/drivers/media
parentbcd4645cb019d22f5addac33a51fc424a3cf042d (diff)
downloadmediapointer-dvb-s2-42a150036e0f0f58c5882319cec52b76a401471c.tar.gz
mediapointer-dvb-s2-42a150036e0f0f58c5882319cec52b76a401471c.tar.bz2
increase MPEG encoder timout
From: Dmitri Belimov <d.belimov@gmail.com> Hi All. If video has a lot of changes in frame, MPEG encoder need more time for coding process. Add new bigger timeout for encoder. This is patch from our customer. I checked this. Signed-off-by: Alexey Osipov <lion-simba@pridelands.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-ts.c2
-rw-r--r--linux/drivers/media/video/saa7134/saa7134.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-ts.c b/linux/drivers/media/video/saa7134/saa7134-ts.c
index cc8b923af..b8ff459d0 100644
--- a/linux/drivers/media/video/saa7134/saa7134-ts.c
+++ b/linux/drivers/media/video/saa7134/saa7134-ts.c
@@ -65,7 +65,7 @@ static int buffer_activate(struct saa7134_dev *dev,
/* start DMA */
saa7134_set_dmabits(dev);
- mod_timer(&dev->ts_q.timeout, jiffies+BUFFER_TIMEOUT);
+ mod_timer(&dev->ts_q.timeout, jiffies+TS_BUFFER_TIMEOUT);
if (dev->ts_state == SAA7134_TS_BUFF_DONE) {
/* Clear TS cache */
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index d961e0861..ae7ba8923 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -377,6 +377,7 @@ struct saa7134_board {
#define INTERLACE_OFF 2
#define BUFFER_TIMEOUT msecs_to_jiffies(500) /* 0.5 seconds */
+#define TS_BUFFER_TIMEOUT msecs_to_jiffies(1000) /* 1 second */
struct saa7134_dev;
struct saa7134_dma;