Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
3567b91e
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3567b91e
编写于
2月 23, 2015
作者:
M
Martin Storsjö
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rtpdec_hevc: Share the implementation of fragmented packets with h264
Signed-off-by:
N
Martin Storsjö
<
martin@martin.st
>
上级
f3449062
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
35 deletion
+29
-35
libavformat/rtpdec_formats.h
libavformat/rtpdec_formats.h
+3
-0
libavformat/rtpdec_h264.c
libavformat/rtpdec_h264.c
+24
-17
libavformat/rtpdec_hevc.c
libavformat/rtpdec_hevc.c
+2
-18
未找到文件。
libavformat/rtpdec_formats.h
浏览文件 @
3567b91e
...
...
@@ -42,6 +42,9 @@ int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, AVPacket *pkt,
const
uint8_t
*
buf
,
int
len
,
int
start_skip
,
int
*
nal_counters
,
int
nal_mask
);
int
ff_h264_handle_frag_packet
(
AVPacket
*
pkt
,
const
uint8_t
*
buf
,
int
len
,
int
start_bit
,
const
uint8_t
*
nal_header
,
int
nal_header_len
);
void
ff_h264_parse_framesize
(
AVCodecContext
*
codec
,
const
char
*
p
);
extern
RTPDynamicProtocolHandler
ff_ac3_dynamic_handler
;
...
...
libavformat/rtpdec_h264.c
浏览文件 @
3567b91e
...
...
@@ -257,12 +257,32 @@ int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, AVPacket *pkt,
return
0
;
}
int
ff_h264_handle_frag_packet
(
AVPacket
*
pkt
,
const
uint8_t
*
buf
,
int
len
,
int
start_bit
,
const
uint8_t
*
nal_header
,
int
nal_header_len
)
{
int
ret
;
int
tot_len
=
len
;
int
pos
=
0
;
if
(
start_bit
)
tot_len
+=
sizeof
(
start_sequence
)
+
nal_header_len
;
if
((
ret
=
av_new_packet
(
pkt
,
tot_len
))
<
0
)
return
ret
;
if
(
start_bit
)
{
memcpy
(
pkt
->
data
+
pos
,
start_sequence
,
sizeof
(
start_sequence
));
pos
+=
sizeof
(
start_sequence
);
memcpy
(
pkt
->
data
+
pos
,
nal_header
,
nal_header_len
);
pos
+=
nal_header_len
;
}
memcpy
(
pkt
->
data
+
pos
,
buf
,
len
);
return
0
;
}
static
int
h264_handle_packet_fu_a
(
AVFormatContext
*
ctx
,
AVPacket
*
pkt
,
const
uint8_t
*
buf
,
int
len
,
int
*
nal_counters
,
int
nal_mask
)
{
uint8_t
fu_indicator
,
fu_header
,
start_bit
,
nal_type
,
nal
;
int
ret
;
if
(
len
<
3
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Too short data for FU-A H264 RTP packet
\n
"
);
...
...
@@ -279,22 +299,9 @@ static int h264_handle_packet_fu_a(AVFormatContext *ctx, AVPacket *pkt,
buf
+=
2
;
len
-=
2
;
if
(
start_bit
)
{
if
(
nal_counters
)
nal_counters
[
nal_type
&
nal_mask
]
++
;
/* copy in the start sequence, and the reconstructed nal */
if
((
ret
=
av_new_packet
(
pkt
,
sizeof
(
start_sequence
)
+
sizeof
(
nal
)
+
len
))
<
0
)
return
ret
;
memcpy
(
pkt
->
data
,
start_sequence
,
sizeof
(
start_sequence
));
pkt
->
data
[
sizeof
(
start_sequence
)]
=
nal
;
memcpy
(
pkt
->
data
+
sizeof
(
start_sequence
)
+
sizeof
(
nal
),
buf
,
len
);
}
else
{
if
((
ret
=
av_new_packet
(
pkt
,
len
))
<
0
)
return
ret
;
memcpy
(
pkt
->
data
,
buf
,
len
);
}
return
0
;
if
(
start_bit
&&
nal_counters
)
nal_counters
[
nal_type
&
nal_mask
]
++
;
return
ff_h264_handle_frag_packet
(
pkt
,
buf
,
len
,
start_bit
,
&
nal
,
1
);
}
// return 0 on packet, no more left, 1 on packet, 1 on partial packet
...
...
libavformat/rtpdec_hevc.c
浏览文件 @
3567b91e
...
...
@@ -331,24 +331,8 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx
new_nal_header
[
0
]
=
(
rtp_pl
[
0
]
&
0x81
)
|
(
fu_type
<<
1
);
new_nal_header
[
1
]
=
rtp_pl
[
1
];
/* start fragment vs. subsequent fragments */
if
(
first_fragment
)
{
/* create A/V packet which is big enough */
if
((
res
=
av_new_packet
(
pkt
,
sizeof
(
start_sequence
)
+
sizeof
(
new_nal_header
)
+
len
))
<
0
)
return
res
;
/* A/V packet: copy start sequence */
memcpy
(
pkt
->
data
,
start_sequence
,
sizeof
(
start_sequence
));
/* A/V packet: copy new NAL header */
memcpy
(
pkt
->
data
+
sizeof
(
start_sequence
),
new_nal_header
,
sizeof
(
new_nal_header
));
/* A/V packet: copy NAL unit data */
memcpy
(
pkt
->
data
+
sizeof
(
start_sequence
)
+
sizeof
(
new_nal_header
),
buf
,
len
);
}
else
{
/* create A/V packet */
if
((
res
=
av_new_packet
(
pkt
,
len
))
<
0
)
return
res
;
/* A/V packet: copy NAL unit data */
memcpy
(
pkt
->
data
,
buf
,
len
);
}
res
=
ff_h264_handle_frag_packet
(
pkt
,
buf
,
len
,
first_fragment
,
new_nal_header
,
sizeof
(
new_nal_header
));
break
;
/* PACI packet */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录