RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/qsvdec: refact, remove duplicate code for plugin loading 

Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
Signed-off-by: Linjie Fu <linjie.justin.fu@gmail.com>
This commit is contained in:
Xu Guangxin 2021-01-05 10:43:42 +08:00 committed by Linjie Fu
parent d78ecf10bd
commit 7a5a5e68bf
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/qsvdec.c
View File

@ -682,21 +682,12 @@ static av_cold int qsv_decode_init(AVCodecContext *avctx)
{
QSVDecContext *s = avctx->priv_data;
int ret;
const char *uid = NULL;
if (avctx->codec_id == AV_CODEC_ID_VP8) {
static const char *uid_vp8dec_hw = "f622394d8d87452f878c51f2fc9b4131";
av_freep(&s->qsv.load_plugins);
s->qsv.load_plugins = av_strdup(uid_vp8dec_hw);
if (!s->qsv.load_plugins)
return AVERROR(ENOMEM);
uid = "f622394d8d87452f878c51f2fc9b4131";
} else if (avctx->codec_id == AV_CODEC_ID_VP9) {
static const char *uid_vp9dec_hw = "a922394d8d87452f878c51f2fc9b4131";
av_freep(&s->qsv.load_plugins);
s->qsv.load_plugins = av_strdup(uid_vp9dec_hw);
if (!s->qsv.load_plugins)
return AVERROR(ENOMEM);
uid = "a922394d8d87452f878c51f2fc9b4131";
}
else if (avctx->codec_id == AV_CODEC_ID_HEVC && s->load_plugin != LOAD_PLUGIN_NONE) {
static const char * const uid_hevcdec_sw = "15dd936825ad475ea34e35f3f54217a6";
@ -707,16 +698,18 @@ static av_cold int qsv_decode_init(AVCodecContext *avctx)
"load_plugins is not empty, but load_plugin is not set to 'none'."
"The load_plugin value will be ignored.\n");
} else {
av_freep(&s->qsv.load_plugins);
if (s->load_plugin == LOAD_PLUGIN_HEVC_SW)
s->qsv.load_plugins = av_strdup(uid_hevcdec_sw);
uid = uid_hevcdec_sw;
else
s->qsv.load_plugins = av_strdup(uid_hevcdec_hw);
if (!s->qsv.load_plugins)
return AVERROR(ENOMEM);
uid = uid_hevcdec_hw;
}
}
if (uid) {
av_freep(&s->qsv.load_plugins);
s->qsv.load_plugins = av_strdup(uid);
if (!s->qsv.load_plugins)
return AVERROR(ENOMEM);
}
s->qsv.orig_pix_fmt = AV_PIX_FMT_NV12;
s->packet_fifo = av_fifo_alloc(sizeof(AVPacket));