Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
c44784c9
Commit
c44784c9
authored
Jan 11, 2013
by
Martin Storsjö
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rtp: Rename a static variable to normal naming conventions
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
58b59718
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
24 deletions
+24
-24
rtp.c
libavformat/rtp.c
+24
-24
No files found.
libavformat/rtp.c
View file @
c44784c9
...
...
@@ -37,7 +37,7 @@ static const struct {
enum
AVCodecID
codec_id
;
int
clock_rate
;
int
audio_channels
;
}
AVRtpPayloadT
ypes
[]
=
{
}
rtp_payload_t
ypes
[]
=
{
{
0
,
"PCMU"
,
AVMEDIA_TYPE_AUDIO
,
AV_CODEC_ID_PCM_MULAW
,
8000
,
1
},
{
3
,
"GSM"
,
AVMEDIA_TYPE_AUDIO
,
AV_CODEC_ID_NONE
,
8000
,
1
},
{
4
,
"G723"
,
AVMEDIA_TYPE_AUDIO
,
AV_CODEC_ID_G723_1
,
8000
,
1
},
...
...
@@ -71,15 +71,15 @@ int ff_rtp_get_codec_info(AVCodecContext *codec, int payload_type)
{
int
i
=
0
;
for
(
i
=
0
;
AVRtpPayloadT
ypes
[
i
].
pt
>=
0
;
i
++
)
if
(
AVRtpPayloadT
ypes
[
i
].
pt
==
payload_type
)
{
if
(
AVRtpPayloadT
ypes
[
i
].
codec_id
!=
AV_CODEC_ID_NONE
)
{
codec
->
codec_type
=
AVRtpPayloadT
ypes
[
i
].
codec_type
;
codec
->
codec_id
=
AVRtpPayloadT
ypes
[
i
].
codec_id
;
if
(
AVRtpPayloadT
ypes
[
i
].
audio_channels
>
0
)
codec
->
channels
=
AVRtpPayloadT
ypes
[
i
].
audio_channels
;
if
(
AVRtpPayloadT
ypes
[
i
].
clock_rate
>
0
)
codec
->
sample_rate
=
AVRtpPayloadT
ypes
[
i
].
clock_rate
;
for
(
i
=
0
;
rtp_payload_t
ypes
[
i
].
pt
>=
0
;
i
++
)
if
(
rtp_payload_t
ypes
[
i
].
pt
==
payload_type
)
{
if
(
rtp_payload_t
ypes
[
i
].
codec_id
!=
AV_CODEC_ID_NONE
)
{
codec
->
codec_type
=
rtp_payload_t
ypes
[
i
].
codec_type
;
codec
->
codec_id
=
rtp_payload_t
ypes
[
i
].
codec_id
;
if
(
rtp_payload_t
ypes
[
i
].
audio_channels
>
0
)
codec
->
channels
=
rtp_payload_t
ypes
[
i
].
audio_channels
;
if
(
rtp_payload_t
ypes
[
i
].
clock_rate
>
0
)
codec
->
sample_rate
=
rtp_payload_t
ypes
[
i
].
clock_rate
;
return
0
;
}
}
...
...
@@ -101,8 +101,8 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt,
}
/* static payload type */
for
(
i
=
0
;
AVRtpPayloadT
ypes
[
i
].
pt
>=
0
;
++
i
)
if
(
AVRtpPayloadT
ypes
[
i
].
codec_id
==
codec
->
codec_id
)
{
for
(
i
=
0
;
rtp_payload_t
ypes
[
i
].
pt
>=
0
;
++
i
)
if
(
rtp_payload_t
ypes
[
i
].
codec_id
==
codec
->
codec_id
)
{
if
(
codec
->
codec_id
==
AV_CODEC_ID_H263
&&
(
!
fmt
||
!
fmt
->
oformat
->
priv_class
||
!
av_opt_flag_is_set
(
fmt
->
priv_data
,
"rtpflags"
,
"rfc2190"
)))
...
...
@@ -111,14 +111,14 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt,
* see section 4.5.2 in RFC 3551. */
if
(
codec
->
codec_id
==
AV_CODEC_ID_ADPCM_G722
&&
codec
->
sample_rate
==
16000
&&
codec
->
channels
==
1
)
return
AVRtpPayloadT
ypes
[
i
].
pt
;
return
rtp_payload_t
ypes
[
i
].
pt
;
if
(
codec
->
codec_type
==
AVMEDIA_TYPE_AUDIO
&&
((
AVRtpPayloadT
ypes
[
i
].
clock_rate
>
0
&&
codec
->
sample_rate
!=
AVRtpPayloadT
ypes
[
i
].
clock_rate
)
||
(
AVRtpPayloadT
ypes
[
i
].
audio_channels
>
0
&&
codec
->
channels
!=
AVRtpPayloadT
ypes
[
i
].
audio_channels
)))
((
rtp_payload_t
ypes
[
i
].
clock_rate
>
0
&&
codec
->
sample_rate
!=
rtp_payload_t
ypes
[
i
].
clock_rate
)
||
(
rtp_payload_t
ypes
[
i
].
audio_channels
>
0
&&
codec
->
channels
!=
rtp_payload_t
ypes
[
i
].
audio_channels
)))
continue
;
return
AVRtpPayloadT
ypes
[
i
].
pt
;
return
rtp_payload_t
ypes
[
i
].
pt
;
}
if
(
idx
<
0
)
...
...
@@ -132,9 +132,9 @@ const char *ff_rtp_enc_name(int payload_type)
{
int
i
;
for
(
i
=
0
;
AVRtpPayloadT
ypes
[
i
].
pt
>=
0
;
i
++
)
if
(
AVRtpPayloadT
ypes
[
i
].
pt
==
payload_type
)
return
AVRtpPayloadT
ypes
[
i
].
enc_name
;
for
(
i
=
0
;
rtp_payload_t
ypes
[
i
].
pt
>=
0
;
i
++
)
if
(
rtp_payload_t
ypes
[
i
].
pt
==
payload_type
)
return
rtp_payload_t
ypes
[
i
].
enc_name
;
return
""
;
}
...
...
@@ -143,9 +143,9 @@ enum AVCodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type)
{
int
i
;
for
(
i
=
0
;
AVRtpPayloadT
ypes
[
i
].
pt
>=
0
;
i
++
)
if
(
!
strcmp
(
buf
,
AVRtpPayloadTypes
[
i
].
enc_name
)
&&
(
codec_type
==
AVRtpPayloadT
ypes
[
i
].
codec_type
))
return
AVRtpPayloadT
ypes
[
i
].
codec_id
;
for
(
i
=
0
;
rtp_payload_t
ypes
[
i
].
pt
>=
0
;
i
++
)
if
(
!
strcmp
(
buf
,
rtp_payload_types
[
i
].
enc_name
)
&&
(
codec_type
==
rtp_payload_t
ypes
[
i
].
codec_type
))
return
rtp_payload_t
ypes
[
i
].
codec_id
;
return
AV_CODEC_ID_NONE
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment