胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
ccb250f3 1 parent dda4f338

merge srs2. convert ts aac audio private stream 1 to common.

内嵌 并排对比
正在显示 3 个修改的文件 包含 14 行增加 和 0 行删除
@@ -204,6 +204,7 @@ Please select your language: @@ -204,6 +204,7 @@ Please select your language:
204 204
205 ### V2 changes 205 ### V2 changes
206 206
  207 +* v2.0, 2017-01-11, fix [#740][bug #740], convert ts aac audio private stream 1 to common. 2.0.229
207 * v2.0, 2017-01-11, fix [#588][bug #588], kbps interface error. 2.0.228 208 * v2.0, 2017-01-11, fix [#588][bug #588], kbps interface error. 2.0.228
208 * v2.0, 2017-01-11, fix [#736][bug #736], recovery the hls dispose. 2.0.227 209 * v2.0, 2017-01-11, fix [#736][bug #736], recovery the hls dispose. 2.0.227
209 * v2.0, 2017-01-10, refine hls html5 video template. 210 * v2.0, 2017-01-10, refine hls html5 video template.
@@ -1360,6 +1361,7 @@ Winlin @@ -1360,6 +1361,7 @@ Winlin
1360 [bug #635]: https://github.com/ossrs/srs/issues/635 1361 [bug #635]: https://github.com/ossrs/srs/issues/635
1361 [bug #736]: https://github.com/ossrs/srs/issues/736 1362 [bug #736]: https://github.com/ossrs/srs/issues/736
1362 [bug #588]: https://github.com/ossrs/srs/issues/588 1363 [bug #588]: https://github.com/ossrs/srs/issues/588
  1364 +[bug #740]: https://github.com/ossrs/srs/issues/740
1363 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx 1365 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
1364 [bug #735]: https://github.com/ossrs/srs/issues/735 1366 [bug #735]: https://github.com/ossrs/srs/issues/735
1365 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx 1367 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
@@ -299,6 +299,12 @@ int SrsMpegtsOverUdp::on_ts_message(SrsTsMessage* msg) @@ -299,6 +299,12 @@ int SrsMpegtsOverUdp::on_ts_message(SrsTsMessage* msg)
299 msg->dts, msg->pts, msg->payload->length(), msg->packet->payload_unit_start_indicator, msg->continuity_counter, msg->sid, 299 msg->dts, msg->pts, msg->payload->length(), msg->packet->payload_unit_start_indicator, msg->continuity_counter, msg->sid,
300 msg->is_audio()? "A":msg->is_video()? "V":"N", msg->stream_number()); 300 msg->is_audio()? "A":msg->is_video()? "V":"N", msg->stream_number());
301 } 301 }
  302 +
  303 + // When the audio SID is private stream 1, we use common audio.
  304 + // @see https://github.com/ossrs/srs/issues/740
  305 + if (msg->channel->apply == SrsTsPidApplyAudio && msg->sid == SrsTsPESStreamIdPrivateStream1) {
  306 + msg->sid = SrsTsPESStreamIdAudioCommon;
  307 + }
302 308
303 // when not audio/video, or not adts/annexb format, donot support. 309 // when not audio/video, or not adts/annexb format, donot support.
304 if (msg->stream_number() != 0) { 310 if (msg->stream_number() != 0) {
@@ -750,6 +750,12 @@ int SrsIngestSrsOutput::on_ts_message(SrsTsMessage* msg) @@ -750,6 +750,12 @@ int SrsIngestSrsOutput::on_ts_message(SrsTsMessage* msg)
750 msg->dts, msg->pts, msg->payload->length(), msg->packet->payload_unit_start_indicator, msg->continuity_counter, msg->sid, 750 msg->dts, msg->pts, msg->payload->length(), msg->packet->payload_unit_start_indicator, msg->continuity_counter, msg->sid,
751 msg->is_audio()? "A":msg->is_video()? "V":"N", msg->stream_number()); 751 msg->is_audio()? "A":msg->is_video()? "V":"N", msg->stream_number());
752 752
  753 + // When the audio SID is private stream 1, we use common audio.
  754 + // @see https://github.com/ossrs/srs/issues/740
  755 + if (msg->channel->apply == SrsTsPidApplyAudio && msg->sid == SrsTsPESStreamIdPrivateStream1) {
  756 + msg->sid = SrsTsPESStreamIdAudioCommon;
  757 + }
  758 +
753 // when not audio/video, or not adts/annexb format, donot support. 759 // when not audio/video, or not adts/annexb format, donot support.
754 if (msg->stream_number() != 0) { 760 if (msg->stream_number() != 0) {
755 ret = ERROR_STREAM_CASTER_TS_ES; 761 ret = ERROR_STREAM_CASTER_TS_ES;