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
胡斌
2017-06-07 17:40:58 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
1bc684b849cd2ecef1fd59396ba79f6bad71ec04
1bc684b8
1 parent
28057db4
adjust the timecode when transcode speex to aac
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
10 行增加
和
4 行删除
trunk/src/app/srs_app_source.cpp
trunk/src/transcode/srs_tc_aec_aac.cpp
trunk/src/transcode/srs_tc_av_codec.hpp
trunk/src/app/srs_app_source.cpp
查看文件 @
1bc684b
...
...
@@ -1737,12 +1737,13 @@ int SrsSource::on_audio(SrsCommonMessage* shared_audio)
shared_audio
->
payload
=
new
char
[
1024
];
out_size
=
1022
;
int
ret_aac
=
aec_aac
.
encode_frame
((
tc_audio_opt
*
)
_aac_opt
,
out_data
,
(
uint8_t
*
)
shared_audio
->
payload
+
2
,
&
out_size
);
int
ret_aac
=
aec_aac
.
encode_frame
((
tc_audio_opt
*
)
_aac_opt
,
out_data
,
(
uint8_t
*
)
shared_audio
->
payload
+
2
,
&
out_size
,
&
(
shared_audio
->
header
.
timestamp
)
);
if
(
ret_aac
>=
0
){
if
(
out_size
){
shared_audio
->
payload
[
0
]
=
0xAF
;
shared_audio
->
payload
[
1
]
=
0x01
;
shared_audio
->
size
=
out_size
+
2
;
ret
=
_on_audio
(
shared_audio
);
#if 0
static int max_out_size = 0;
...
...
trunk/src/transcode/srs_tc_aec_aac.cpp
查看文件 @
1bc684b
...
...
@@ -130,7 +130,7 @@ static int open_codec_aac(tc_audio_opt* opt) {
}
static
int
encode_frame_aac
(
tc_audio_opt
*
opt
,
uint8_t
*
inData
,
uint8_t
*
inOutData
,
uint32_t
*
inOutDataSize
)
{
static
int
encode_frame_aac
(
tc_audio_opt
*
opt
,
uint8_t
*
inData
,
uint8_t
*
inOutData
,
uint32_t
*
inOutDataSize
,
int64_t
*
inoutTimeStamp
)
{
handle_aec_aac_t
*
s
=
(
handle_aec_aac_t
*
)
opt
->
handle
;
AACENC_BufDesc
in_buf
=
{
0
},
out_buf
=
{
0
};
...
...
@@ -179,6 +179,11 @@ static int encode_frame_aac(tc_audio_opt* opt, uint8_t* inData, uint8_t* inOutDa
*
inOutDataSize
=
out_args
.
numOutBytes
;
memcpy
(
s
->
buf
,
inData
+
2048
-
s
->
data_len
,
opt
->
buffer_size
-
(
2048
-
s
->
data_len
));
//shfit time stamp to the length of s->data_len
//1000ms / 16000 = 0.0625
*
inoutTimeStamp
=
*
inoutTimeStamp
-
(
s
->
data_len
*
0.0625
/
2
);
s
->
data_len
=
opt
->
buffer_size
-
(
2048
-
s
->
data_len
);
}
...
...
trunk/src/transcode/srs_tc_av_codec.hpp
查看文件 @
1bc684b
...
...
@@ -33,8 +33,8 @@ typedef struct {
int
(
*
open_codec
)(
tc_audio_opt
*
opt
);
int
(
*
decode_frame
)(
tc_audio_opt
*
opt
,
uint8_t
*
inData
,
uint32_t
inDataSize
,
uint8_t
*
outData
);
int
(
*
encode_frame
)(
tc_audio_opt
*
opt
,
uint8_t
*
inData
,
uint8_t
*
inoutData
,
uint32_t
*
inoutDataSize
);
//inoutTimeStamp is in ms
int
(
*
encode_frame
)(
tc_audio_opt
*
opt
,
uint8_t
*
inData
,
uint8_t
*
inoutData
,
uint32_t
*
inoutDataSize
,
int64_t
*
inoutTimeStamp
);
int
(
*
close_codec
)(
tc_audio_opt
*
opt
);
...
...
请
注册
或
登录
后发表评论