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
dd8ffb19
Commit
dd8ffb19
authored
Sep 15, 2017
by
Matthieu Bouron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/mediacodec_wrapper: fix jni vaargs types
Fixes decoding on 32-bit devices with Android NDK >= 15.
parent
e2f8f140
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
mediacodec_wrapper.c
libavcodec/mediacodec_wrapper.c
+5
-5
No files found.
libavcodec/mediacodec_wrapper.c
View file @
dd8ffb19
...
...
@@ -1448,7 +1448,7 @@ int ff_AMediaCodec_releaseOutputBuffer(FFAMediaCodec* codec, size_t idx, int ren
JNI_GET_ENV_OR_RETURN
(
env
,
codec
,
AVERROR_EXTERNAL
);
(
*
env
)
->
CallVoidMethod
(
env
,
codec
->
object
,
codec
->
jfields
.
release_output_buffer_id
,
idx
,
render
);
(
*
env
)
->
CallVoidMethod
(
env
,
codec
->
object
,
codec
->
jfields
.
release_output_buffer_id
,
(
jint
)
idx
,
(
jboolean
)
render
);
if
(
ff_jni_exception_check
(
env
,
1
,
codec
)
<
0
)
{
ret
=
AVERROR_EXTERNAL
;
goto
fail
;
...
...
@@ -1465,7 +1465,7 @@ int ff_AMediaCodec_releaseOutputBufferAtTime(FFAMediaCodec *codec, size_t idx, i
JNI_GET_ENV_OR_RETURN
(
env
,
codec
,
AVERROR_EXTERNAL
);
(
*
env
)
->
CallVoidMethod
(
env
,
codec
->
object
,
codec
->
jfields
.
release_output_buffer_at_time_id
,
idx
,
timestampNs
);
(
*
env
)
->
CallVoidMethod
(
env
,
codec
->
object
,
codec
->
jfields
.
release_output_buffer_at_time_id
,
(
jint
)
idx
,
timestampNs
);
if
(
ff_jni_exception_check
(
env
,
1
,
codec
)
<
0
)
{
ret
=
AVERROR_EXTERNAL
;
goto
fail
;
...
...
@@ -1499,7 +1499,7 @@ int ff_AMediaCodec_queueInputBuffer(FFAMediaCodec* codec, size_t idx, off_t offs
JNI_GET_ENV_OR_RETURN
(
env
,
codec
,
AVERROR_EXTERNAL
);
(
*
env
)
->
CallVoidMethod
(
env
,
codec
->
object
,
codec
->
jfields
.
queue_input_buffer_id
,
idx
,
offset
,
size
,
time
,
flags
);
(
*
env
)
->
CallVoidMethod
(
env
,
codec
->
object
,
codec
->
jfields
.
queue_input_buffer_id
,
(
jint
)
idx
,
(
jint
)
offset
,
(
jint
)
size
,
time
,
flags
);
if
((
ret
=
ff_jni_exception_check
(
env
,
1
,
codec
))
<
0
)
{
ret
=
AVERROR_EXTERNAL
;
goto
fail
;
...
...
@@ -1572,7 +1572,7 @@ uint8_t* ff_AMediaCodec_getInputBuffer(FFAMediaCodec* codec, size_t idx, size_t
JNI_GET_ENV_OR_RETURN
(
env
,
codec
,
NULL
);
if
(
codec
->
has_get_i_o_buffer
)
{
buffer
=
(
*
env
)
->
CallObjectMethod
(
env
,
codec
->
object
,
codec
->
jfields
.
get_input_buffer_id
,
idx
);
buffer
=
(
*
env
)
->
CallObjectMethod
(
env
,
codec
->
object
,
codec
->
jfields
.
get_input_buffer_id
,
(
jint
)
idx
);
if
(
ff_jni_exception_check
(
env
,
1
,
codec
)
<
0
)
{
goto
fail
;
}
...
...
@@ -1620,7 +1620,7 @@ uint8_t* ff_AMediaCodec_getOutputBuffer(FFAMediaCodec* codec, size_t idx, size_t
JNI_GET_ENV_OR_RETURN
(
env
,
codec
,
NULL
);
if
(
codec
->
has_get_i_o_buffer
)
{
buffer
=
(
*
env
)
->
CallObjectMethod
(
env
,
codec
->
object
,
codec
->
jfields
.
get_output_buffer_id
,
idx
);
buffer
=
(
*
env
)
->
CallObjectMethod
(
env
,
codec
->
object
,
codec
->
jfields
.
get_output_buffer_id
,
(
jint
)
idx
);
if
(
ff_jni_exception_check
(
env
,
1
,
codec
)
<
0
)
{
goto
fail
;
}
...
...
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