Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
5d8cae45
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,发现更多精彩内容 >>
提交
5d8cae45
编写于
2月 23, 2015
作者:
M
Martin Storsjö
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rtpdec: Get rid of all trivial .alloc/.free functions
Signed-off-by:
N
Martin Storsjö
<
martin@martin.st
>
上级
e72605f8
变更
18
显示空白变更内容
内联
并排
Showing
18 changed file
with
19 addition
and
128 deletion
+19
-128
libavformat/rtpdec_ac3.c
libavformat/rtpdec_ac3.c
+1
-6
libavformat/rtpdec_amr.c
libavformat/rtpdec_amr.c
+0
-7
libavformat/rtpdec_asf.c
libavformat/rtpdec_asf.c
+1
-6
libavformat/rtpdec_dv.c
libavformat/rtpdec_dv.c
+1
-6
libavformat/rtpdec_h261.c
libavformat/rtpdec_h261.c
+1
-6
libavformat/rtpdec_h263_rfc2190.c
libavformat/rtpdec_h263_rfc2190.c
+1
-6
libavformat/rtpdec_h264.c
libavformat/rtpdec_h264.c
+1
-6
libavformat/rtpdec_hevc.c
libavformat/rtpdec_hevc.c
+1
-12
libavformat/rtpdec_jpeg.c
libavformat/rtpdec_jpeg.c
+1
-6
libavformat/rtpdec_latm.c
libavformat/rtpdec_latm.c
+1
-6
libavformat/rtpdec_mpa_robust.c
libavformat/rtpdec_mpa_robust.c
+1
-6
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_mpeg4.c
+2
-6
libavformat/rtpdec_mpegts.c
libavformat/rtpdec_mpegts.c
+1
-6
libavformat/rtpdec_qcelp.c
libavformat/rtpdec_qcelp.c
+1
-12
libavformat/rtpdec_qdm2.c
libavformat/rtpdec_qdm2.c
+1
-12
libavformat/rtpdec_qt.c
libavformat/rtpdec_qt.c
+1
-6
libavformat/rtpdec_svq3.c
libavformat/rtpdec_svq3.c
+1
-6
libavformat/rtpdec_xiph.c
libavformat/rtpdec_xiph.c
+2
-7
未找到文件。
libavformat/rtpdec_ac3.c
浏览文件 @
5d8cae45
...
...
@@ -31,11 +31,6 @@ struct PayloadContext {
AVIOContext
*
fragment
;
};
static
PayloadContext
*
ac3_new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
void
free_fragment
(
PayloadContext
*
data
)
{
if
(
data
->
fragment
)
{
...
...
@@ -142,7 +137,7 @@ RTPDynamicProtocolHandler ff_ac3_dynamic_handler = {
.
codec_type
=
AVMEDIA_TYPE_AUDIO
,
.
codec_id
=
AV_CODEC_ID_AC3
,
.
need_parsing
=
AVSTREAM_PARSE_FULL
,
.
alloc
=
ac3_new_context
,
.
priv_data_size
=
sizeof
(
PayloadContext
)
,
.
free
=
ac3_free_context
,
.
parse_packet
=
ac3_handle_packet
,
};
libavformat/rtpdec_amr.c
浏览文件 @
5d8cae45
...
...
@@ -47,11 +47,6 @@ static PayloadContext *amr_new_context(void)
return
data
;
}
static
void
amr_free_context
(
PayloadContext
*
data
)
{
av_free
(
data
);
}
static
int
amr_handle_packet
(
AVFormatContext
*
ctx
,
PayloadContext
*
data
,
AVStream
*
st
,
AVPacket
*
pkt
,
uint32_t
*
timestamp
,
const
uint8_t
*
buf
,
int
len
,
uint16_t
seq
,
...
...
@@ -196,7 +191,6 @@ RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler = {
.
codec_id
=
AV_CODEC_ID_AMR_NB
,
.
parse_sdp_a_line
=
amr_parse_sdp_line
,
.
alloc
=
amr_new_context
,
.
free
=
amr_free_context
,
.
parse_packet
=
amr_handle_packet
,
};
...
...
@@ -206,6 +200,5 @@ RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler = {
.
codec_id
=
AV_CODEC_ID_AMR_WB
,
.
parse_sdp_a_line
=
amr_parse_sdp_line
,
.
alloc
=
amr_new_context
,
.
free
=
amr_free_context
,
.
parse_packet
=
amr_handle_packet
,
};
libavformat/rtpdec_asf.c
浏览文件 @
5d8cae45
...
...
@@ -277,11 +277,6 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf,
return
res
==
1
?
-
1
:
res
;
}
static
PayloadContext
*
asfrtp_new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
void
asfrtp_free_context
(
PayloadContext
*
asf
)
{
if
(
asf
->
pktbuf
)
{
...
...
@@ -299,8 +294,8 @@ RTPDynamicProtocolHandler ff_ms_rtp_ ## n ## _handler = { \
.enc_name = s, \
.codec_type = t, \
.codec_id = AV_CODEC_ID_NONE, \
.priv_data_size = sizeof(PayloadContext), \
.parse_sdp_a_line = asfrtp_parse_sdp_line, \
.alloc = asfrtp_new_context, \
.free = asfrtp_free_context, \
.parse_packet = asfrtp_parse_packet, \
}
...
...
libavformat/rtpdec_dv.c
浏览文件 @
5d8cae45
...
...
@@ -31,11 +31,6 @@ struct PayloadContext {
int
bundled_audio
;
};
static
av_cold
PayloadContext
*
dv_new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
void
dv_free_dyn_buffer
(
AVIOContext
**
dyn_buf
)
{
uint8_t
*
ptr_dyn_buffer
;
...
...
@@ -150,7 +145,7 @@ RTPDynamicProtocolHandler ff_dv_dynamic_handler = {
.
codec_id
=
AV_CODEC_ID_DVVIDEO
,
.
need_parsing
=
AVSTREAM_PARSE_FULL
,
.
parse_sdp_a_line
=
dv_parse_sdp_line
,
.
alloc
=
dv_new_context
,
.
priv_data_size
=
sizeof
(
PayloadContext
)
,
.
free
=
dv_free_context
,
.
parse_packet
=
dv_handle_packet
,
};
libavformat/rtpdec_h261.c
浏览文件 @
5d8cae45
...
...
@@ -32,11 +32,6 @@ struct PayloadContext {
uint32_t
timestamp
;
};
static
av_cold
PayloadContext
*
h261_new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
void
h261_free_dyn_buffer
(
AVIOContext
**
dyn_buf
)
{
uint8_t
*
ptr_dyn_buffer
;
...
...
@@ -184,7 +179,7 @@ RTPDynamicProtocolHandler ff_h261_dynamic_handler = {
.
codec_type
=
AVMEDIA_TYPE_VIDEO
,
.
codec_id
=
AV_CODEC_ID_H261
,
.
need_parsing
=
AVSTREAM_PARSE_FULL
,
.
alloc
=
h261_new_context
,
.
priv_data_size
=
sizeof
(
PayloadContext
)
,
.
free
=
h261_free_context
,
.
parse_packet
=
h261_handle_packet
,
.
static_payload_id
=
31
,
...
...
libavformat/rtpdec_h263_rfc2190.c
浏览文件 @
5d8cae45
...
...
@@ -39,11 +39,6 @@ struct PayloadContext {
int
newformat
;
};
static
PayloadContext
*
h263_new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
void
h263_free_context
(
PayloadContext
*
data
)
{
if
(
!
data
)
...
...
@@ -202,7 +197,7 @@ RTPDynamicProtocolHandler ff_h263_rfc2190_dynamic_handler = {
.
codec_id
=
AV_CODEC_ID_H263
,
.
need_parsing
=
AVSTREAM_PARSE_FULL
,
.
parse_packet
=
h263_handle_packet
,
.
alloc
=
h263_new_context
,
.
priv_data_size
=
sizeof
(
PayloadContext
)
,
.
free
=
h263_free_context
,
.
static_payload_id
=
34
,
};
libavformat/rtpdec_h264.c
浏览文件 @
5d8cae45
...
...
@@ -342,11 +342,6 @@ static int h264_handle_packet(AVFormatContext *ctx, PayloadContext *data,
return
result
;
}
static
PayloadContext
*
h264_new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
void
h264_free_context
(
PayloadContext
*
data
)
{
#ifdef DEBUG
...
...
@@ -408,8 +403,8 @@ RTPDynamicProtocolHandler ff_h264_dynamic_handler = {
.
codec_type
=
AVMEDIA_TYPE_VIDEO
,
.
codec_id
=
AV_CODEC_ID_H264
,
.
need_parsing
=
AVSTREAM_PARSE_FULL
,
.
priv_data_size
=
sizeof
(
PayloadContext
),
.
parse_sdp_a_line
=
parse_h264_sdp_line
,
.
alloc
=
h264_new_context
,
.
free
=
h264_free_context
,
.
parse_packet
=
h264_handle_packet
,
};
libavformat/rtpdec_hevc.c
浏览文件 @
5d8cae45
...
...
@@ -43,16 +43,6 @@ struct PayloadContext {
static
const
uint8_t
start_sequence
[]
=
{
0x00
,
0x00
,
0x00
,
0x01
};
static
av_cold
PayloadContext
*
hevc_new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
av_cold
void
hevc_free_context
(
PayloadContext
*
data
)
{
av_free
(
data
);
}
static
av_cold
int
hevc_sdp_parse_fmtp_config
(
AVFormatContext
*
s
,
AVStream
*
stream
,
PayloadContext
*
hevc_data
,
...
...
@@ -405,8 +395,7 @@ RTPDynamicProtocolHandler ff_hevc_dynamic_handler = {
.
codec_type
=
AVMEDIA_TYPE_VIDEO
,
.
codec_id
=
AV_CODEC_ID_HEVC
,
.
need_parsing
=
AVSTREAM_PARSE_FULL
,
.
priv_data_size
=
sizeof
(
PayloadContext
),
.
parse_sdp_a_line
=
hevc_parse_sdp_line
,
.
alloc
=
hevc_new_context
,
.
free
=
hevc_free_context
,
.
parse_packet
=
hevc_handle_packet
,
};
libavformat/rtpdec_jpeg.c
浏览文件 @
5d8cae45
...
...
@@ -59,11 +59,6 @@ static const uint8_t default_quantizers[128] = {
99
,
99
,
99
,
99
,
99
,
99
,
99
,
99
};
static
PayloadContext
*
jpeg_new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
inline
void
free_frame
(
PayloadContext
*
jpeg
)
{
if
(
jpeg
->
frame
)
{
...
...
@@ -385,7 +380,7 @@ RTPDynamicProtocolHandler ff_jpeg_dynamic_handler = {
.
enc_name
=
"JPEG"
,
.
codec_type
=
AVMEDIA_TYPE_VIDEO
,
.
codec_id
=
AV_CODEC_ID_MJPEG
,
.
alloc
=
jpeg_new_context
,
.
priv_data_size
=
sizeof
(
PayloadContext
)
,
.
free
=
jpeg_free_context
,
.
parse_packet
=
jpeg_parse_packet
,
.
static_payload_id
=
26
,
...
...
libavformat/rtpdec_latm.c
浏览文件 @
5d8cae45
...
...
@@ -31,11 +31,6 @@ struct PayloadContext {
uint32_t
timestamp
;
};
static
PayloadContext
*
latm_new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
void
latm_free_context
(
PayloadContext
*
data
)
{
if
(
!
data
)
...
...
@@ -183,8 +178,8 @@ RTPDynamicProtocolHandler ff_mp4a_latm_dynamic_handler = {
.
enc_name
=
"MP4A-LATM"
,
.
codec_type
=
AVMEDIA_TYPE_AUDIO
,
.
codec_id
=
AV_CODEC_ID_AAC
,
.
priv_data_size
=
sizeof
(
PayloadContext
),
.
parse_sdp_a_line
=
latm_parse_sdp_line
,
.
alloc
=
latm_new_context
,
.
free
=
latm_free_context
,
.
parse_packet
=
latm_parse_packet
,
};
libavformat/rtpdec_mpa_robust.c
浏览文件 @
5d8cae45
...
...
@@ -33,11 +33,6 @@ struct PayloadContext {
AVIOContext
*
fragment
;
};
static
PayloadContext
*
mpa_robust_new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
inline
void
free_fragment
(
PayloadContext
*
data
)
{
if
(
data
->
fragment
)
{
...
...
@@ -209,7 +204,7 @@ RTPDynamicProtocolHandler ff_mpeg_audio_robust_dynamic_handler = {
.
codec_type
=
AVMEDIA_TYPE_AUDIO
,
.
codec_id
=
AV_CODEC_ID_MP3ADU
,
.
need_parsing
=
AVSTREAM_PARSE_HEADERS
,
.
alloc
=
mpa_robust_new_context
,
.
priv_data_size
=
sizeof
(
PayloadContext
)
,
.
free
=
mpa_robust_free_context
,
.
parse_packet
=
mpa_robust_parse_packet
,
};
libavformat/rtpdec_mpeg4.c
浏览文件 @
5d8cae45
...
...
@@ -91,11 +91,6 @@ static const AttrNameMap attr_names[] = {
{
NULL
,
-
1
,
-
1
},
};
static
PayloadContext
*
new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
void
free_context
(
PayloadContext
*
data
)
{
av_free
(
data
->
au_headers
);
...
...
@@ -326,6 +321,7 @@ RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = {
.
codec_type
=
AVMEDIA_TYPE_VIDEO
,
.
codec_id
=
AV_CODEC_ID_MPEG4
,
.
need_parsing
=
AVSTREAM_PARSE_FULL
,
.
priv_data_size
=
sizeof
(
PayloadContext
),
.
parse_sdp_a_line
=
parse_sdp_line
,
};
...
...
@@ -333,8 +329,8 @@ RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = {
.
enc_name
=
"mpeg4-generic"
,
.
codec_type
=
AVMEDIA_TYPE_AUDIO
,
.
codec_id
=
AV_CODEC_ID_AAC
,
.
priv_data_size
=
sizeof
(
PayloadContext
),
.
parse_sdp_a_line
=
parse_sdp_line
,
.
alloc
=
new_context
,
.
free
=
free_context
,
.
parse_packet
=
aac_parse_packet
,
};
libavformat/rtpdec_mpegts.c
浏览文件 @
5d8cae45
...
...
@@ -30,11 +30,6 @@ struct PayloadContext {
uint8_t
buf
[
RTP_MAX_PACKET_LENGTH
];
};
static
PayloadContext
*
mpegts_new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
void
mpegts_free_context
(
PayloadContext
*
data
)
{
if
(
!
data
)
...
...
@@ -100,8 +95,8 @@ static int mpegts_handle_packet(AVFormatContext *ctx, PayloadContext *data,
RTPDynamicProtocolHandler
ff_mpegts_dynamic_handler
=
{
.
codec_type
=
AVMEDIA_TYPE_DATA
,
.
priv_data_size
=
sizeof
(
PayloadContext
),
.
parse_packet
=
mpegts_handle_packet
,
.
alloc
=
mpegts_new_context
,
.
init
=
mpegts_init
,
.
free
=
mpegts_free_context
,
.
static_payload_id
=
33
,
...
...
libavformat/rtpdec_qcelp.c
浏览文件 @
5d8cae45
...
...
@@ -47,16 +47,6 @@ struct PayloadContext {
uint32_t
next_timestamp
;
};
static
PayloadContext
*
qcelp_new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
void
qcelp_free_context
(
PayloadContext
*
data
)
{
av_free
(
data
);
}
static
int
return_stored_frame
(
AVFormatContext
*
ctx
,
PayloadContext
*
data
,
AVStream
*
st
,
AVPacket
*
pkt
,
uint32_t
*
timestamp
,
const
uint8_t
*
buf
,
int
len
);
...
...
@@ -223,8 +213,7 @@ RTPDynamicProtocolHandler ff_qcelp_dynamic_handler = {
.
enc_name
=
"x-Purevoice"
,
.
codec_type
=
AVMEDIA_TYPE_AUDIO
,
.
codec_id
=
AV_CODEC_ID_QCELP
,
.
priv_data_size
=
sizeof
(
PayloadContext
),
.
static_payload_id
=
12
,
.
alloc
=
qcelp_new_context
,
.
free
=
qcelp_free_context
,
.
parse_packet
=
qcelp_parse_packet
,
};
libavformat/rtpdec_qdm2.c
浏览文件 @
5d8cae45
...
...
@@ -298,21 +298,10 @@ static int qdm2_parse_packet(AVFormatContext *s, PayloadContext *qdm,
return
(
qdm
->
cache
>
0
)
?
1
:
0
;
}
static
PayloadContext
*
qdm2_extradata_new
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
void
qdm2_extradata_free
(
PayloadContext
*
qdm
)
{
av_free
(
qdm
);
}
RTPDynamicProtocolHandler
ff_qdm2_dynamic_handler
=
{
.
enc_name
=
"X-QDM"
,
.
codec_type
=
AVMEDIA_TYPE_AUDIO
,
.
codec_id
=
AV_CODEC_ID_NONE
,
.
alloc
=
qdm2_extradata_new
,
.
free
=
qdm2_extradata_free
,
.
priv_data_size
=
sizeof
(
PayloadContext
),
.
parse_packet
=
qdm2_parse_packet
,
};
libavformat/rtpdec_qt.c
浏览文件 @
5d8cae45
...
...
@@ -235,11 +235,6 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt,
}
}
static
PayloadContext
*
qt_rtp_new
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
void
qt_rtp_free
(
PayloadContext
*
qt
)
{
av_freep
(
&
qt
->
pkt
.
data
);
...
...
@@ -251,7 +246,7 @@ RTPDynamicProtocolHandler ff_ ## m ## _rtp_ ## n ## _handler = { \
.enc_name = s, \
.codec_type = t, \
.codec_id = AV_CODEC_ID_NONE, \
.
alloc = qt_rtp_new,
\
.
priv_data_size = sizeof(PayloadContext),
\
.free = qt_rtp_free, \
.parse_packet = qt_rtp_parse_packet, \
}
...
...
libavformat/rtpdec_svq3.c
浏览文件 @
5d8cae45
...
...
@@ -109,11 +109,6 @@ static int svq3_parse_packet (AVFormatContext *s, PayloadContext *sv,
return
AVERROR
(
EAGAIN
);
}
static
PayloadContext
*
svq3_extradata_new
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
void
svq3_extradata_free
(
PayloadContext
*
sv
)
{
if
(
sv
->
pktbuf
)
{
...
...
@@ -128,7 +123,7 @@ RTPDynamicProtocolHandler ff_svq3_dynamic_handler = {
.
enc_name
=
"X-SV3V-ES"
,
.
codec_type
=
AVMEDIA_TYPE_VIDEO
,
.
codec_id
=
AV_CODEC_ID_NONE
,
// see if (config_packet) above
.
alloc
=
svq3_extradata_new
,
.
priv_data_size
=
sizeof
(
PayloadContext
)
,
.
free
=
svq3_extradata_free
,
.
parse_packet
=
svq3_parse_packet
,
};
libavformat/rtpdec_xiph.c
浏览文件 @
5d8cae45
...
...
@@ -49,11 +49,6 @@ struct PayloadContext {
int
split_pkts
;
};
static
PayloadContext
*
xiph_new_context
(
void
)
{
return
av_mallocz
(
sizeof
(
PayloadContext
));
}
static
inline
void
free_fragment
(
PayloadContext
*
data
)
{
if
(
data
->
fragment
)
{
...
...
@@ -385,8 +380,8 @@ RTPDynamicProtocolHandler ff_theora_dynamic_handler = {
.
enc_name
=
"theora"
,
.
codec_type
=
AVMEDIA_TYPE_VIDEO
,
.
codec_id
=
AV_CODEC_ID_THEORA
,
.
priv_data_size
=
sizeof
(
PayloadContext
),
.
parse_sdp_a_line
=
xiph_parse_sdp_line
,
.
alloc
=
xiph_new_context
,
.
free
=
xiph_free_context
,
.
parse_packet
=
xiph_handle_packet
,
};
...
...
@@ -396,8 +391,8 @@ RTPDynamicProtocolHandler ff_vorbis_dynamic_handler = {
.
codec_type
=
AVMEDIA_TYPE_AUDIO
,
.
codec_id
=
AV_CODEC_ID_VORBIS
,
.
need_parsing
=
AVSTREAM_PARSE_HEADERS
,
.
priv_data_size
=
sizeof
(
PayloadContext
),
.
parse_sdp_a_line
=
xiph_parse_sdp_line
,
.
alloc
=
xiph_new_context
,
.
free
=
xiph_free_context
,
.
parse_packet
=
xiph_handle_packet
,
};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录