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
04056796
Commit
04056796
authored
Oct 16, 2022
by
Zhao Zhili
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/mediacodecdec: enable NDK mediacodec
Signed-off-by:
Zhao Zhili
<
zhilizhao@tencent.com
>
parent
4df9cb91
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
7 deletions
+32
-7
Changelog
Changelog
+1
-0
mediacodecdec.c
libavcodec/mediacodecdec.c
+9
-1
mediacodecdec_common.c
libavcodec/mediacodecdec_common.c
+19
-4
mediacodecdec_common.h
libavcodec/mediacodecdec_common.h
+1
-0
version.h
libavcodec/version.h
+2
-2
No files found.
Changelog
View file @
04056796
...
...
@@ -20,6 +20,7 @@ version <next>:
- ViewQuest VQC decoder
- backgroundkey filter
- nvenc AV1 encoding support
- MediaCodec decoder via NDKMediaCodec
version 5.1:
...
...
libavcodec/mediacodecdec.c
View file @
04056796
...
...
@@ -40,6 +40,7 @@
#include "hevc_parse.h"
#include "hwconfig.h"
#include "internal.h"
#include "jni.h"
#include "mediacodec_wrapper.h"
#include "mediacodecdec_common.h"
...
...
@@ -54,6 +55,7 @@ typedef struct MediaCodecH264DecContext {
int
delay_flush
;
int
amlogic_mpeg2_api23_workaround
;
int
use_ndk_codec
;
}
MediaCodecH264DecContext
;
static
av_cold
int
mediacodec_decode_close
(
AVCodecContext
*
avctx
)
...
...
@@ -310,7 +312,10 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx)
FFAMediaFormat
*
format
=
NULL
;
MediaCodecH264DecContext
*
s
=
avctx
->
priv_data
;
format
=
ff_AMediaFormat_new
(
0
);
if
(
s
->
use_ndk_codec
<
0
)
s
->
use_ndk_codec
=
!
av_jni_get_java_vm
(
avctx
);
format
=
ff_AMediaFormat_new
(
s
->
use_ndk_codec
);
if
(
!
format
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Failed to create media format
\n
"
);
ret
=
AVERROR_EXTERNAL
;
...
...
@@ -388,6 +393,7 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx)
}
s
->
ctx
->
delay_flush
=
s
->
delay_flush
;
s
->
ctx
->
use_ndk_codec
=
s
->
use_ndk_codec
;
if
((
ret
=
ff_mediacodec_dec_init
(
avctx
,
s
->
ctx
,
codec_mime
,
format
))
<
0
)
{
s
->
ctx
=
NULL
;
...
...
@@ -528,6 +534,8 @@ static const AVCodecHWConfigInternal *const mediacodec_hw_configs[] = {
static
const
AVOption
ff_mediacodec_vdec_options
[]
=
{
{
"delay_flush"
,
"Delay flush until hw output buffers are returned to the decoder"
,
OFFSET
(
delay_flush
),
AV_OPT_TYPE_BOOL
,
{.
i64
=
0
},
0
,
1
,
VD
},
{
"ndk_codec"
,
"Use MediaCodec from NDK"
,
OFFSET
(
use_ndk_codec
),
AV_OPT_TYPE_BOOL
,
{.
i64
=
-
1
},
-
1
,
1
,
VD
},
{
NULL
}
};
...
...
libavcodec/mediacodecdec_common.c
View file @
04056796
...
...
@@ -608,12 +608,27 @@ int ff_mediacodec_dec_init(AVCodecContext *avctx, MediaCodecDecContext *s,
s
->
codec_name
=
ff_AMediaCodecList_getCodecNameByType
(
mime
,
profile
,
0
,
avctx
);
if
(
!
s
->
codec_name
)
{
ret
=
AVERROR_EXTERNAL
;
goto
fail
;
// getCodecNameByType() can fail due to missing JVM, while NDK
// mediacodec can be used without JVM.
if
(
!
s
->
use_ndk_codec
)
{
ret
=
AVERROR_EXTERNAL
;
goto
fail
;
}
av_log
(
avctx
,
AV_LOG_INFO
,
"Failed to getCodecNameByType
\n
"
);
}
else
{
av_log
(
avctx
,
AV_LOG_DEBUG
,
"Found decoder %s
\n
"
,
s
->
codec_name
);
}
av_log
(
avctx
,
AV_LOG_DEBUG
,
"Found decoder %s
\n
"
,
s
->
codec_name
);
s
->
codec
=
ff_AMediaCodec_createCodecByName
(
s
->
codec_name
,
0
);
if
(
s
->
codec_name
)
s
->
codec
=
ff_AMediaCodec_createCodecByName
(
s
->
codec_name
,
s
->
use_ndk_codec
);
else
{
s
->
codec
=
ff_AMediaCodec_createDecoderByType
(
mime
,
s
->
use_ndk_codec
);
if
(
s
->
codec
)
{
s
->
codec_name
=
ff_AMediaCodec_getName
(
s
->
codec
);
if
(
!
s
->
codec_name
)
s
->
codec_name
=
av_strdup
(
mime
);
}
}
if
(
!
s
->
codec
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Failed to create media decoder for type %s and name %s
\n
"
,
mime
,
s
->
codec_name
);
ret
=
AVERROR_EXTERNAL
;
...
...
libavcodec/mediacodecdec_common.h
View file @
04056796
...
...
@@ -70,6 +70,7 @@ typedef struct MediaCodecDecContext {
bool
delay_flush
;
atomic_int
serial
;
bool
use_ndk_codec
;
}
MediaCodecDecContext
;
int
ff_mediacodec_dec_init
(
AVCodecContext
*
avctx
,
...
...
libavcodec/version.h
View file @
04056796
...
...
@@ -29,8 +29,8 @@
#include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 5
2
#define LIBAVCODEC_VERSION_MICRO 10
2
#define LIBAVCODEC_VERSION_MINOR 5
3
#define LIBAVCODEC_VERSION_MICRO 10
0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
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