Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-02-10 17:15:50 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d5e3ac4e7d830e617a6a503616bd8940928bf0aa
d5e3ac4e
1 parent
78885069
for #310, the aac profile must be object plus one. 1.0.26
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
9 行增加
和
1 行删除
README.md
trunk/src/app/srs_app_avc_aac.cpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
d5e3ac4
...
...
@@ -385,6 +385,7 @@ Supported operating systems and hardware:
## History
*
v1.0, 2015-02-10, for
[
#310
](
https://github.com/winlinvip/simple-rtmp-server/issues/310
)
, the aac profile must be object plus one. 1.0.26
*
v1.0, 2015-01-25, hotfix
[
#268
](
https://github.com/winlinvip/simple-rtmp-server/issues/268
)
, refine the pcr start at 0, dts/pts plus delay. 1.0.25
*
v1.0, 2015-01-25, hotfix
[
#151
](
https://github.com/winlinvip/simple-rtmp-server/issues/151
)
, refine pcr=dts-800ms and use dts/pts directly. 1.0.24
*
v1.0, 2015-01-23, hotfix
[
#151
](
https://github.com/winlinvip/simple-rtmp-server/issues/151
)
, use absolutely overflow to make jwplayer happy. 1.0.23
...
...
trunk/src/app/srs_app_avc_aac.cpp
查看文件 @
d5e3ac4
...
...
@@ -247,6 +247,13 @@ int SrsAvcAacCodec::audio_aac_demux(char* data, int size, SrsCodecSample* sample
return
ret
;
}
// the profile = object_id + 1
// @see aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 78,
// Table 1. A.9 ¨C MPEG-2 Audio profiles and MPEG-4 Audio object types
// so the aac_profile should plus 1, not minus 1, and nginx-rtmp used it to
// downcast aac SSR to LC.
// @see https://github.com/winlinvip/simple-rtmp-server/issues/310
// TODO: FIXME: fix the following in future version.
// aac_profile = audioObjectType - 1
aac_profile
--
;
...
...
trunk/src/core/srs_core.hpp
查看文件 @
d5e3ac4
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REVISION 2
5
#define VERSION_REVISION 2
6
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论