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
8e07c22e
Commit
8e07c22e
authored
Jul 14, 2016
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qsvenc: print warnings from encode/init
parent
0956fd46
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
0 deletions
+19
-0
qsv.c
libavcodec/qsv.c
+10
-0
qsv_internal.h
libavcodec/qsv_internal.h
+3
-0
qsvenc.c
libavcodec/qsvenc.c
+6
-0
No files found.
libavcodec/qsv.c
View file @
8e07c22e
...
...
@@ -117,6 +117,16 @@ int ff_qsv_print_error(void *log_ctx, mfxStatus err,
return
ret
;
}
int
ff_qsv_print_warning
(
void
*
log_ctx
,
mfxStatus
err
,
const
char
*
warning_string
)
{
const
char
*
desc
;
int
ret
;
ret
=
ff_qsv_map_error
(
err
,
&
desc
);
av_log
(
log_ctx
,
AV_LOG_WARNING
,
"%s: %s (%d)
\n
"
,
warning_string
,
desc
,
err
);
return
ret
;
}
int
ff_qsv_map_pixfmt
(
enum
AVPixelFormat
format
,
uint32_t
*
fourcc
)
{
switch
(
format
)
{
...
...
libavcodec/qsv_internal.h
View file @
8e07c22e
...
...
@@ -62,6 +62,9 @@ int ff_qsv_map_error(mfxStatus mfx_err, const char **desc);
int
ff_qsv_print_error
(
void
*
log_ctx
,
mfxStatus
err
,
const
char
*
error_string
);
int
ff_qsv_print_warning
(
void
*
log_ctx
,
mfxStatus
err
,
const
char
*
warning_string
);
int
ff_qsv_codec_id_to_mfx
(
enum
AVCodecID
codec_id
);
int
ff_qsv_map_pixfmt
(
enum
AVPixelFormat
format
,
uint32_t
*
fourcc
);
...
...
libavcodec/qsvenc.c
View file @
8e07c22e
...
...
@@ -794,6 +794,9 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q)
if
(
ret
<
0
)
return
ff_qsv_print_error
(
avctx
,
ret
,
"Error initializing the encoder"
);
else
if
(
ret
>
0
)
ff_qsv_print_warning
(
avctx
,
ret
,
"Warning in encoder initialization"
);
ret
=
qsv_retrieve_enc_params
(
avctx
,
q
);
if
(
ret
<
0
)
{
...
...
@@ -974,6 +977,9 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q,
av_usleep
(
1
);
}
while
(
ret
==
MFX_WRN_DEVICE_BUSY
||
ret
==
MFX_WRN_IN_EXECUTION
);
if
(
ret
>
0
)
ff_qsv_print_warning
(
avctx
,
ret
,
"Warning during encoding"
);
if
(
ret
<
0
)
{
av_packet_unref
(
&
new_pkt
);
av_freep
(
&
bs
);
...
...
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