Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
add missing ac3 audio track. 
0x06 is Chinese Cable TV ac3 audio track.
  • Loading branch information
@perexg
sangood authored and perexg committed Aug 4, 2014
1 parent a0a102a commit f605574
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/input/mpegts/dvb_psi.c
View file
Expand Up @@ -1372,7 +1372,8 @@ psi_parse_pmt
case 0x04:
hts_stream_type = SCT_MPEG2AUDIO;
break;


case 0x06: //0x06 is Chinese Cable TV ac3 audio track
case 0x81:
hts_stream_type = SCT_AC3;
break;
Expand Down

10 comments on commit f605574

@bluzee
Copy link
Contributor

@bluzee bluzee commented on f605574 Aug 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0x06 is used for Dolby E. This commit breaks playback on all my channels that have a Dolby E audio stream included. Can you find some other way to implement this?

@perexg
Copy link
Contributor

@perexg perexg commented on f605574 Aug 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bluzee : Look to few lines bellow (case DVB_DESC_EAC3). I don't think that this patch breaks something. It just defines the default type for 0x06. Could you give me your PMT data to check ?

@bluzee
Copy link
Contributor

@bluzee bluzee commented on f605574 Aug 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is from TSReader. Did you want a TS dump posted somewhere? PID 51 is Dolby E audio. If I revert this patch all is well again.

Program Number: 1
PCR on PID 49 (0x0031)
PMT Version: 1

Stream Type: 0x02 MPEG-2 Video
Elementary Stream PID 49 (0x0031)

Stream Type: 0x06 PCM Audio
Elementary Stream PID 51 (0x0033)

Stream Type: 0x03 MPEG-1 Audio
Elementary Stream PID 52 (0x0034)

Stream Type: 0x03 MPEG-1 Audio
Elementary Stream PID 53 (0x0035)

Stream Type: 0x03 MPEG-1 Audio
Elementary Stream PID 54 (0x0036)

Stream Type: 0x06 ISO/IEC 13818-1 PES packets containing private data
Elementary Stream PID 59 (0x003b)

Stream Type: 0x06 ISO/IEC 13818-1 PES packets containing private data
Elementary Stream PID 60 (0x003c)

Descriptor: User Private Descriptor: 0xa3
01 65 6e 67 01 00 00 03 48 44 45 .eng....HDE

@perexg
Copy link
Contributor

@perexg perexg commented on f605574 Aug 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bluzee : Yes, please, give me a short TS dump..

@bluzee
Copy link
Contributor

@bluzee bluzee commented on f605574 Aug 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, try this...

https://bitbucket.org/bluzee/dvbstream/downloads/3900H.ts

@perexg
Copy link
Contributor

@perexg perexg commented on f605574 Aug 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I put a fix to master: 6e02f10 . Could you test ?

@bluzee
Copy link
Contributor

@bluzee bluzee commented on f605574 Aug 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix is working. Good job!

@johsmi
Copy link
Contributor

@johsmi johsmi commented on f605574 Sep 8, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@perexg : This default to AC3 still breaks some Canal Digital channels on Thor 5. Some channels do use non-AC3 streams with ES type 0x06 and ES info length 0 (http://pastebin.com/8GUA9kcg). Maybe the 0x06 default to AC3 should be an option and not a true default?

@perexg
Copy link
Contributor

@perexg perexg commented on f605574 Sep 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johsmi : Thanks. I added this option to the mux config: 3240a8e

If it's not enabled, the 0x06 type is handled without any default.

@johsmi
Copy link
Contributor

@johsmi johsmi commented on f605574 Sep 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@perexg : Thank you. I've now tested it and it works fine for me.

Please sign in to comment.