Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
ff0eb2bc
Commit
ff0eb2bc
authored
6 years ago
by
Mark Thompson
Browse files
Options
Downloads
Patches
Plain Diff
vaapi_encode_mjpeg: Use CBS to store parameters and write headers
Also adds greyscale, 4:2:2, 4:4:4 and RGB support.
parent
525de200
No related branches found
No related tags found
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure
+1
-1
1 addition, 1 deletion
configure
doc/encoders.texi
+15
-2
15 additions, 2 deletions
doc/encoders.texi
libavcodec/vaapi_encode_mjpeg.c
+331
-198
331 additions, 198 deletions
libavcodec/vaapi_encode_mjpeg.c
with
347 additions
and
201 deletions
configure
+
1
−
1
View file @
ff0eb2bc
...
...
@@ -2974,7 +2974,7 @@ mjpeg_cuvid_decoder_deps="cuvid"
mjpeg_qsv_encoder_deps
=
"libmfx"
mjpeg_qsv_encoder_select
=
"qsvenc"
mjpeg_vaapi_encoder_deps
=
"VAEncPictureParameterBufferJPEG"
mjpeg_vaapi_encoder_select
=
"vaapi_encode
jpegtables
"
mjpeg_vaapi_encoder_select
=
"
cbs_jpeg jpegtables
vaapi_encode"
mpeg1_cuvid_decoder_deps
=
"cuvid"
mpeg1_v4l2m2m_decoder_deps
=
"v4l2_m2m mpeg1_v4l2_m2m"
mpeg2_crystalhd_decoder_select
=
"crystalhd"
...
...
This diff is collapsed.
Click to expand it.
doc/encoders.texi
+
15
−
2
View file @
ff0eb2bc
...
...
@@ -2662,8 +2662,21 @@ Include access unit delimiters in the stream (not included by default).
@end table
@item mjpeg_vaapi
Always encodes using the standard quantisation and huffman tables -
@option{global_quality} scales the standard quantisation table (range 1-100).
Only baseline DCT encoding is supported. The encoder always uses the standard
quantisation and huffman tables - @option{global_quality} scales the standard
quantisation table (range 1-100).
For YUV, 4:2:0, 4:2:2 and 4:4:4 subsampling modes are supported. RGB is also
supported, and will create an RGB JPEG.
@table @option
@item jfif
Include JFIF header in each frame (not included by default).
@item huffman
Include standard huffman tables (on by default). Turning this off will save
a few hundred bytes in each output frame, but may lose compatibility with some
JPEG decoders which don't fully handle MJPEG.
@end table
@item mpeg2_vaapi
@option{profile} and @option{level} set the value of @emph{profile_and_level_indication}.
...
...
This diff is collapsed.
Click to expand it.
libavcodec/vaapi_encode_mjpeg.c
+
331
−
198
View file @
ff0eb2bc
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment