Browse Source

avformat/mpegts: add missing sample_rate value to Opus extradata

Finishes fixing ticket #9190.

Signed-off-by: James Almer <jamrial@gmail.com>
master
James Almer 4 years ago
parent
commit
c1fd4033dc
2 changed files with 2 additions and 1 deletions
  1. +1
    -0
      libavformat/mpegts.c
  2. +1
    -1
      tests/ref/fate/ts-opus-demux

+ 1
- 0
libavformat/mpegts.c View File

@@ -2026,6 +2026,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (channel_config_code <= 0x8) { if (channel_config_code <= 0x8) {
st->codecpar->extradata[9] = channels = channel_config_code ? channel_config_code : 2; st->codecpar->extradata[9] = channels = channel_config_code ? channel_config_code : 2;
AV_WL32(&st->codecpar->extradata[12], 48000);
st->codecpar->extradata[18] = channel_config_code ? (channels > 2) : /* Dual Mono */ 255; st->codecpar->extradata[18] = channel_config_code ? (channels > 2) : /* Dual Mono */ 255;
st->codecpar->extradata[19] = opus_stream_cnt[channel_config_code]; st->codecpar->extradata[19] = opus_stream_cnt[channel_config_code];
st->codecpar->extradata[20] = opus_coupled_stream_cnt[channel_config_code]; st->codecpar->extradata[20] = opus_coupled_stream_cnt[channel_config_code];


+ 1
- 1
tests/ref/fate/ts-opus-demux View File

@@ -1,4 +1,4 @@
#extradata 0: 30, 0x53be0347
#extradata 0: 30, 0x69290482
#tb 0: 1/90000 #tb 0: 1/90000
#media_type 0: audio #media_type 0: audio
#codec_id 0: opus #codec_id 0: opus


Loading…
Cancel
Save