Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
d6b9da11
Commit
d6b9da11
authored
12 years ago
by
Jordi Ortiz
Committed by
Martin Storsjö
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
avio: add (ff)url_get_multi_file_handle() for getting more than one fd
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
2e8f3cbc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libavformat/avio.c
+15
-0
15 additions, 0 deletions
libavformat/avio.c
libavformat/rtpproto.c
+22
-8
22 additions, 8 deletions
libavformat/rtpproto.c
libavformat/url.h
+9
-0
9 additions, 0 deletions
libavformat/url.h
with
46 additions
and
8 deletions
libavformat/avio.c
+
15
−
0
View file @
d6b9da11
...
...
@@ -344,6 +344,21 @@ int ffurl_get_file_handle(URLContext *h)
return
h
->
prot
->
url_get_file_handle
(
h
);
}
int
ffurl_get_multi_file_handle
(
URLContext
*
h
,
int
**
handles
,
int
*
numhandles
)
{
if
(
!
h
->
prot
->
url_get_multi_file_handle
)
{
if
(
!
h
->
prot
->
url_get_file_handle
)
return
AVERROR
(
ENOSYS
);
*
handles
=
av_malloc
(
sizeof
(
*
handles
));
if
(
!*
handles
)
return
AVERROR
(
ENOMEM
);
*
numhandles
=
1
;
*
handles
[
0
]
=
h
->
prot
->
url_get_file_handle
(
h
);
return
0
;
}
return
h
->
prot
->
url_get_multi_file_handle
(
h
,
handles
,
numhandles
);
}
int
ffurl_shutdown
(
URLContext
*
h
,
int
flags
)
{
if
(
!
h
->
prot
->
url_shutdown
)
...
...
This diff is collapsed.
Click to expand it.
libavformat/rtpproto.c
+
22
−
8
View file @
d6b9da11
...
...
@@ -320,13 +320,27 @@ int ff_rtp_get_rtcp_file_handle(URLContext *h) {
return
s
->
rtcp_fd
;
}
static
int
rtp_get_multi_file_handle
(
URLContext
*
h
,
int
**
handles
,
int
*
numhandles
)
{
RTPContext
*
s
=
h
->
priv_data
;
int
*
hs
=
*
handles
=
av_malloc
(
sizeof
(
**
handles
)
*
2
);
if
(
!
hs
)
return
AVERROR
(
ENOMEM
);
hs
[
0
]
=
s
->
rtp_fd
;
hs
[
1
]
=
s
->
rtcp_fd
;
*
numhandles
=
2
;
return
0
;
}
URLProtocol
ff_rtp_protocol
=
{
.
name
=
"rtp"
,
.
url_open
=
rtp_open
,
.
url_read
=
rtp_read
,
.
url_write
=
rtp_write
,
.
url_close
=
rtp_close
,
.
url_get_file_handle
=
rtp_get_file_handle
,
.
priv_data_size
=
sizeof
(
RTPContext
),
.
flags
=
URL_PROTOCOL_FLAG_NETWORK
,
.
name
=
"rtp"
,
.
url_open
=
rtp_open
,
.
url_read
=
rtp_read
,
.
url_write
=
rtp_write
,
.
url_close
=
rtp_close
,
.
url_get_file_handle
=
rtp_get_file_handle
,
.
url_get_multi_file_handle
=
rtp_get_multi_file_handle
,
.
priv_data_size
=
sizeof
(
RTPContext
),
.
flags
=
URL_PROTOCOL_FLAG_NETWORK
,
};
This diff is collapsed.
Click to expand it.
libavformat/url.h
+
9
−
0
View file @
d6b9da11
...
...
@@ -81,6 +81,8 @@ typedef struct URLProtocol {
int64_t
(
*
url_read_seek
)(
URLContext
*
h
,
int
stream_index
,
int64_t
timestamp
,
int
flags
);
int
(
*
url_get_file_handle
)(
URLContext
*
h
);
int
(
*
url_get_multi_file_handle
)(
URLContext
*
h
,
int
**
handles
,
int
*
numhandles
);
int
(
*
url_shutdown
)(
URLContext
*
h
,
int
flags
);
int
priv_data_size
;
const
AVClass
*
priv_data_class
;
...
...
@@ -201,6 +203,13 @@ int64_t ffurl_size(URLContext *h);
*/
int
ffurl_get_file_handle
(
URLContext
*
h
);
/**
* Return the file descriptors associated with this URL.
*
* @return 0 on success or <0 on error.
*/
int
ffurl_get_multi_file_handle
(
URLContext
*
h
,
int
**
handles
,
int
*
numhandles
);
/**
* Signal the URLContext that we are done reading or writing the stream.
*
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment