| author | Hui Zhang <hui.zhang@amlogic.com> | 2020-06-29 10:09:59 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit2.amlogic.com> | 2020-06-29 10:09:59 (GMT) |
| commit | 3fcada1c4039b47a1a2518bbe0c2066af0d66095 (patch) | |
| tree | 07cd6b30595cf69a4a1f3d7592e137f56dc7071d | |
| parent | 250738100dd564a5b8d7b4a8349f1083d664ebdc (diff) | |
| parent | 733b2e7c1e09c7744aeb0217f2b55d9c055e9a87 (diff) | |
| download | media_modules-3fcada1c4039b47a1a2518bbe0c2066af0d66095.zip media_modules-3fcada1c4039b47a1a2518bbe0c2066af0d66095.tar.gz media_modules-3fcada1c4039b47a1a2518bbe0c2066af0d66095.tar.bz2 | |
Merge "dmx: section filter fail with BYPASS_PKT setting [3/3]" into amlogic-4.9-dev-q
| -rw-r--r-- | drivers/stream_input/parser/hw_demux/aml_dmx.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/stream_input/parser/hw_demux/aml_dmx.c b/drivers/stream_input/parser/hw_demux/aml_dmx.c index 28473d0..669648d 100644 --- a/drivers/stream_input/parser/hw_demux/aml_dmx.c +++ b/drivers/stream_input/parser/hw_demux/aml_dmx.c @@ -3376,6 +3376,10 @@ static int dmx_enable(struct aml_dmx *dmx) DMX_WRITE_REG(dmx->id, STB_OM_CTL, (0x40 << MAX_OM_DMA_COUNT) | (0x7f << LAST_OM_ADDR)); + + DMX_WRITE_REG(dmx->id, VIDEO_STREAM_ID, + ((record && !hi_bsf) ? 0xFFFF : 0)); + DMX_WRITE_REG(dmx->id, DEMUX_CONTROL, (0 << BYPASS_USE_RECODER_PATH) | (0 << INSERT_AUDIO_PES_STRONG_SYNC) | @@ -3476,7 +3480,8 @@ static u32 dmx_get_chan_target(struct aml_dmx *dmx, int cid) type = OTHER_PES_PACKET; break; default: - type = BYPASS_PACKET; + type = (dmx->channel[0].used || dmx->channel[1].used) ? + RECORDER_STREAM : VIDEO_PACKET; break; } } |