Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
e06b1ba7
Commit
e06b1ba7
authored
May 03, 2022
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/libzmq: Improve r redundancy in occured
Reviewed-by:
"mypopy@gmail.com"
<
mypopy@gmail.com
>
parent
0a3e1217
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
libzmq.c
libavformat/libzmq.c
+9
-9
No files found.
libavformat/libzmq.c
View file @
e06b1ba7
...
@@ -51,7 +51,7 @@ static int zmq_proto_wait(URLContext *h, void *socket, int write)
...
@@ -51,7 +51,7 @@ static int zmq_proto_wait(URLContext *h, void *socket, int write)
zmq_pollitem_t
items
=
{
.
socket
=
socket
,
.
fd
=
0
,
.
events
=
ev
,
.
revents
=
0
};
zmq_pollitem_t
items
=
{
.
socket
=
socket
,
.
fd
=
0
,
.
events
=
ev
,
.
revents
=
0
};
ret
=
zmq_poll
(
&
items
,
1
,
POLLING_TIME
);
ret
=
zmq_poll
(
&
items
,
1
,
POLLING_TIME
);
if
(
ret
==
-
1
)
{
if
(
ret
==
-
1
)
{
av_log
(
h
,
AV_LOG_ERROR
,
"Error occured during zmq_poll(): %s
\n
"
,
ZMQ_STRERROR
);
av_log
(
h
,
AV_LOG_ERROR
,
"Error occur
r
ed during zmq_poll(): %s
\n
"
,
ZMQ_STRERROR
);
return
AVERROR_EXTERNAL
;
return
AVERROR_EXTERNAL
;
}
}
return
items
.
revents
&
ev
?
0
:
AVERROR
(
EAGAIN
);
return
items
.
revents
&
ev
?
0
:
AVERROR
(
EAGAIN
);
...
@@ -90,7 +90,7 @@ static int zmq_proto_open(URLContext *h, const char *uri, int flags)
...
@@ -90,7 +90,7 @@ static int zmq_proto_open(URLContext *h, const char *uri, int flags)
s
->
context
=
zmq_ctx_new
();
s
->
context
=
zmq_ctx_new
();
if
(
!
s
->
context
)
{
if
(
!
s
->
context
)
{
/*errno not set on failure during zmq_ctx_new()*/
/*errno not set on failure during zmq_ctx_new()*/
av_log
(
h
,
AV_LOG_ERROR
,
"Error occured during zmq_ctx_new()
\n
"
);
av_log
(
h
,
AV_LOG_ERROR
,
"Error occur
r
ed during zmq_ctx_new()
\n
"
);
return
AVERROR_EXTERNAL
;
return
AVERROR_EXTERNAL
;
}
}
...
@@ -100,13 +100,13 @@ static int zmq_proto_open(URLContext *h, const char *uri, int flags)
...
@@ -100,13 +100,13 @@ static int zmq_proto_open(URLContext *h, const char *uri, int flags)
if
(
h
->
flags
&
AVIO_FLAG_WRITE
)
{
if
(
h
->
flags
&
AVIO_FLAG_WRITE
)
{
s
->
socket
=
zmq_socket
(
s
->
context
,
ZMQ_PUB
);
s
->
socket
=
zmq_socket
(
s
->
context
,
ZMQ_PUB
);
if
(
!
s
->
socket
)
{
if
(
!
s
->
socket
)
{
av_log
(
h
,
AV_LOG_ERROR
,
"Error occured during zmq_socket(): %s
\n
"
,
ZMQ_STRERROR
);
av_log
(
h
,
AV_LOG_ERROR
,
"Error occur
r
ed during zmq_socket(): %s
\n
"
,
ZMQ_STRERROR
);
goto
fail_term
;
goto
fail_term
;
}
}
ret
=
zmq_bind
(
s
->
socket
,
uri
);
ret
=
zmq_bind
(
s
->
socket
,
uri
);
if
(
ret
==
-
1
)
{
if
(
ret
==
-
1
)
{
av_log
(
h
,
AV_LOG_ERROR
,
"Error occured during zmq_bind(): %s
\n
"
,
ZMQ_STRERROR
);
av_log
(
h
,
AV_LOG_ERROR
,
"Error occur
r
ed during zmq_bind(): %s
\n
"
,
ZMQ_STRERROR
);
goto
fail_close
;
goto
fail_close
;
}
}
}
}
...
@@ -115,19 +115,19 @@ static int zmq_proto_open(URLContext *h, const char *uri, int flags)
...
@@ -115,19 +115,19 @@ static int zmq_proto_open(URLContext *h, const char *uri, int flags)
if
(
h
->
flags
&
AVIO_FLAG_READ
)
{
if
(
h
->
flags
&
AVIO_FLAG_READ
)
{
s
->
socket
=
zmq_socket
(
s
->
context
,
ZMQ_SUB
);
s
->
socket
=
zmq_socket
(
s
->
context
,
ZMQ_SUB
);
if
(
!
s
->
socket
)
{
if
(
!
s
->
socket
)
{
av_log
(
h
,
AV_LOG_ERROR
,
"Error occured during zmq_socket(): %s
\n
"
,
ZMQ_STRERROR
);
av_log
(
h
,
AV_LOG_ERROR
,
"Error occur
r
ed during zmq_socket(): %s
\n
"
,
ZMQ_STRERROR
);
goto
fail_term
;
goto
fail_term
;
}
}
ret
=
zmq_setsockopt
(
s
->
socket
,
ZMQ_SUBSCRIBE
,
""
,
0
);
ret
=
zmq_setsockopt
(
s
->
socket
,
ZMQ_SUBSCRIBE
,
""
,
0
);
if
(
ret
==
-
1
)
{
if
(
ret
==
-
1
)
{
av_log
(
h
,
AV_LOG_ERROR
,
"Error occured during zmq_setsockopt(): %s
\n
"
,
ZMQ_STRERROR
);
av_log
(
h
,
AV_LOG_ERROR
,
"Error occur
r
ed during zmq_setsockopt(): %s
\n
"
,
ZMQ_STRERROR
);
goto
fail_close
;
goto
fail_close
;
}
}
ret
=
zmq_connect
(
s
->
socket
,
uri
);
ret
=
zmq_connect
(
s
->
socket
,
uri
);
if
(
ret
==
-
1
)
{
if
(
ret
==
-
1
)
{
av_log
(
h
,
AV_LOG_ERROR
,
"Error occured during zmq_connect(): %s
\n
"
,
ZMQ_STRERROR
);
av_log
(
h
,
AV_LOG_ERROR
,
"Error occur
r
ed during zmq_connect(): %s
\n
"
,
ZMQ_STRERROR
);
goto
fail_close
;
goto
fail_close
;
}
}
}
}
...
@@ -150,7 +150,7 @@ static int zmq_proto_write(URLContext *h, const unsigned char *buf, int size)
...
@@ -150,7 +150,7 @@ static int zmq_proto_write(URLContext *h, const unsigned char *buf, int size)
return
ret
;
return
ret
;
ret
=
zmq_send
(
s
->
socket
,
buf
,
size
,
0
);
ret
=
zmq_send
(
s
->
socket
,
buf
,
size
,
0
);
if
(
ret
==
-
1
)
{
if
(
ret
==
-
1
)
{
av_log
(
h
,
AV_LOG_ERROR
,
"Error occured during zmq_send(): %s
\n
"
,
ZMQ_STRERROR
);
av_log
(
h
,
AV_LOG_ERROR
,
"Error occur
r
ed during zmq_send(): %s
\n
"
,
ZMQ_STRERROR
);
return
AVERROR_EXTERNAL
;
return
AVERROR_EXTERNAL
;
}
}
return
ret
;
/*number of bytes sent*/
return
ret
;
/*number of bytes sent*/
...
@@ -166,7 +166,7 @@ static int zmq_proto_read(URLContext *h, unsigned char *buf, int size)
...
@@ -166,7 +166,7 @@ static int zmq_proto_read(URLContext *h, unsigned char *buf, int size)
return
ret
;
return
ret
;
ret
=
zmq_recv
(
s
->
socket
,
buf
,
size
,
0
);
ret
=
zmq_recv
(
s
->
socket
,
buf
,
size
,
0
);
if
(
ret
==
-
1
)
{
if
(
ret
==
-
1
)
{
av_log
(
h
,
AV_LOG_ERROR
,
"Error occured during zmq_recv(): %s
\n
"
,
ZMQ_STRERROR
);
av_log
(
h
,
AV_LOG_ERROR
,
"Error occur
r
ed during zmq_recv(): %s
\n
"
,
ZMQ_STRERROR
);
return
AVERROR_EXTERNAL
;
return
AVERROR_EXTERNAL
;
}
}
if
(
ret
>
size
)
{
if
(
ret
>
size
)
{
...
...
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