diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-09-21 14:33:13 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-10-01 10:24:54 +0300 |
| commit | bfea1d81b5c8b36a76fe9dafbf47fa21a214daec (patch) | |
| tree | 475af9dc4d350f089553a89037daa2d8195dabc3 | |
| parent | a61d7d19a3715e8e4faf8275ac9ace8599b2c97c (diff) | |
| download | linux-bfea1d81b5c8b36a76fe9dafbf47fa21a214daec.tar.xz | |
media: vidtv: fix decoding with gstreamer and Vlc
Neither Vlc nor Gstreamer likes the PES_scrambling_control bits.
In the case of GST, this can be seen with:
$ GST_DEBUG=2 LANG=C gst-play-1.0 pcm_audio.ts
...
0:00:00.097973439 12308 0x55f7ddd155e0 WARN pesparser pesparse.c:411:mpegts_parse_pes_header: Wrong '0x10' marker before PES_scrambling_control (0x40)
0:00:00.097987026 12308 0x55f7ddd155e0 WARN tsdemux tsdemux.c:2314:gst_ts_demux_parse_pes_header: Error parsing PES header. pid: 0x111 stream_type: 0x6
...
So, change, it. After such change, the stream now plays
fine with Vlc, Gstreamer, ffmpeg - and with programs
that use such libraries, like Kaffeine.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| -rw-r--r-- | drivers/media/test-drivers/vidtv/vidtv_pes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/test-drivers/vidtv/vidtv_pes.c b/drivers/media/test-drivers/vidtv/vidtv_pes.c index cbb3fceb00ad..1c75f88070e9 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_pes.c +++ b/drivers/media/test-drivers/vidtv/vidtv_pes.c @@ -137,7 +137,7 @@ static u32 vidtv_pes_write_h(struct pes_header_write_args args) struct vidtv_pes_optional pes_optional = {}; struct pes_header_write_args pts_dts_args = args; u32 stream_id = (args.encoder_id == S302M) ? PRIVATE_STREAM_1_ID : args.stream_id; - u16 pes_opt_bitfield = 0x2 << 13; + u16 pes_opt_bitfield = 0x01 << 15; pes_header.bitfield = cpu_to_be32((PES_START_CODE_PREFIX << 8) | stream_id); |