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
7555cfd2
Commit
7555cfd2
authored
Aug 13, 2019
by
Zhong Li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/qsvdec: Add mjpeg decoder support
Signed-off-by:
Zhong Li
<
zhong.li@intel.com
>
parent
0dfcfc50
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
1 deletion
+33
-1
Changelog
Changelog
+3
-0
configure
configure
+1
-0
Makefile
libavcodec/Makefile
+1
-0
allcodecs.c
libavcodec/allcodecs.c
+1
-0
qsvdec_other.c
libavcodec/qsvdec_other.c
+27
-1
No files found.
Changelog
View file @
7555cfd2
Entries are sorted chronologically from oldest to youngest within each release,
Entries are sorted chronologically from oldest to youngest within each release,
releases are sorted from youngest to oldest.
releases are sorted from youngest to oldest.
version <next>:
- Intel QSV-accelerated MJPEG decoding
version 4.2:
version 4.2:
- tpad filter
- tpad filter
- AV1 decoding support through libdav1d
- AV1 decoding support through libdav1d
...
...
configure
View file @
7555cfd2
...
@@ -3042,6 +3042,7 @@ hevc_v4l2m2m_decoder_deps="v4l2_m2m hevc_v4l2_m2m"
...
@@ -3042,6 +3042,7 @@ hevc_v4l2m2m_decoder_deps="v4l2_m2m hevc_v4l2_m2m"
hevc_v4l2m2m_decoder_select
=
"hevc_mp4toannexb_bsf"
hevc_v4l2m2m_decoder_select
=
"hevc_mp4toannexb_bsf"
hevc_v4l2m2m_encoder_deps
=
"v4l2_m2m hevc_v4l2_m2m"
hevc_v4l2m2m_encoder_deps
=
"v4l2_m2m hevc_v4l2_m2m"
mjpeg_cuvid_decoder_deps
=
"cuvid"
mjpeg_cuvid_decoder_deps
=
"cuvid"
mjpeg_qsv_decoder_select
=
"qsvdec"
mjpeg_qsv_encoder_deps
=
"libmfx"
mjpeg_qsv_encoder_deps
=
"libmfx"
mjpeg_qsv_encoder_select
=
"qsvenc"
mjpeg_qsv_encoder_select
=
"qsvenc"
mjpeg_vaapi_encoder_deps
=
"VAEncPictureParameterBufferJPEG"
mjpeg_vaapi_encoder_deps
=
"VAEncPictureParameterBufferJPEG"
...
...
libavcodec/Makefile
View file @
7555cfd2
...
@@ -425,6 +425,7 @@ OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \
...
@@ -425,6 +425,7 @@ OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \
OBJS-$(CONFIG_MICRODVD_DECODER)
+=
microdvddec.o
ass.o
OBJS-$(CONFIG_MICRODVD_DECODER)
+=
microdvddec.o
ass.o
OBJS-$(CONFIG_MIMIC_DECODER)
+=
mimic.o
OBJS-$(CONFIG_MIMIC_DECODER)
+=
mimic.o
OBJS-$(CONFIG_MJPEG_DECODER)
+=
mjpegdec.o
OBJS-$(CONFIG_MJPEG_DECODER)
+=
mjpegdec.o
OBJS-$(CONFIG_MJPEG_QSV_DECODER)
+=
qsvdec_other.o
OBJS-$(CONFIG_MJPEG_ENCODER)
+=
mjpegenc.o
mjpegenc_common.o
\
OBJS-$(CONFIG_MJPEG_ENCODER)
+=
mjpegenc.o
mjpegenc_common.o
\
mjpegenc_huffman.o
mjpegenc_huffman.o
OBJS-$(CONFIG_MJPEGB_DECODER)
+=
mjpegbdec.o
OBJS-$(CONFIG_MJPEGB_DECODER)
+=
mjpegbdec.o
...
...
libavcodec/allcodecs.c
View file @
7555cfd2
...
@@ -763,6 +763,7 @@ extern AVCodec ff_hevc_videotoolbox_encoder;
...
@@ -763,6 +763,7 @@ extern AVCodec ff_hevc_videotoolbox_encoder;
extern
AVCodec
ff_libkvazaar_encoder
;
extern
AVCodec
ff_libkvazaar_encoder
;
extern
AVCodec
ff_mjpeg_cuvid_decoder
;
extern
AVCodec
ff_mjpeg_cuvid_decoder
;
extern
AVCodec
ff_mjpeg_qsv_encoder
;
extern
AVCodec
ff_mjpeg_qsv_encoder
;
extern
AVCodec
ff_mjpeg_qsv_decoder
;
extern
AVCodec
ff_mjpeg_vaapi_encoder
;
extern
AVCodec
ff_mjpeg_vaapi_encoder
;
extern
AVCodec
ff_mpeg1_cuvid_decoder
;
extern
AVCodec
ff_mpeg1_cuvid_decoder
;
extern
AVCodec
ff_mpeg2_cuvid_decoder
;
extern
AVCodec
ff_mpeg2_cuvid_decoder
;
...
...
libavcodec/qsvdec_other.c
View file @
7555cfd2
/*
/*
* Intel MediaSDK QSV based MPEG-2, VC-1
and VP8
decoders
* Intel MediaSDK QSV based MPEG-2, VC-1
, VP8 and MJPEG
decoders
*
*
* copyright (c) 2015 Anton Khirnov
* copyright (c) 2015 Anton Khirnov
*
*
...
@@ -256,3 +256,29 @@ AVCodec ff_vp8_qsv_decoder = {
...
@@ -256,3 +256,29 @@ AVCodec ff_vp8_qsv_decoder = {
.
wrapper_name
=
"qsv"
,
.
wrapper_name
=
"qsv"
,
};
};
#endif
#endif
#if CONFIG_MJPEG_QSV_DECODER
static
const
AVClass
mjpeg_qsv_class
=
{
.
class_name
=
"mjpeg_qsv"
,
.
item_name
=
av_default_item_name
,
.
option
=
options
,
.
version
=
LIBAVUTIL_VERSION_INT
,
};
AVCodec
ff_mjpeg_qsv_decoder
=
{
.
name
=
"mjpeg_qsv"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MJPEG video (Intel Quick Sync Video acceleration)"
),
.
priv_data_size
=
sizeof
(
QSVOtherContext
),
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
id
=
AV_CODEC_ID_MJPEG
,
.
init
=
qsv_decode_init
,
.
decode
=
qsv_decode_frame
,
.
flush
=
qsv_decode_flush
,
.
close
=
qsv_decode_close
,
.
capabilities
=
AV_CODEC_CAP_DELAY
|
AV_CODEC_CAP_DR1
|
AV_CODEC_CAP_AVOID_PROBING
|
AV_CODEC_CAP_HYBRID
,
.
priv_class
=
&
mjpeg_qsv_class
,
.
pix_fmts
=
(
const
enum
AVPixelFormat
[]){
AV_PIX_FMT_NV12
,
AV_PIX_FMT_QSV
,
AV_PIX_FMT_NONE
},
};
#endif
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