Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
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
savoirfairelinux
jami-daemon
Commits
ba5ba76b
Commit
ba5ba76b
authored
5 years ago
by
Pierre Lespagnol
Browse files
Options
Downloads
Patches
Plain Diff
codec: add H265 for macOS and iOS
Change-Id: I5531e4a393a2c64382f7a486c04abc7df78ccabc
parent
df53e2c6
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/media/video/accel.cpp
+7
-7
7 additions, 7 deletions
src/media/video/accel.cpp
with
7 additions
and
7 deletions
src/media/video/accel.cpp
+
7
−
7
View file @
ba5ba76b
...
...
@@ -41,18 +41,18 @@ struct HardwareAPI
};
static
const
std
::
list
<
HardwareAPI
>
apiListDec
=
{
{
"nvdec"
,
AV_HWDEVICE_TYPE_CUDA
,
AV_PIX_FMT_CUDA
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_H
265
,
AV_CODEC_ID_VP8
,
AV_CODEC_ID_MJPEG
},
{
"0"
,
"1"
,
"2"
}
},
{
"nvdec"
,
AV_HWDEVICE_TYPE_CUDA
,
AV_PIX_FMT_CUDA
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_H
EVC
,
AV_CODEC_ID_VP8
,
AV_CODEC_ID_MJPEG
},
{
"0"
,
"1"
,
"2"
}
},
{
"vaapi"
,
AV_HWDEVICE_TYPE_VAAPI
,
AV_PIX_FMT_VAAPI
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_MPEG4
,
AV_CODEC_ID_VP8
,
AV_CODEC_ID_MJPEG
},
{
"/dev/dri/renderD128"
,
"/dev/dri/renderD129"
,
":0"
}
},
{
"vdpau"
,
AV_HWDEVICE_TYPE_VDPAU
,
AV_PIX_FMT_VDPAU
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_MPEG4
},
{
}
},
{
"videotoolbox"
,
AV_HWDEVICE_TYPE_VIDEOTOOLBOX
,
AV_PIX_FMT_VIDEOTOOLBOX
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_MPEG4
},
{
}
},
{
"qsv"
,
AV_HWDEVICE_TYPE_QSV
,
AV_PIX_FMT_QSV
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_H
265
,
AV_CODEC_ID_MJPEG
,
AV_CODEC_ID_VP8
,
AV_CODEC_ID_VP9
},
{
}
},
{
"videotoolbox"
,
AV_HWDEVICE_TYPE_VIDEOTOOLBOX
,
AV_PIX_FMT_VIDEOTOOLBOX
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_HEVC
,
AV_CODEC_ID_MPEG4
},
{
}
},
{
"qsv"
,
AV_HWDEVICE_TYPE_QSV
,
AV_PIX_FMT_QSV
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_H
EVC
,
AV_CODEC_ID_MJPEG
,
AV_CODEC_ID_VP8
,
AV_CODEC_ID_VP9
},
{
}
},
};
static
const
std
::
list
<
HardwareAPI
>
apiListEnc
=
{
{
"nvenc"
,
AV_HWDEVICE_TYPE_CUDA
,
AV_PIX_FMT_CUDA
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_H
265
},
{
"0"
,
"1"
,
"2"
}
},
{
"vaapi"
,
AV_HWDEVICE_TYPE_VAAPI
,
AV_PIX_FMT_VAAPI
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_H
265
,
AV_CODEC_ID_MJPEG
,
AV_CODEC_ID_VP8
},
{
"/dev/dri/renderD128"
,
"/dev/dri/renderD129"
,
":0"
}
},
{
"videotoolbox"
,
AV_HWDEVICE_TYPE_VIDEOTOOLBOX
,
AV_PIX_FMT_VIDEOTOOLBOX
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
},
{
}
},
{
"qsv"
,
AV_HWDEVICE_TYPE_QSV
,
AV_PIX_FMT_QSV
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_H
265
,
AV_CODEC_ID_MJPEG
,
AV_CODEC_ID_VP8
},
{
}
},
{
"nvenc"
,
AV_HWDEVICE_TYPE_CUDA
,
AV_PIX_FMT_CUDA
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_H
EVC
},
{
"0"
,
"1"
,
"2"
}
},
{
"vaapi"
,
AV_HWDEVICE_TYPE_VAAPI
,
AV_PIX_FMT_VAAPI
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_H
EVC
,
AV_CODEC_ID_MJPEG
,
AV_CODEC_ID_VP8
},
{
"/dev/dri/renderD128"
,
"/dev/dri/renderD129"
,
":0"
}
},
{
"videotoolbox"
,
AV_HWDEVICE_TYPE_VIDEOTOOLBOX
,
AV_PIX_FMT_VIDEOTOOLBOX
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_HEVC
},
{
}
},
{
"qsv"
,
AV_HWDEVICE_TYPE_QSV
,
AV_PIX_FMT_QSV
,
AV_PIX_FMT_NV12
,
{
AV_CODEC_ID_H264
,
AV_CODEC_ID_H
EVC
,
AV_CODEC_ID_MJPEG
,
AV_CODEC_ID_VP8
},
{
}
},
};
HardwareAccel
::
HardwareAccel
(
AVCodecID
id
,
const
std
::
string
&
name
,
AVHWDeviceType
hwType
,
AVPixelFormat
format
,
AVPixelFormat
swFormat
,
CodecType
type
)
...
...
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