har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mpegtsenc: simplify code for condition checks

Browse Source 
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
This commit is contained in:
Limin Wang 2020-07-08 10:40:10 +08:00
parent 017bf9643f
commit cf81d64282
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mpegtsenc.c
View File

@ -483,16 +483,18 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
/* write optional descriptors here */ /* write optional descriptors here */
switch (st->codecpar->codec_type) { switch (st->codecpar->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
if (st->codecpar->codec_id==AV_CODEC_ID_AC3 && (ts->flags & MPEGTS_FLAG_SYSTEM_B)) { if (ts->flags & MPEGTS_FLAG_SYSTEM_B) {
if (st->codecpar->codec_id==AV_CODEC_ID_AC3) {
*q++=0x6a; // AC3 descriptor see A038 DVB SI *q++=0x6a; // AC3 descriptor see A038 DVB SI
*q++=1; // 1 byte, all flags sets to 0 *q++=1; // 1 byte, all flags sets to 0
*q++=0; // omit all fields... *q++=0; // omit all fields...
} }
if (st->codecpar->codec_id==AV_CODEC_ID_EAC3 && (ts->flags & MPEGTS_FLAG_SYSTEM_B)) { else if (st->codecpar->codec_id==AV_CODEC_ID_EAC3) {
*q++=0x7a; // EAC3 descriptor see A038 DVB SI *q++=0x7a; // EAC3 descriptor see A038 DVB SI
*q++=1; // 1 byte, all flags sets to 0 *q++=1; // 1 byte, all flags sets to 0
*q++=0; // omit all fields... *q++=0; // omit all fields...
} }
}
if (st->codecpar->codec_id==AV_CODEC_ID_S302M) if (st->codecpar->codec_id==AV_CODEC_ID_S302M)
put_registration_descriptor(&q, MKTAG('B', 'S', 'S', 'D')); put_registration_descriptor(&q, MKTAG('B', 'S', 'S', 'D'));
if (st->codecpar->codec_id==AV_CODEC_ID_OPUS) { if (st->codecpar->codec_id==AV_CODEC_ID_OPUS) {