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
ca6ae3b7
Commit
ca6ae3b7
authored
Jan 09, 2017
by
Mark Thompson
Committed by
Mark Thompson
Jan 29, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vaapi_encode: Add MPEG-2 support
parent
3c2717e4
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
481 additions
and
3 deletions
+481
-3
Changelog
Changelog
+1
-0
configure
configure
+3
-0
Makefile
libavcodec/Makefile
+1
-0
allcodecs.c
libavcodec/allcodecs.c
+1
-0
vaapi_encode.c
libavcodec/vaapi_encode.c
+1
-0
vaapi_encode.h
libavcodec/vaapi_encode.h
+3
-2
vaapi_encode_mpeg2.c
libavcodec/vaapi_encode_mpeg2.c
+470
-0
version.h
libavcodec/version.h
+1
-1
No files found.
Changelog
View file @
ca6ae3b7
...
...
@@ -7,6 +7,7 @@ version <next>:
- VAAPI-accelerated VP8 and HEVC decoding
- VAAPI-accelerated deinterlacing
- config.log and other configuration files moved into avbuild/ directory
- VAAPI-accelerated MPEG-2 encoding
version 12:
...
...
configure
View file @
ca6ae3b7
...
...
@@ -2235,6 +2235,8 @@ mpeg2_qsv_decoder_deps="libmfx"
mpeg2_qsv_decoder_select
=
"qsvdec mpeg2_qsv_hwaccel mpegvideo_parser"
mpeg2_qsv_encoder_deps
=
"libmfx"
mpeg2_qsv_encoder_select
=
"qsvenc"
mpeg2_vaapi_encoder_deps
=
"VAEncPictureParameterBufferMPEG2"
mpeg2_vaapi_encoder_select
=
"vaapi_encode"
mpeg4_omx_encoder_deps
=
"omx"
vc1_mmal_decoder_deps
=
"mmal"
vc1_qsv_decoder_deps
=
"libmfx"
...
...
@@ -4586,6 +4588,7 @@ check_type "va/va.h va/va_vpp.h" "VAProcPipelineParameterBuffer"
check_type
"va/va.h va/va_enc_h264.h"
"VAEncPictureParameterBufferH264"
check_type
"va/va.h va/va_enc_hevc.h"
"VAEncPictureParameterBufferHEVC"
check_type
"va/va.h va/va_enc_jpeg.h"
"VAEncPictureParameterBufferJPEG"
check_type
"va/va.h va/va_enc_mpeg2.h"
"VAEncPictureParameterBufferMPEG2"
check_type
"vdpau/vdpau.h"
"VdpPictureInfoHEVC"
...
...
libavcodec/Makefile
View file @
ca6ae3b7
...
...
@@ -337,6 +337,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_MPEG2_MMAL_DECODER)
+=
mmaldec.o
OBJS-$(CONFIG_MPEG2_VAAPI_ENCODER)
+=
vaapi_encode_mpeg2.o
OBJS-$(CONFIG_MPEG4_DECODER)
+=
xvididct.o
OBJS-$(CONFIG_MPEG4_OMX_ENCODER)
+=
omx.o
OBJS-$(CONFIG_MSA1_DECODER)
+=
mss3.o
...
...
libavcodec/allcodecs.c
View file @
ca6ae3b7
...
...
@@ -505,6 +505,7 @@ void avcodec_register_all(void)
REGISTER_ENCODER
(
HEVC_VAAPI
,
hevc_vaapi
);
REGISTER_ENCODER
(
MJPEG_VAAPI
,
mjpeg_vaapi
);
REGISTER_ENCODER
(
MPEG2_QSV
,
mpeg2_qsv
);
REGISTER_ENCODER
(
MPEG2_VAAPI
,
mpeg2_vaapi
);
REGISTER_ENCODER
(
MPEG4_OMX
,
mpeg4_omx
);
#if FF_API_NVENC_OLD_NAME
REGISTER_ENCODER
(
NVENC_H264
,
nvenc_h264
);
...
...
libavcodec/vaapi_encode.c
View file @
ca6ae3b7
...
...
@@ -320,6 +320,7 @@ static int vaapi_encode_issue(AVCodecContext *avctx,
err
=
AVERROR
(
ENOMEM
);
goto
fail
;
}
slice
->
index
=
i
;
pic
->
slices
[
i
]
=
slice
;
if
(
ctx
->
codec
->
slice_params_size
>
0
)
{
...
...
libavcodec/vaapi_encode.h
View file @
ca6ae3b7
...
...
@@ -35,8 +35,8 @@ enum {
MAX_CONFIG_ATTRIBUTES
=
4
,
MAX_GLOBAL_PARAMS
=
4
,
MAX_PICTURE_REFERENCES
=
2
,
MAX_PICTURE_SLICES
=
1
,
MAX_PARAM_BUFFERS
=
1
6
,
MAX_PICTURE_SLICES
=
1
12
,
MAX_PARAM_BUFFERS
=
1
28
,
MAX_REORDER_DELAY
=
16
,
MAX_PARAM_BUFFER_SIZE
=
1024
,
};
...
...
@@ -49,6 +49,7 @@ enum {
};
typedef
struct
VAAPIEncodeSlice
{
int
index
;
void
*
priv_data
;
void
*
codec_slice_params
;
}
VAAPIEncodeSlice
;
...
...
libavcodec/vaapi_encode_mpeg2.c
0 → 100644
View file @
ca6ae3b7
This diff is collapsed.
Click to expand it.
libavcodec/version.h
View file @
ca6ae3b7
...
...
@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 3
1
#define LIBAVCODEC_VERSION_MINOR 3
2
#define LIBAVCODEC_VERSION_MICRO 0
#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