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
afbaa9a7
Commit
afbaa9a7
authored
Oct 18, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avdevice/oss_audio: avoid strerror() and errbuf
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
e60c025e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
oss_audio.c
libavdevice/oss_audio.c
+4
-6
No files found.
libavdevice/oss_audio.c
View file @
afbaa9a7
...
@@ -49,14 +49,13 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
...
@@ -49,14 +49,13 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
int
audio_fd
;
int
audio_fd
;
int
tmp
,
err
;
int
tmp
,
err
;
char
*
flip
=
getenv
(
"AUDIO_FLIP_LEFT"
);
char
*
flip
=
getenv
(
"AUDIO_FLIP_LEFT"
);
char
errbuff
[
128
];
if
(
is_output
)
if
(
is_output
)
audio_fd
=
avpriv_open
(
audio_device
,
O_WRONLY
);
audio_fd
=
avpriv_open
(
audio_device
,
O_WRONLY
);
else
else
audio_fd
=
avpriv_open
(
audio_device
,
O_RDONLY
);
audio_fd
=
avpriv_open
(
audio_device
,
O_RDONLY
);
if
(
audio_fd
<
0
)
{
if
(
audio_fd
<
0
)
{
av_log
(
s1
,
AV_LOG_ERROR
,
"%s: %s
\n
"
,
audio_device
,
strerror
(
errno
));
av_log
(
s1
,
AV_LOG_ERROR
,
"%s: %s
\n
"
,
audio_device
,
av_err2str
(
AVERROR
(
errno
)
));
return
AVERROR
(
EIO
);
return
AVERROR
(
EIO
);
}
}
...
@@ -67,7 +66,7 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
...
@@ -67,7 +66,7 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
/* non blocking mode */
/* non blocking mode */
if
(
!
is_output
)
{
if
(
!
is_output
)
{
if
(
fcntl
(
audio_fd
,
F_SETFL
,
O_NONBLOCK
)
<
0
)
{
if
(
fcntl
(
audio_fd
,
F_SETFL
,
O_NONBLOCK
)
<
0
)
{
av_log
(
s1
,
AV_LOG_WARNING
,
"%s: Could not enable non block mode (%s)
\n
"
,
audio_device
,
strerror
(
errno
));
av_log
(
s1
,
AV_LOG_WARNING
,
"%s: Could not enable non block mode (%s)
\n
"
,
audio_device
,
av_err2str
(
AVERROR
(
errno
)
));
}
}
}
}
...
@@ -75,8 +74,7 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
...
@@ -75,8 +74,7 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
#define CHECK_IOCTL_ERROR(event) \
#define CHECK_IOCTL_ERROR(event) \
if (err < 0) { \
if (err < 0) { \
av_strerror(AVERROR(errno), errbuff, sizeof(errbuff)); \
av_log(s1, AV_LOG_ERROR, #event ": %s\n", av_err2str(AVERROR(errno)));\
av_log(s1, AV_LOG_ERROR, #event ": %s\n", errbuff); \
goto fail; \
goto fail; \
}
}
...
@@ -86,7 +84,7 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
...
@@ -86,7 +84,7 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
* fail anyway. */
* fail anyway. */
err
=
ioctl
(
audio_fd
,
SNDCTL_DSP_GETFMTS
,
&
tmp
);
err
=
ioctl
(
audio_fd
,
SNDCTL_DSP_GETFMTS
,
&
tmp
);
if
(
err
<
0
)
{
if
(
err
<
0
)
{
av_log
(
s1
,
AV_LOG_WARNING
,
"SNDCTL_DSP_GETFMTS: %s
\n
"
,
strerror
(
errno
));
av_log
(
s1
,
AV_LOG_WARNING
,
"SNDCTL_DSP_GETFMTS: %s
\n
"
,
av_err2str
(
AVERROR
(
errno
)
));
}
}
#if HAVE_BIGENDIAN
#if HAVE_BIGENDIAN
...
...
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