V4L/DVB (11733): increase MPEG encoder timout

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>

diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c
index cc8b923afbc077c37cee7708a4518c2b91968f09..b8ff459d0d3085208845938c4bb15c90d4b94b9f 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-ts.c
+++ b/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/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 1d190e5e1ac4d1f91274391b94c2153c37b25ecb..8229ab2132238497e39484aedfd0f8fb5e52ede9 100644 (file)
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -376,6 +376,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;