summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2006-06-25 18:04:53 -0500
committerMike Isely <isely@pobox.com>2006-06-25 18:04:53 -0500
commit31dfc2e959e330a74c41ff51af3a177175c8cb6f (patch)
tree0e1d12dbf271779e37ea9a50e8e1508e34ceaf8f
parentcb977a1c8a0a1c8ea9c89da16a7514f48e20a0de (diff)
downloadmediapointer-dvb-s2-31dfc2e959e330a74c41ff51af3a177175c8cb6f.tar.gz
mediapointer-dvb-s2-31dfc2e959e330a74c41ff51af3a177175c8cb6f.tar.bz2
Don't suspend encoder when changing its attributes (in pvrusb2)
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 44ee1d381..ac4e8bc18 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2112,6 +2112,7 @@ int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw)
}
if (hdw->std_dirty ||
+#if 0 /* Don't toggle encoder for now - seems to work better this way */
hdw->interlace_dirty ||
hdw->vbr_dirty ||
hdw->videobitrate_dirty ||
@@ -2122,7 +2123,9 @@ int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw)
hdw->audioemphasis_dirty ||
hdw->srate_dirty ||
hdw->res_ver_dirty ||
- hdw->res_hor_dirty) {
+ hdw->res_hor_dirty ||
+#endif
+ 0) {
/* If any of this changes, then the encoder needs to be
reconfigured, and we need to reset the stream. */
stale_subsys_mask |= (1<<PVR2_SUBSYS_B_ENC_CFG);