Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
2a322906
Commit
2a322906
authored
Apr 07, 2020
by
phunkyfish
Committed by
Marton Balint
Apr 19, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/rtp: Pass sources and block filter addresses via sdp file for rtp
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
18d69e9a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
9 deletions
+39
-9
rtsp.c
libavformat/rtsp.c
+39
-9
No files found.
libavformat/rtsp.c
View file @
2a322906
...
...
@@ -21,6 +21,7 @@
#include "libavutil/avassert.h"
#include "libavutil/base64.h"
#include "libavutil/bprint.h"
#include "libavutil/avstring.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h"
...
...
@@ -2447,7 +2448,7 @@ static int rtp_probe(const AVProbeData *p)
static
int
rtp_read_header
(
AVFormatContext
*
s
)
{
uint8_t
recvbuf
[
RTP_MAX_PACKET_LENGTH
];
char
host
[
500
],
sdp
[
5
00
];
char
host
[
500
],
filters_buf
[
10
00
];
int
ret
,
port
;
URLContext
*
in
=
NULL
;
int
payload_type
;
...
...
@@ -2456,6 +2457,8 @@ static int rtp_read_header(AVFormatContext *s)
AVIOContext
pb
;
socklen_t
addrlen
=
sizeof
(
addr
);
RTSPState
*
rt
=
s
->
priv_data
;
const
char
*
p
;
AVBPrint
sdp
;
if
(
!
ff_network_init
())
return
AVERROR
(
EIO
);
...
...
@@ -2513,16 +2516,38 @@ static int rtp_read_header(AVFormatContext *s)
av_url_split
(
NULL
,
0
,
NULL
,
0
,
host
,
sizeof
(
host
),
&
port
,
NULL
,
0
,
s
->
url
);
snprintf
(
sdp
,
sizeof
(
sdp
),
"v=0
\r\n
c=IN IP%d %s
\r\n
m=%s %d RTP/AVP %d
\r\n
"
,
addr
.
ss_family
==
AF_INET
?
4
:
6
,
host
,
par
->
codec_type
==
AVMEDIA_TYPE_DATA
?
"application"
:
par
->
codec_type
==
AVMEDIA_TYPE_VIDEO
?
"video"
:
"audio"
,
port
,
payload_type
);
av_log
(
s
,
AV_LOG_VERBOSE
,
"SDP:
\n
%s
\n
"
,
sdp
);
av_bprint_init
(
&
sdp
,
0
,
AV_BPRINT_SIZE_UNLIMITED
);
av_bprintf
(
&
sdp
,
"v=0
\r\n
c=IN IP%d %s
\r\n
"
,
addr
.
ss_family
==
AF_INET
?
4
:
6
,
host
);
p
=
strchr
(
s
->
url
,
'?'
);
if
(
p
)
{
static
const
char
*
filters
[][
2
]
=
{{
"sources"
,
"incl"
},
{
"block"
,
"excl"
},
{
NULL
,
NULL
}};
int
i
;
char
*
q
;
for
(
i
=
0
;
filters
[
i
][
0
];
i
++
)
{
if
(
av_find_info_tag
(
filters_buf
,
sizeof
(
filters_buf
),
filters
[
i
][
0
],
p
))
{
q
=
filters_buf
;
while
((
q
=
strchr
(
q
,
','
))
!=
NULL
)
*
q
=
' '
;
av_bprintf
(
&
sdp
,
"a=source-filter:%s IN IP%d %s %s
\r\n
"
,
filters
[
i
][
1
],
addr
.
ss_family
==
AF_INET
?
4
:
6
,
host
,
filters_buf
);
}
}
}
av_bprintf
(
&
sdp
,
"m=%s %d RTP/AVP %d
\r\n
"
,
par
->
codec_type
==
AVMEDIA_TYPE_DATA
?
"application"
:
par
->
codec_type
==
AVMEDIA_TYPE_VIDEO
?
"video"
:
"audio"
,
port
,
payload_type
);
av_log
(
s
,
AV_LOG_VERBOSE
,
"SDP:
\n
%s
\n
"
,
sdp
.
str
);
if
(
!
av_bprint_is_complete
(
&
sdp
))
goto
fail_nobuf
;
avcodec_parameters_free
(
&
par
);
ffio_init_context
(
&
pb
,
sdp
,
strlen
(
sdp
)
,
0
,
NULL
,
NULL
,
NULL
,
NULL
);
ffio_init_context
(
&
pb
,
sdp
.
str
,
sdp
.
len
,
0
,
NULL
,
NULL
,
NULL
,
NULL
);
s
->
pb
=
&
pb
;
/* sdp_read_header initializes this again */
...
...
@@ -2532,9 +2557,14 @@ static int rtp_read_header(AVFormatContext *s)
ret
=
sdp_read_header
(
s
);
s
->
pb
=
NULL
;
av_bprint_finalize
(
&
sdp
,
NULL
);
return
ret
;
fail_nobuf:
ret
=
AVERROR
(
ENOMEM
);
av_log
(
s
,
AV_LOG_ERROR
,
"rtp_read_header(): not enough buffer space for sdp-headers
\n
"
);
fail:
av_bprint_finalize
(
&
sdp
,
NULL
);
avcodec_parameters_free
(
&
par
);
if
(
in
)
ffurl_close
(
in
);
...
...
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