Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
f62c5445
Commit
f62c5445
authored
Oct 04, 2016
by
Matthieu Bouron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: add mpeg4 mediacodec decoder
parent
0f7fce87
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
54 additions
and
4 deletions
+54
-4
Changelog
Changelog
+2
-2
configure
configure
+2
-0
Makefile
libavcodec/Makefile
+1
-0
allcodecs.c
libavcodec/allcodecs.c
+2
-0
mediacodecdec.c
libavcodec/mediacodecdec.c
+7
-0
mediacodecdec_h2645.c
libavcodec/mediacodecdec_h2645.c
+39
-1
version.h
libavcodec/version.h
+1
-1
No files found.
Changelog
View file @
f62c5445
...
...
@@ -10,7 +10,7 @@ version <next>:
- curves filter doesn't automatically insert points at x=0 and x=1 anymore
- 16-bit support in curves filter and selectivecolor filter
- OpenH264 decoder wrapper
- MediaCodec H.264/HEVC/VP8/VP9 hwaccel
- MediaCodec H.264/HEVC/
MPEG-4/
VP8/VP9 hwaccel
- True Audio (TTA) muxer
- crystalizer audio filter
- acrusher audio filter
...
...
@@ -28,7 +28,7 @@ version <next>:
- gblur filter
- avgblur filter
- sobel and prewitt filter
- MediaCodec HEVC/VP8/VP9 decoding
- MediaCodec HEVC/
MPEG-4/
VP8/VP9 decoding
- Meridian Lossless Packing (MLP) / TrueHD encoder
- Non-Local Means (nlmeans) denoising filter
- sdl2 output device and ffplay support
...
...
configure
View file @
f62c5445
...
...
@@ -2630,6 +2630,8 @@ mpeg2_xvmc_hwaccel_deps="xvmc"
mpeg2_xvmc_hwaccel_select
=
"mpeg2video_decoder"
mpeg4_crystalhd_decoder_select
=
"crystalhd"
mpeg4_cuvid_hwaccel_deps
=
"cuda cuvid"
mpeg4_mediacodec_decoder_deps
=
"mediacodec"
mpeg4_mediacodec_hwaccel_deps
=
"mediacodec"
mpeg4_mmal_decoder_deps
=
"mmal"
mpeg4_mmal_decoder_select
=
"mmal"
mpeg4_mmal_hwaccel_deps
=
"mmal"
...
...
libavcodec/Makefile
View file @
f62c5445
...
...
@@ -413,6 +413,7 @@ OBJS-$(CONFIG_MPEG2_QSV_ENCODER) += qsvenc_mpeg2.o
OBJS-$(CONFIG_MPEG2VIDEO_DECODER)
+=
mpeg12dec.o
mpeg12.o
mpeg12data.o
OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)
+=
mpeg12enc.o
mpeg12.o
OBJS-$(CONFIG_MPEG4_DECODER)
+=
xvididct.o
OBJS-$(CONFIG_MPEG4_MEDIACODEC_DECODER)
+=
mediacodecdec_h2645.o
OBJS-$(CONFIG_MPEG4_OMX_ENCODER)
+=
omx.o
OBJS-$(CONFIG_MPL2_DECODER)
+=
mpl2dec.o
ass.o
OBJS-$(CONFIG_MSA1_DECODER)
+=
mss3.o
...
...
libavcodec/allcodecs.c
View file @
f62c5445
...
...
@@ -103,6 +103,7 @@ void avcodec_register_all(void)
REGISTER_HWACCEL
(
MPEG2_VDPAU
,
mpeg2_vdpau
);
REGISTER_HWACCEL
(
MPEG2_VIDEOTOOLBOX
,
mpeg2_videotoolbox
);
REGISTER_HWACCEL
(
MPEG4_CUVID
,
mpeg4_cuvid
);
REGISTER_HWACCEL
(
MPEG4_MEDIACODEC
,
mpeg4_mediacodec
);
REGISTER_HWACCEL
(
MPEG4_MMAL
,
mpeg4_mmal
);
REGISTER_HWACCEL
(
MPEG4_VAAPI
,
mpeg4_vaapi
);
REGISTER_HWACCEL
(
MPEG4_VDPAU
,
mpeg4_vdpau
);
...
...
@@ -657,6 +658,7 @@ void avcodec_register_all(void)
REGISTER_DECODER
(
MPEG2_CUVID
,
mpeg2_cuvid
);
REGISTER_ENCODER
(
MPEG2_QSV
,
mpeg2_qsv
);
REGISTER_DECODER
(
MPEG4_CUVID
,
mpeg4_cuvid
);
REGISTER_DECODER
(
MPEG4_MEDIACODEC
,
mpeg4_mediacodec
);
REGISTER_DECODER
(
VC1_CUVID
,
vc1_cuvid
);
REGISTER_DECODER
(
VP8_CUVID
,
vp8_cuvid
);
REGISTER_DECODER
(
VP8_MEDIACODEC
,
vp8_mediacodec
);
...
...
libavcodec/mediacodecdec.c
View file @
f62c5445
...
...
@@ -767,6 +767,13 @@ AVHWAccel ff_hevc_mediacodec_hwaccel = {
.
pix_fmt
=
AV_PIX_FMT_MEDIACODEC
,
};
AVHWAccel
ff_mpeg4_mediacodec_hwaccel
=
{
.
name
=
"mediacodec"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
id
=
AV_CODEC_ID_MPEG4
,
.
pix_fmt
=
AV_PIX_FMT_MEDIACODEC
,
};
AVHWAccel
ff_vp8_mediacodec_hwaccel
=
{
.
name
=
"mediacodec"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
...
...
libavcodec/mediacodecdec_h2645.c
View file @
f62c5445
/*
* Android MediaCodec H.264 / H.265 / VP8 / VP9 decoders
* Android MediaCodec H.264 / H.265 /
MPEG-4 /
VP8 / VP9 decoders
*
* Copyright (c) 2015-2016 Matthieu Bouron <matthieu.bouron stupeflix.com>
*
...
...
@@ -266,6 +266,19 @@ done:
}
#endif
#if CONFIG_MPEG4_MEDIACODEC_DECODER
static
int
mpeg4_set_extradata
(
AVCodecContext
*
avctx
,
FFAMediaFormat
*
format
)
{
int
ret
=
0
;
if
(
avctx
->
extradata
)
{
ff_AMediaFormat_setBuffer
(
format
,
"csd-0"
,
avctx
->
extradata
,
avctx
->
extradata_size
);
}
return
ret
;
}
#endif
#if CONFIG_VP8_MEDIACODEC_DECODER || CONFIG_VP9_MEDIACODEC_DECODER
static
int
vpx_set_extradata
(
AVCodecContext
*
avctx
,
FFAMediaFormat
*
format
)
{
...
...
@@ -319,6 +332,15 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx)
goto
done
;
break
;
#endif
#if CONFIG_MPEG4_MEDIACODEC_DECODER
case
AV_CODEC_ID_MPEG4
:
codec_mime
=
"video/mp4v-es"
,
ret
=
mpeg4_set_extradata
(
avctx
,
format
);
if
(
ret
<
0
)
goto
done
;
break
;
#endif
#if CONFIG_VP8_MEDIACODEC_DECODER
case
AV_CODEC_ID_VP8
:
codec_mime
=
"video/x-vnd.on2.vp8"
;
...
...
@@ -552,6 +574,22 @@ AVCodec ff_hevc_mediacodec_decoder = {
};
#endif
#if CONFIG_MPEG4_MEDIACODEC_DECODER
AVCodec
ff_mpeg4_mediacodec_decoder
=
{
.
name
=
"mpeg4_mediacodec"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MPEG-4 Android MediaCodec decoder"
),
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
id
=
AV_CODEC_ID_MPEG4
,
.
priv_data_size
=
sizeof
(
MediaCodecH264DecContext
),
.
init
=
mediacodec_decode_init
,
.
decode
=
mediacodec_decode_frame
,
.
flush
=
mediacodec_decode_flush
,
.
close
=
mediacodec_decode_close
,
.
capabilities
=
CODEC_CAP_DELAY
,
.
caps_internal
=
FF_CODEC_CAP_SETS_PKT_DTS
,
};
#endif
#if CONFIG_VP8_MEDIACODEC_DECODER
AVCodec
ff_vp8_mediacodec_decoder
=
{
.
name
=
"vp8_mediacodec"
,
...
...
libavcodec/version.h
View file @
f62c5445
...
...
@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 6
2
#define LIBAVCODEC_VERSION_MINOR 6
3
#define LIBAVCODEC_VERSION_MICRO 103
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...
...
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