external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

MP3: Upgrade mpegts.js to support HTTP-TS with mp3. v5.0.126 (#296)

Browse source
This commit is contained in:
winlin 2023-01-01 20:15:00 +08:00
parent 3727d0527c
commit 02a18b328c
8 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
trunk/doc/CHANGELOG.md
View file

@ -8,6 +8,7 @@ The changelog for SRS.
## SRS 5.0 Changelog ## SRS 5.0 Changelog
* v5.0, 2023-01-01, For [#296](https://github.com/ossrs/srs/issues/296): MP3: Upgrade mpegts.js to support HTTP-TS with mp3. v5.0.126
* v5.0, 2023-01-01, For [#3349](https://github.com/ossrs/srs/issues/3349): API: Fix duplicated on_stop callback event bug. v5.0.125 * v5.0, 2023-01-01, For [#3349](https://github.com/ossrs/srs/issues/3349): API: Fix duplicated on_stop callback event bug. v5.0.125
* v5.0, 2022-12-31, GB28181: Enable regression test for gb28181. v5.0.122 * v5.0, 2022-12-31, GB28181: Enable regression test for gb28181. v5.0.122
* v5.0, 2022-12-31, Refine configure to guess OS automatically. v5.0.121 * v5.0, 2022-12-31, Refine configure to guess OS automatically. v5.0.121

9
trunk/research/players/js/mpegts-1.6.10.min.js vendored
View file

File diff suppressed because one or more lines are too long

1
trunk/research/players/js/mpegts-1.6.10.min.js.map
View file

File diff suppressed because one or more lines are too long

9
trunk/research/players/js/mpegts-1.7.2.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

1
trunk/research/players/js/mpegts.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
trunk/research/players/srs_player.html
View file

@ -99,7 +99,7 @@
</body> </body>
<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script> <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="js/bootstrap.min.js"></script> <script type="text/javascript" src="js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/mpegts-1.6.10.min.js"></script> <script type="text/javascript" src="js/mpegts-1.7.2.min.js"></script>
<script type="text/javascript" src="js/hls-0.14.17.min.js"></script> <script type="text/javascript" src="js/hls-0.14.17.min.js"></script>
<script type="text/javascript" src="js/dash-v4.5.1.all.min.js"></script> <script type="text/javascript" src="js/dash-v4.5.1.all.min.js"></script>
<script type="text/javascript" src="js/json2.js"></script> <script type="text/javascript" src="js/json2.js"></script>

2
trunk/src/core/srs_core_version5.hpp
View file

@ -9,6 +9,6 @@
#define VERSION_MAJOR 5 #define VERSION_MAJOR 5
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 125 #define VERSION_REVISION 126
#endif #endif

14
trunk/src/kernel/srs_kernel_ts.cpp
View file

@ -2654,11 +2654,11 @@ srs_error_t SrsTsContextWriter::write_audio(SrsTsMessage* audio)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
srs_info("hls: write audio pts=%" PRId64 ", dts=%" PRId64 ", size=%d", srs_info("hls: write audio codec=%d/%d, pts=%" PRId64 ", dts=%" PRId64 ", size=%d",
audio->pts, audio->dts, audio->PES_packet_length); acodec_, vcodec_, audio->pts, audio->dts, audio->PES_packet_length);
if ((err = context->encode(writer, audio, vcodec, acodec_)) != srs_success) { if ((err = context->encode(writer, audio, vcodec, acodec_)) != srs_success) {
return srs_error_wrap(err, "ts: write audio"); return srs_error_wrap(err, "ts: write audio acodec=%d, vcodec=%d", acodec_, vcodec);
} }
srs_info("hls encode audio ok"); srs_info("hls encode audio ok");
@ -2669,11 +2669,11 @@ srs_error_t SrsTsContextWriter::write_video(SrsTsMessage* video)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
srs_info("hls: write video pts=%" PRId64 ", dts=%" PRId64 ", size=%d", srs_info("hls: write video codec=%d/%d, pts=%" PRId64 ", dts=%" PRId64 ", size=%d",
video->pts, video->dts, video->PES_packet_length); acodec_, vcodec_, video->pts, video->dts, video->PES_packet_length);
if ((err = context->encode(writer, video, vcodec, acodec_)) != srs_success) { if ((err = context->encode(writer, video, vcodec, acodec_)) != srs_success) {
return srs_error_wrap(err, "ts: write video"); return srs_error_wrap(err, "ts: write video acodec=%d, vcodec=%d", acodec_, vcodec);
} }
srs_info("hls encode video ok"); srs_info("hls encode video ok");
@ -3105,7 +3105,7 @@ srs_error_t SrsTsTransmuxer::initialize(ISrsStreamWriter* fw)
srs_freep(tscw); srs_freep(tscw);
// TODO: FIXME: Support config the codec. // TODO: FIXME: Support config the codec.
tscw = new SrsTsContextWriter(fw, context, SrsAudioCodecIdAAC, SrsVideoCodecIdAVC); tscw = new SrsTsContextWriter(fw, context, SrsAudioCodecIdForbidden, SrsVideoCodecIdAVC);
return err; return err;
} }