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
ca62236a
Commit
ca62236a
authored
Nov 29, 2016
by
Mark Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vaapi_encode: Add VP8 support
parent
ff35aa8c
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
275 additions
and
2 deletions
+275
-2
Changelog
Changelog
+1
-1
configure
configure
+3
-0
Makefile
libavcodec/Makefile
+1
-0
allcodecs.c
libavcodec/allcodecs.c
+1
-0
vaapi_encode_vp8.c
libavcodec/vaapi_encode_vp8.c
+268
-0
version.h
libavcodec/version.h
+1
-1
No files found.
Changelog
View file @
ca62236a
...
@@ -7,7 +7,7 @@ version <next>:
...
@@ -7,7 +7,7 @@ version <next>:
- VAAPI-accelerated VP8 and HEVC decoding
- VAAPI-accelerated VP8 and HEVC decoding
- VAAPI-accelerated deinterlacing
- VAAPI-accelerated deinterlacing
- config.log and other configuration files moved into avbuild/ directory
- config.log and other configuration files moved into avbuild/ directory
- VAAPI-accelerated MPEG-2 encoding
- VAAPI-accelerated MPEG-2
and VP8
encoding
version 12:
version 12:
...
...
configure
View file @
ca62236a
...
@@ -2243,6 +2243,8 @@ vc1_qsv_decoder_deps="libmfx"
...
@@ -2243,6 +2243,8 @@ vc1_qsv_decoder_deps="libmfx"
vc1_qsv_decoder_select
=
"qsvdec vc1_qsv_hwaccel vc1_parser"
vc1_qsv_decoder_select
=
"qsvdec vc1_qsv_hwaccel vc1_parser"
vp8_qsv_decoder_deps
=
"libmfx"
vp8_qsv_decoder_deps
=
"libmfx"
vp8_qsv_decoder_select
=
"qsvdec vp8_qsv_hwaccel vp8_parser"
vp8_qsv_decoder_select
=
"qsvdec vp8_qsv_hwaccel vp8_parser"
vp8_vaapi_encoder_deps
=
"VAEncPictureParameterBufferVP8"
vp8_vaapi_encoder_select
=
"vaapi_encode"
nvenc_h264_encoder_select
=
"h264_nvenc_encoder"
nvenc_h264_encoder_select
=
"h264_nvenc_encoder"
nvenc_hevc_encoder_select
=
"hevc_nvenc_encoder"
nvenc_hevc_encoder_select
=
"hevc_nvenc_encoder"
...
@@ -4594,6 +4596,7 @@ check_type "va/va.h va/va_enc_h264.h" "VAEncPictureParameterBufferH264"
...
@@ -4594,6 +4596,7 @@ 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_hevc.h"
"VAEncPictureParameterBufferHEVC"
check_type
"va/va.h va/va_enc_jpeg.h"
"VAEncPictureParameterBufferJPEG"
check_type
"va/va.h va/va_enc_jpeg.h"
"VAEncPictureParameterBufferJPEG"
check_type
"va/va.h va/va_enc_mpeg2.h"
"VAEncPictureParameterBufferMPEG2"
check_type
"va/va.h va/va_enc_mpeg2.h"
"VAEncPictureParameterBufferMPEG2"
check_type
"va/va.h va/va_enc_vp8.h"
"VAEncPictureParameterBufferVP8"
check_type
"vdpau/vdpau.h"
"VdpPictureInfoHEVC"
check_type
"vdpau/vdpau.h"
"VdpPictureInfoHEVC"
...
...
libavcodec/Makefile
View file @
ca62236a
...
@@ -482,6 +482,7 @@ OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o \
...
@@ -482,6 +482,7 @@ OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o \
OBJS-$(CONFIG_VP7_DECODER)
+=
vp8.o
vp56rac.o
OBJS-$(CONFIG_VP7_DECODER)
+=
vp8.o
vp56rac.o
OBJS-$(CONFIG_VP8_DECODER)
+=
vp8.o
vp56rac.o
OBJS-$(CONFIG_VP8_DECODER)
+=
vp8.o
vp56rac.o
OBJS-$(CONFIG_VP8_QSV_DECODER)
+=
qsvdec_other.o
OBJS-$(CONFIG_VP8_QSV_DECODER)
+=
qsvdec_other.o
OBJS-$(CONFIG_VP8_VAAPI_ENCODER)
+=
vaapi_encode_vp8.o
OBJS-$(CONFIG_VP9_DECODER)
+=
vp9.o
vp9data.o
vp9dsp.o
\
OBJS-$(CONFIG_VP9_DECODER)
+=
vp9.o
vp9data.o
vp9dsp.o
\
vp9block.o
vp9prob.o
vp9mvs.o
vp56rac.o
vp9block.o
vp9prob.o
vp9mvs.o
vp56rac.o
OBJS-$(CONFIG_VQA_DECODER)
+=
vqavideo.o
OBJS-$(CONFIG_VQA_DECODER)
+=
vqavideo.o
...
...
libavcodec/allcodecs.c
View file @
ca62236a
...
@@ -511,6 +511,7 @@ void avcodec_register_all(void)
...
@@ -511,6 +511,7 @@ void avcodec_register_all(void)
REGISTER_ENCODER
(
NVENC_H264
,
nvenc_h264
);
REGISTER_ENCODER
(
NVENC_H264
,
nvenc_h264
);
REGISTER_ENCODER
(
NVENC_HEVC
,
nvenc_hevc
);
REGISTER_ENCODER
(
NVENC_HEVC
,
nvenc_hevc
);
#endif
#endif
REGISTER_ENCODER
(
VP8_VAAPI
,
vp8_vaapi
);
/* parsers */
/* parsers */
REGISTER_PARSER
(
AAC
,
aac
);
REGISTER_PARSER
(
AAC
,
aac
);
...
...
libavcodec/vaapi_encode_vp8.c
0 → 100644
View file @
ca62236a
/*
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <va/va.h>
#include <va/va_enc_vp8.h>
#include "libavutil/avassert.h"
#include "libavutil/common.h"
#include "libavutil/internal.h"
#include "libavutil/opt.h"
#include "libavutil/pixfmt.h"
#include "avcodec.h"
#include "internal.h"
#include "vaapi_encode.h"
typedef
struct
VAAPIEncodeVP8Context
{
int
q_index_i
;
int
q_index_p
;
}
VAAPIEncodeVP8Context
;
typedef
struct
VAAPIEncodeVP8Options
{
int
loop_filter_level
;
int
loop_filter_sharpness
;
}
VAAPIEncodeVP8Options
;
#define vseq_var(name) vseq->name, name
#define vseq_field(name) vseq->seq_fields.bits.name, name
#define vpic_var(name) vpic->name, name
#define vpic_field(name) vpic->pic_fields.bits.name, name
static
int
vaapi_encode_vp8_init_sequence_params
(
AVCodecContext
*
avctx
)
{
VAAPIEncodeContext
*
ctx
=
avctx
->
priv_data
;
VAEncSequenceParameterBufferVP8
*
vseq
=
ctx
->
codec_sequence_params
;
vseq
->
frame_width
=
avctx
->
width
;
vseq
->
frame_height
=
avctx
->
height
;
vseq
->
frame_width_scale
=
0
;
vseq
->
frame_height_scale
=
0
;
vseq
->
error_resilient
=
0
;
vseq
->
kf_auto
=
0
;
if
(
!
(
ctx
->
va_rc_mode
&
VA_RC_CQP
))
{
vseq
->
bits_per_second
=
avctx
->
bit_rate
;
vseq
->
intra_period
=
avctx
->
gop_size
;
}
return
0
;
}
static
int
vaapi_encode_vp8_init_picture_params
(
AVCodecContext
*
avctx
,
VAAPIEncodePicture
*
pic
)
{
VAAPIEncodeContext
*
ctx
=
avctx
->
priv_data
;
VAEncPictureParameterBufferVP8
*
vpic
=
pic
->
codec_picture_params
;
VAAPIEncodeVP8Options
*
opt
=
ctx
->
codec_options
;
int
i
;
vpic
->
reconstructed_frame
=
pic
->
recon_surface
;
vpic
->
coded_buf
=
pic
->
output_buffer
;
switch
(
pic
->
type
)
{
case
PICTURE_TYPE_IDR
:
case
PICTURE_TYPE_I
:
av_assert0
(
pic
->
nb_refs
==
0
);
vpic
->
ref_flags
.
bits
.
force_kf
=
1
;
vpic
->
ref_last_frame
=
vpic
->
ref_gf_frame
=
vpic
->
ref_arf_frame
=
VA_INVALID_SURFACE
;
break
;
case
PICTURE_TYPE_P
:
av_assert0
(
pic
->
nb_refs
==
1
);
vpic
->
ref_flags
.
bits
.
no_ref_last
=
0
;
vpic
->
ref_flags
.
bits
.
no_ref_gf
=
1
;
vpic
->
ref_flags
.
bits
.
no_ref_arf
=
1
;
vpic
->
ref_last_frame
=
vpic
->
ref_gf_frame
=
vpic
->
ref_arf_frame
=
pic
->
refs
[
0
]
->
recon_surface
;
break
;
default:
av_assert0
(
0
&&
"invalid picture type"
);
}
vpic
->
pic_flags
.
bits
.
frame_type
=
(
pic
->
type
!=
PICTURE_TYPE_IDR
);
vpic
->
pic_flags
.
bits
.
show_frame
=
1
;
vpic
->
pic_flags
.
bits
.
refresh_last
=
1
;
vpic
->
pic_flags
.
bits
.
refresh_golden_frame
=
1
;
vpic
->
pic_flags
.
bits
.
refresh_alternate_frame
=
1
;
vpic
->
pic_flags
.
bits
.
version
=
0
;
vpic
->
pic_flags
.
bits
.
loop_filter_type
=
0
;
for
(
i
=
0
;
i
<
4
;
i
++
)
vpic
->
loop_filter_level
[
i
]
=
opt
->
loop_filter_level
;
vpic
->
sharpness_level
=
opt
->
loop_filter_sharpness
;
vpic
->
clamp_qindex_low
=
0
;
vpic
->
clamp_qindex_high
=
127
;
return
0
;
}
static
int
vaapi_encode_vp8_write_quant_table
(
AVCodecContext
*
avctx
,
VAAPIEncodePicture
*
pic
,
int
index
,
int
*
type
,
char
*
data
,
size_t
*
data_len
)
{
VAAPIEncodeContext
*
ctx
=
avctx
->
priv_data
;
VAAPIEncodeVP8Context
*
priv
=
ctx
->
priv_data
;
VAQMatrixBufferVP8
quant
;
int
i
,
q
;
if
(
index
>
0
)
return
AVERROR_EOF
;
if
(
*
data_len
<
sizeof
(
quant
))
return
AVERROR
(
EINVAL
);
*
type
=
VAQMatrixBufferType
;
*
data_len
=
sizeof
(
quant
);
if
(
pic
->
type
==
PICTURE_TYPE_P
)
q
=
priv
->
q_index_p
;
else
q
=
priv
->
q_index_i
;
for
(
i
=
0
;
i
<
4
;
i
++
)
quant
.
quantization_index
[
i
]
=
q
;
for
(
i
=
0
;
i
<
5
;
i
++
)
quant
.
quantization_index_delta
[
i
]
=
0
;
memcpy
(
data
,
&
quant
,
sizeof
(
quant
));
return
0
;
}
static
av_cold
int
vaapi_encode_vp8_configure
(
AVCodecContext
*
avctx
)
{
VAAPIEncodeContext
*
ctx
=
avctx
->
priv_data
;
VAAPIEncodeVP8Context
*
priv
=
ctx
->
priv_data
;
priv
->
q_index_p
=
av_clip
(
avctx
->
global_quality
,
0
,
127
);
if
(
avctx
->
i_quant_factor
>
0
.
0
)
priv
->
q_index_i
=
av_clip
((
avctx
->
global_quality
*
avctx
->
i_quant_factor
+
avctx
->
i_quant_offset
)
+
0
.
5
,
0
,
127
);
else
priv
->
q_index_i
=
priv
->
q_index_p
;
return
0
;
}
static
const
VAAPIEncodeType
vaapi_encode_type_vp8
=
{
.
configure
=
&
vaapi_encode_vp8_configure
,
.
priv_data_size
=
sizeof
(
VAAPIEncodeVP8Context
),
.
sequence_params_size
=
sizeof
(
VAEncSequenceParameterBufferVP8
),
.
init_sequence_params
=
&
vaapi_encode_vp8_init_sequence_params
,
.
picture_params_size
=
sizeof
(
VAEncPictureParameterBufferVP8
),
.
init_picture_params
=
&
vaapi_encode_vp8_init_picture_params
,
.
write_extra_buffer
=
&
vaapi_encode_vp8_write_quant_table
,
};
static
av_cold
int
vaapi_encode_vp8_init
(
AVCodecContext
*
avctx
)
{
VAAPIEncodeContext
*
ctx
=
avctx
->
priv_data
;
if
(
avctx
->
max_b_frames
>
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"B-frames are not supported.
\n
"
);
return
AVERROR_PATCHWELCOME
;
}
ctx
->
codec
=
&
vaapi_encode_type_vp8
;
ctx
->
va_profile
=
VAProfileVP8Version0_3
;
ctx
->
va_entrypoint
=
VAEntrypointEncSlice
;
ctx
->
va_rt_format
=
VA_RT_FORMAT_YUV420
;
if
(
avctx
->
flags
&
AV_CODEC_FLAG_QSCALE
)
{
ctx
->
va_rc_mode
=
VA_RC_CQP
;
}
else
if
(
avctx
->
bit_rate
>
0
)
{
if
(
avctx
->
rc_max_rate
==
avctx
->
bit_rate
)
ctx
->
va_rc_mode
=
VA_RC_CBR
;
else
ctx
->
va_rc_mode
=
VA_RC_VBR
;
}
else
{
ctx
->
va_rc_mode
=
VA_RC_CQP
;
}
// Packed headers are not currently supported.
ctx
->
va_packed_headers
=
0
;
ctx
->
surface_width
=
FFALIGN
(
avctx
->
width
,
16
);
ctx
->
surface_height
=
FFALIGN
(
avctx
->
height
,
16
);
return
ff_vaapi_encode_init
(
avctx
);
}
#define OFFSET(x) (offsetof(VAAPIEncodeContext, codec_options_data) + \
offsetof(VAAPIEncodeVP8Options, x))
#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM)
static
const
AVOption
vaapi_encode_vp8_options
[]
=
{
{
"loop_filter_level"
,
"Loop filter level"
,
OFFSET
(
loop_filter_level
),
AV_OPT_TYPE_INT
,
{
.
i64
=
16
},
0
,
63
,
FLAGS
},
{
"loop_filter_sharpness"
,
"Loop filter sharpness"
,
OFFSET
(
loop_filter_sharpness
),
AV_OPT_TYPE_INT
,
{
.
i64
=
4
},
0
,
15
,
FLAGS
},
{
NULL
},
};
static
const
AVCodecDefault
vaapi_encode_vp8_defaults
[]
=
{
{
"b"
,
"0"
},
{
"bf"
,
"0"
},
{
"g"
,
"120"
},
{
"global_quality"
,
"40"
},
{
NULL
},
};
static
const
AVClass
vaapi_encode_vp8_class
=
{
.
class_name
=
"vp8_vaapi"
,
.
item_name
=
av_default_item_name
,
.
option
=
vaapi_encode_vp8_options
,
.
version
=
LIBAVUTIL_VERSION_INT
,
};
AVCodec
ff_vp8_vaapi_encoder
=
{
.
name
=
"vp8_vaapi"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"VP8 (VAAPI)"
),
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
id
=
AV_CODEC_ID_VP8
,
.
priv_data_size
=
(
sizeof
(
VAAPIEncodeContext
)
+
sizeof
(
VAAPIEncodeVP8Options
)),
.
init
=
&
vaapi_encode_vp8_init
,
.
encode2
=
&
ff_vaapi_encode2
,
.
close
=
&
ff_vaapi_encode_close
,
.
priv_class
=
&
vaapi_encode_vp8_class
,
.
capabilities
=
AV_CODEC_CAP_DELAY
,
.
defaults
=
vaapi_encode_vp8_defaults
,
.
pix_fmts
=
(
const
enum
AVPixelFormat
[])
{
AV_PIX_FMT_VAAPI
,
AV_PIX_FMT_NONE
,
},
};
libavcodec/version.h
View file @
ca62236a
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 3
2
#define LIBAVCODEC_VERSION_MINOR 3
3
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
#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