正在显示
3 个修改的文件
包含
3 行增加
和
2 行删除
@@ -389,6 +389,7 @@ Supported operating systems and hardware: | @@ -389,6 +389,7 @@ Supported operating systems and hardware: | ||
389 | 389 | ||
390 | ## History | 390 | ## History |
391 | 391 | ||
392 | +* v1.0, 2015-03-26, fix hls aac adts bug, in aac mux. 1.0.31. | ||
392 | * <strong>v1.0, 2015-03-19, [1.0r3 release(1.0.30)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r3) released. 59511 lines.</strong> | 393 | * <strong>v1.0, 2015-03-19, [1.0r3 release(1.0.30)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r3) released. 59511 lines.</strong> |
393 | * v1.0, 2015-03-17, remove the osx for 1.0.30. | 394 | * v1.0, 2015-03-17, remove the osx for 1.0.30. |
394 | * v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. | 395 | * v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. |
@@ -1192,7 +1192,7 @@ int SrsHlsCache::cache_audio(SrsAvcAacCodec* codec, SrsCodecSample* sample) | @@ -1192,7 +1192,7 @@ int SrsHlsCache::cache_audio(SrsAvcAacCodec* codec, SrsCodecSample* sample) | ||
1192 | // 6.2 Audio Data Transport Stream, ADTS | 1192 | // 6.2 Audio Data Transport Stream, ADTS |
1193 | // in aac-iso-13818-7.pdf, page 26. | 1193 | // in aac-iso-13818-7.pdf, page 26. |
1194 | // fixed 7bytes header | 1194 | // fixed 7bytes header |
1195 | - static u_int8_t adts_header[7] = {0xff, 0xf1, 0x00, 0x00, 0x00, 0x0f, 0xfc}; | 1195 | + static u_int8_t adts_header[7] = {0xff, 0xf9, 0x00, 0x00, 0x00, 0x0f, 0xfc}; |
1196 | /* | 1196 | /* |
1197 | // adts_fixed_header | 1197 | // adts_fixed_header |
1198 | // 2B, 16bits | 1198 | // 2B, 16bits |
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
31 | // current release version | 31 | // current release version |
32 | #define VERSION_MAJOR 1 | 32 | #define VERSION_MAJOR 1 |
33 | #define VERSION_MINOR 0 | 33 | #define VERSION_MINOR 0 |
34 | -#define VERSION_REVISION 30 | 34 | +#define VERSION_REVISION 31 |
35 | 35 | ||
36 | // server info. | 36 | // server info. |
37 | #define RTMP_SIG_SRS_KEY "SRS" | 37 | #define RTMP_SIG_SRS_KEY "SRS" |
-
请 注册 或 登录 后发表评论