October 2019 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/wc3movie: fix memleak when read content size not equvipe input size
by Steven Liu 28 Oct '19

28 Oct '19

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Thu Oct 10 10:07:56 2019 +0800| [68f623d64451a6ee8c81b6071ec68d6097c0f213] | committer: Steven Liu avformat/wc3movie: fix memleak when read content size not equvipe input size Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68f623d64451a6ee8… --- libavformat/wc3movie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c index 27f5eb1962..6577007777 100644 --- a/libavformat/wc3movie.c +++ b/libavformat/wc3movie.c @@ -130,8 +130,10 @@ static int wc3_read_header(AVFormatContext *s) buffer = av_malloc(size+1); if (!buffer) return AVERROR(ENOMEM); - if ((ret = avio_read(pb, buffer, size)) != size) + if ((ret = avio_read(pb, buffer, size)) != size) { + av_freep(&buffer); return AVERROR(EIO); + } buffer[size] = 0; av_dict_set(&s->metadata, "title", buffer, AV_DICT_DONT_STRDUP_VAL);

1 0

avformat/swfdec: fix memleak when inflateInit failed
by Steven Liu 28 Oct '19

28 Oct '19

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Thu Oct 10 10:07:55 2019 +0800| [70c6e8406984d435543fe172dae481c8de491619] | committer: Steven Liu avformat/swfdec: fix memleak when inflateInit failed Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70c6e8406984d4355… --- libavformat/swfdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index 85bd30404e..a9358f09a9 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -152,6 +152,8 @@ static int swf_read_header(AVFormatContext *s) swf->zpb->seekable = 0; if (inflateInit(&swf->zstream) != Z_OK) { av_log(s, AV_LOG_ERROR, "Unable to init zlib context\n"); + av_freep(&swf->zbuf_in); + av_freep(&swf->zbuf_out); return AVERROR(EINVAL); } pb = swf->zpb;

1 0

avformat/smacker: fix memleak when avformat_new_stream failed
by Steven Liu 28 Oct '19

28 Oct '19

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Thu Oct 10 10:07:54 2019 +0800| [a3655a5cb2abf3bf2c8a2fa596643059de3396e4] | committer: Steven Liu avformat/smacker: fix memleak when avformat_new_stream failed Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3655a5cb2abf3bf2… --- libavformat/smacker.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavformat/smacker.c b/libavformat/smacker.c index b5c858aa9b..239894dad0 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -172,8 +172,11 @@ static int smacker_read_header(AVFormatContext *s) /* init video codec */ st = avformat_new_stream(s, NULL); - if (!st) + if (!st) { + av_freep(&smk->frm_size); + av_freep(&smk->frm_flags); return AVERROR(ENOMEM); + } smk->videoindex = st->index; st->codecpar->width = smk->width; st->codecpar->height = smk->height; @@ -195,8 +198,11 @@ static int smacker_read_header(AVFormatContext *s) smk->indexes[i] = -1; if (smk->rates[i]) { ast[i] = avformat_new_stream(s, NULL); - if (!ast[i]) + if (!ast[i]) { + av_freep(&smk->frm_size); + av_freep(&smk->frm_flags); return AVERROR(ENOMEM); + } smk->indexes[i] = ast[i]->index; ast[i]->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; if (smk->aflags[i] & SMK_AUD_BINKAUD) {

1 0

avformat/rtmpproto: fix memleak when open rtmp failed
by Steven Liu 28 Oct '19

28 Oct '19

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Thu Oct 10 10:07:53 2019 +0800| [991cf95fdeebc3aff34c3dd094df0589f7a02f68] | committer: Steven Liu avformat/rtmpproto: fix memleak when open rtmp failed Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=991cf95fdeebc3aff… --- libavformat/rtmpproto.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index eb08d4d424..42c6b94ea0 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -2880,6 +2880,9 @@ reconnect: return 0; fail: + av_freep(&rt->playpath); + av_freep(&rt->tcurl); + av_freep(&rt->flashver); av_dict_free(opts); rtmp_close(s); return ret;

1 0

avformat/rl2: fix memleak when read end of file
by Steven Liu 28 Oct '19

28 Oct '19

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Thu Oct 10 10:07:52 2019 +0800| [59697e42e1b7535863794d301fbdb75e119f4683] | committer: Steven Liu avformat/rl2: fix memleak when read end of file Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59697e42e1b753586… --- libavformat/rl2.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/libavformat/rl2.c b/libavformat/rl2.c index d847d9aaa8..07696965c7 100644 --- a/libavformat/rl2.c +++ b/libavformat/rl2.c @@ -171,18 +171,24 @@ static av_cold int rl2_read_header(AVFormatContext *s) /** read offset and size tables */ for(i=0; i < frame_count;i++) { - if (avio_feof(pb)) - return AVERROR_INVALIDDATA; + if (avio_feof(pb)) { + ret = AVERROR_INVALIDDATA; + goto end; + } chunk_size[i] = avio_rl32(pb); } for(i=0; i < frame_count;i++) { - if (avio_feof(pb)) - return AVERROR_INVALIDDATA; + if (avio_feof(pb)) { + ret = AVERROR_INVALIDDATA; + goto end; + } chunk_offset[i] = avio_rl32(pb); } for(i=0; i < frame_count;i++) { - if (avio_feof(pb)) - return AVERROR_INVALIDDATA; + if (avio_feof(pb)) { + ret = AVERROR_INVALIDDATA; + goto end; + } audio_size[i] = avio_rl32(pb) & 0xFFFF; } @@ -203,7 +209,7 @@ static av_cold int rl2_read_header(AVFormatContext *s) ++video_frame_counter; } - +end: av_free(chunk_size); av_free(audio_size); av_free(chunk_offset);

1 0

avformat/mpc8: fix memleak when seek table too big
by Steven Liu 28 Oct '19

28 Oct '19

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Thu Oct 10 10:07:51 2019 +0800| [7a200089641b19b8cddbf844d9047be1d676cba8] | committer: Steven Liu avformat/mpc8: fix memleak when seek table too big Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a200089641b19b8c… --- libavformat/mpc8.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c index 0eb879ffc0..e452cd6878 100644 --- a/libavformat/mpc8.c +++ b/libavformat/mpc8.c @@ -168,6 +168,7 @@ static void mpc8_parse_seektable(AVFormatContext *s, int64_t off) size = gb_get_v(&gb); if(size > UINT_MAX/4 || size > c->samples/1152){ av_log(s, AV_LOG_ERROR, "Seek table is too big\n"); + av_free(buf); return; } seekd = get_bits(&gb, 4);

1 0

avformat/libmodplug: fix memleak when load modplug failed
by Steven Liu 28 Oct '19

28 Oct '19

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Thu Oct 10 10:07:50 2019 +0800| [22eae2d0c9fc5d5847bb7b64debe8d4b72fdff01] | committer: Steven Liu avformat/libmodplug: fix memleak when load modplug failed Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=22eae2d0c9fc5d584… --- libavformat/libmodplug.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/libmodplug.c b/libavformat/libmodplug.c index 314bdae3e7..d4f78d99b1 100644 --- a/libavformat/libmodplug.c +++ b/libavformat/libmodplug.c @@ -216,9 +216,10 @@ static int modplug_read_header(AVFormatContext *s) ModPlug_SetSettings(&settings); modplug->f = ModPlug_Load(modplug->buf, sz); - if (!modplug->f) + if (!modplug->f) { + av_freep(&modplug->buf); return AVERROR_INVALIDDATA; - + } st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM);

1 0

avformat/hlsenc: move freep segment from sls_flags_filename_process after caller failed
by Steven Liu 28 Oct '19

28 Oct '19

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Thu Oct 10 10:07:49 2019 +0800| [1a109fba5499f95d3d0cc526a912f9e71446c812] | committer: Steven Liu avformat/hlsenc: move freep segment from sls_flags_filename_process after caller failed Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a109fba5499f95d3… --- libavformat/hlsenc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 7b1d54e23e..0876f72f13 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -889,7 +889,6 @@ static int sls_flags_filename_process(struct AVFormatContext *s, HLSContext *hls strlen(vs->current_segment_final_filename_fmt)) { char * new_url = av_strdup(vs->current_segment_final_filename_fmt); if (!new_url) { - av_freep(&en); return AVERROR(ENOMEM); } ff_format_set_url(vs->avf, new_url); @@ -901,7 +900,6 @@ static int sls_flags_filename_process(struct AVFormatContext *s, HLSContext *hls "you can try to remove second_level_segment_size flag\n", vs->avf->url); av_freep(&filename); - av_freep(&en); return AVERROR(EINVAL); } ff_format_set_url(vs->avf, filename); @@ -915,7 +913,6 @@ static int sls_flags_filename_process(struct AVFormatContext *s, HLSContext *hls "you can try to remove second_level_segment_time flag\n", vs->avf->url); av_freep(&filename); - av_freep(&en); return AVERROR(EINVAL); } ff_format_set_url(vs->avf, filename); @@ -1037,6 +1034,7 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, en->var_stream_idx = vs->var_stream_idx; ret = sls_flags_filename_process(s, hls, vs, en, duration, pos, size); if (ret < 0) { + av_freep(&en); return ret; }

1 0

avcodec/vmdvideo: fix log error message
by Paul B Mahol 27 Oct '19

27 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Oct 27 12:12:24 2019 +0100| [ebff4bbd82c371bab6635de5793ce93c1f62642d] | committer: Paul B Mahol avcodec/vmdvideo: fix log error message Fixes #8339 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ebff4bbd82c371bab… --- libavcodec/vmdvideo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vmdvideo.c b/libavcodec/vmdvideo.c index b97032ff7e..c1dc5b9696 100644 --- a/libavcodec/vmdvideo.c +++ b/libavcodec/vmdvideo.c @@ -226,7 +226,7 @@ static int vmd_decode(VmdVideoContext *s, AVFrame *frame) frame_y + frame_height > s->avctx->height) { av_log(s->avctx, AV_LOG_ERROR, "Invalid vertical range %d-%d\n", - frame_x, frame_width); + frame_y, frame_height); return AVERROR_INVALIDDATA; }

1 0

Add support for VP9 VDPAU hwaccel decode
by ManojGuptaBonda 26 Oct '19

26 Oct '19

ffmpeg | branch: master | ManojGuptaBonda <mbonda(a)nvidia.com> | Fri Oct 25 11:18:13 2019 +0530| [1054752c563cbe978f16010ed57dfa23a41ee490] | committer: Philip Langdale Add support for VP9 VDPAU hwaccel decode Support for VDPAU accelerated VP9 decoding was added with libvdpau-1.3. Support for the same in ffmpeg is added with this patch. Profiles related to VDPAU VP9 can be found in latest vdpau.h present in libvdpau-1.3. DRC clips are not supported yet due to http://trac.ffmpeg.org/ticket/8068 Add VP9 VDPAU to list of hwaccels and supported formats Added file vdpau_vp9.c and Modified configure to add VDPAU VP9 support. Mapped VP9 profiles to VDPAU VP9 profiles. Populated the codec specific params that need to be passed to VDPAU. Signed-off-by: Philip Langdale <philipl(a)overt.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1054752c563cbe978… --- Changelog | 1 + configure | 3 + libavcodec/Makefile | 1 + libavcodec/hwaccels.h | 1 + libavcodec/vdpau_internal.h | 3 + libavcodec/vdpau_vp9.c | 242 ++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 4 +- libavcodec/vp9.c | 9 +- 8 files changed, 261 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index f49c4d351d..6fab938e0f 100644 --- a/Changelog +++ b/Changelog @@ -18,6 +18,7 @@ version <next>: - arnndn filter - bilateral filter - maskedmin and maskedmax filters +- VDPAU VP9 hwaccel version 4.2: diff --git a/configure b/configure index 8413826f9e..7f63eebc9d 100755 --- a/configure +++ b/configure @@ -2979,6 +2979,8 @@ vp9_nvdec_hwaccel_deps="nvdec" vp9_nvdec_hwaccel_select="vp9_decoder" vp9_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferVP9_bit_depth" vp9_vaapi_hwaccel_select="vp9_decoder" +vp9_vdpau_hwaccel_deps="vdpau VdpPictureInfoVP9" +vp9_vdpau_hwaccel_select="vp9_decoder" wmv3_d3d11va_hwaccel_select="vc1_d3d11va_hwaccel" wmv3_d3d11va2_hwaccel_select="vc1_d3d11va2_hwaccel" wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel" @@ -6093,6 +6095,7 @@ check_type "windows.h d3d11.h" "ID3D11VideoContext" check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602 check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC" +check_type "vdpau/vdpau.h" "VdpPictureInfoVP9" if [ -z "$nvccflags" ]; then nvccflags=$nvccflags_default diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 37a84a6bb4..34c3a22116 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -913,6 +913,7 @@ OBJS-$(CONFIG_VP9_D3D11VA_HWACCEL) += dxva2_vp9.o OBJS-$(CONFIG_VP9_DXVA2_HWACCEL) += dxva2_vp9.o OBJS-$(CONFIG_VP9_NVDEC_HWACCEL) += nvdec_vp9.o OBJS-$(CONFIG_VP9_VAAPI_HWACCEL) += vaapi_vp9.o +OBJS-$(CONFIG_VP9_VDPAU_HWACCEL) += vdpau_vp9.o OBJS-$(CONFIG_VP8_QSV_HWACCEL) += qsvdec_other.o # libavformat dependencies diff --git a/libavcodec/hwaccels.h b/libavcodec/hwaccels.h index 7d73da8676..6109c89bd6 100644 --- a/libavcodec/hwaccels.h +++ b/libavcodec/hwaccels.h @@ -68,6 +68,7 @@ extern const AVHWAccel ff_vp9_d3d11va2_hwaccel; extern const AVHWAccel ff_vp9_dxva2_hwaccel; extern const AVHWAccel ff_vp9_nvdec_hwaccel; extern const AVHWAccel ff_vp9_vaapi_hwaccel; +extern const AVHWAccel ff_vp9_vdpau_hwaccel; extern const AVHWAccel ff_wmv3_d3d11va_hwaccel; extern const AVHWAccel ff_wmv3_d3d11va2_hwaccel; extern const AVHWAccel ff_wmv3_dxva2_hwaccel; diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 1ee38dbc55..b6ea078cb2 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -54,6 +54,9 @@ union VDPAUPictureInfo { #ifdef VDP_YCBCR_FORMAT_Y_U_V_444 VdpPictureInfoHEVC444 hevc_444; #endif +#ifdef VDP_DECODER_PROFILE_VP9_PROFILE_0 + VdpPictureInfoVP9 vp9; +#endif }; typedef struct VDPAUHWContext { diff --git a/libavcodec/vdpau_vp9.c b/libavcodec/vdpau_vp9.c new file mode 100644 index 0000000000..f1ee4ac5e0 --- /dev/null +++ b/libavcodec/vdpau_vp9.c @@ -0,0 +1,242 @@ +/* + * VP9 HW decode acceleration through VDPAU + * + * Copyright (c) 2019 Manoj Gupta Bonda + * + * This file is part of FFmpeg. + * + * FFmpeg 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. + * + * FFmpeg 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 FFmpeg; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <vdpau/vdpau.h> +#include "libavutil/pixdesc.h" +#include "avcodec.h" +#include "internal.h" +#include "vp9data.h" +#include "vp9dec.h" +#include "hwaccel.h" +#include "vdpau.h" +#include "vdpau_internal.h" + +static int vdpau_vp9_start_frame(AVCodecContext *avctx, + const uint8_t *buffer, uint32_t size) +{ + VP9Context *s = avctx->priv_data; + VP9SharedContext *h = &(s->s); + const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(avctx->sw_pix_fmt); + if (!pixdesc) { + return AV_PIX_FMT_NONE; + } + + VP9Frame pic = h->frames[CUR_FRAME]; + struct vdpau_picture_context *pic_ctx = pic.hwaccel_picture_private; + int i; + + VdpPictureInfoVP9 *info = &pic_ctx->info.vp9; + + info->width = avctx->width; + info->height = avctx->height; + /* fill LvPictureInfoVP9 struct */ + info->lastReference = VDP_INVALID_HANDLE; + info->goldenReference = VDP_INVALID_HANDLE; + info->altReference = VDP_INVALID_HANDLE; + + if (h->refs[h->h.refidx[0]].f && h->refs[h->h.refidx[0]].f->private_ref) { + info->lastReference = ff_vdpau_get_surface_id(h->refs[h->h.refidx[0]].f); + } + if (h->refs[h->h.refidx[1]].f && h->refs[h->h.refidx[1]].f->private_ref) { + info->goldenReference = ff_vdpau_get_surface_id(h->refs[h->h.refidx[1]].f); + } + if (h->refs[h->h.refidx[2]].f && h->refs[h->h.refidx[2]].f->private_ref) { + info->altReference = ff_vdpau_get_surface_id(h->refs[h->h.refidx[2]].f); + } + + info->profile = h->h.profile; + info->frameContextIdx = h->h.framectxid; + info->keyFrame = h->h.keyframe; + info->showFrame = !h->h.invisible; + info->errorResilient = h->h.errorres; + info->frameParallelDecoding = h->h.parallelmode; + + info->subSamplingX = pixdesc->log2_chroma_w; + info->subSamplingY = pixdesc->log2_chroma_h; + + info->intraOnly = h->h.intraonly; + info->allowHighPrecisionMv = h->h.keyframe ? 0 : h->h.highprecisionmvs; + info->refreshEntropyProbs = h->h.refreshctx; + + info->bitDepthMinus8Luma = pixdesc->comp[0].depth - 8; + info->bitDepthMinus8Chroma = pixdesc->comp[1].depth - 8; + + info->loopFilterLevel = h->h.filter.level; + info->loopFilterSharpness = h->h.filter.sharpness; + info->modeRefLfEnabled = h->h.lf_delta.enabled; + + info->log2TileColumns = h->h.tiling.log2_tile_cols; + info->log2TileRows = h->h.tiling.log2_tile_rows; + + info->segmentEnabled = h->h.segmentation.enabled; + info->segmentMapUpdate = h->h.segmentation.update_map; + info->segmentMapTemporalUpdate = h->h.segmentation.temporal; + info->segmentFeatureMode = h->h.segmentation.absolute_vals; + + info->qpYAc = h->h.yac_qi; + info->qpYDc = h->h.ydc_qdelta; + info->qpChDc = h->h.uvdc_qdelta; + info->qpChAc = h->h.uvac_qdelta; + + info->resetFrameContext = h->h.resetctx; + info->mcompFilterType = h->h.filtermode ^ (h->h.filtermode <= 1); + info->uncompressedHeaderSize = h->h.uncompressed_header_size; + info->compressedHeaderSize = h->h.compressed_header_size; + info->refFrameSignBias[0] = 0; + + + for (i = 0; i < FF_ARRAY_ELEMS(info->mbModeLfDelta); i++) + info->mbModeLfDelta[i] = h->h.lf_delta.mode[i]; + + for (i = 0; i < FF_ARRAY_ELEMS(info->mbRefLfDelta); i++) + info->mbRefLfDelta[i] = h->h.lf_delta.ref[i]; + + for (i = 0; i < FF_ARRAY_ELEMS(info->mbSegmentTreeProbs); i++) + info->mbSegmentTreeProbs[i] = h->h.segmentation.prob[i]; + + for (i = 0; i < FF_ARRAY_ELEMS(info->activeRefIdx); i++) { + info->activeRefIdx[i] = h->h.refidx[i]; + info->segmentPredProbs[i] = h->h.segmentation.pred_prob[i]; + info->refFrameSignBias[i + 1] = h->h.signbias[i]; + } + + for (i = 0; i < FF_ARRAY_ELEMS(info->segmentFeatureEnable); i++) { + info->segmentFeatureEnable[i][0] = h->h.segmentation.feat[i].q_enabled; + info->segmentFeatureEnable[i][1] = h->h.segmentation.feat[i].lf_enabled; + info->segmentFeatureEnable[i][2] = h->h.segmentation.feat[i].ref_enabled; + info->segmentFeatureEnable[i][3] = h->h.segmentation.feat[i].skip_enabled; + + info->segmentFeatureData[i][0] = h->h.segmentation.feat[i].q_val; + info->segmentFeatureData[i][1] = h->h.segmentation.feat[i].lf_val; + info->segmentFeatureData[i][2] = h->h.segmentation.feat[i].ref_val; + info->segmentFeatureData[i][3] = 0; + } + + switch (avctx->colorspace) { + default: + case AVCOL_SPC_UNSPECIFIED: + info->colorSpace = 0; + break; + case AVCOL_SPC_BT470BG: + info->colorSpace = 1; + break; + case AVCOL_SPC_BT709: + info->colorSpace = 2; + break; + case AVCOL_SPC_SMPTE170M: + info->colorSpace = 3; + break; + case AVCOL_SPC_SMPTE240M: + info->colorSpace = 4; + break; + case AVCOL_SPC_BT2020_NCL: + info->colorSpace = 5; + break; + case AVCOL_SPC_RESERVED: + info->colorSpace = 6; + break; + case AVCOL_SPC_RGB: + info->colorSpace = 7; + break; + } + + return ff_vdpau_common_start_frame(pic_ctx, buffer, size); + +} + +static const uint8_t start_code_prefix[3] = { 0x00, 0x00, 0x01 }; + +static int vdpau_vp9_decode_slice(AVCodecContext *avctx, + const uint8_t *buffer, uint32_t size) +{ + VP9SharedContext *h = avctx->priv_data; + VP9Frame pic = h->frames[CUR_FRAME]; + struct vdpau_picture_context *pic_ctx = pic.hwaccel_picture_private; + + int val; + + val = ff_vdpau_add_buffer(pic_ctx, start_code_prefix, 3); + if (val) + return val; + + val = ff_vdpau_add_buffer(pic_ctx, buffer, size); + if (val) + return val; + + return 0; +} + +static int vdpau_vp9_end_frame(AVCodecContext *avctx) +{ + VP9SharedContext *h = avctx->priv_data; + VP9Frame pic = h->frames[CUR_FRAME]; + struct vdpau_picture_context *pic_ctx = pic.hwaccel_picture_private; + + int val; + + val = ff_vdpau_common_end_frame(avctx, pic.tf.f, pic_ctx); + if (val < 0) + return val; + + return 0; +} + +static int vdpau_vp9_init(AVCodecContext *avctx) +{ + VdpDecoderProfile profile; + uint32_t level = avctx->level; + + switch (avctx->profile) { + case FF_PROFILE_VP9_0: + profile = VDP_DECODER_PROFILE_VP9_PROFILE_0; + break; + case FF_PROFILE_VP9_1: + profile = VDP_DECODER_PROFILE_VP9_PROFILE_1; + break; + case FF_PROFILE_VP9_2: + profile = VDP_DECODER_PROFILE_VP9_PROFILE_2; + break; + case FF_PROFILE_VP9_3: + profile = VDP_DECODER_PROFILE_VP9_PROFILE_3; + break; + default: + return AVERROR(ENOTSUP); + } + + return ff_vdpau_common_init(avctx, profile, level); +} + +const AVHWAccel ff_vp9_vdpau_hwaccel = { + .name = "vp9_vdpau", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_VP9, + .pix_fmt = AV_PIX_FMT_VDPAU, + .start_frame = vdpau_vp9_start_frame, + .end_frame = vdpau_vp9_end_frame, + .decode_slice = vdpau_vp9_decode_slice, + .frame_priv_data_size = sizeof(struct vdpau_picture_context), + .init = vdpau_vp9_init, + .uninit = ff_vdpau_common_uninit, + .frame_params = ff_vdpau_common_frame_params, + .priv_data_size = sizeof(VDPAUContext), + .caps_internal = HWACCEL_CAP_ASYNC_SAFE, +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 2e047a6f51..27c126ee7d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 59 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MINOR 60 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index f16462b1e9..0fd15efed3 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -173,7 +173,8 @@ static int update_size(AVCodecContext *avctx, int w, int h) #define HWACCEL_MAX (CONFIG_VP9_DXVA2_HWACCEL + \ CONFIG_VP9_D3D11VA_HWACCEL * 2 + \ CONFIG_VP9_NVDEC_HWACCEL + \ - CONFIG_VP9_VAAPI_HWACCEL) + CONFIG_VP9_VAAPI_HWACCEL + \ + CONFIG_VP9_VDPAU_HWACCEL) enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmtp = pix_fmts; VP9Context *s = avctx->priv_data; uint8_t *p; @@ -188,6 +189,9 @@ static int update_size(AVCodecContext *avctx, int w, int h) switch (s->pix_fmt) { case AV_PIX_FMT_YUV420P: +#if CONFIG_VP9_VDPAU_HWACCEL + *fmtp++ = AV_PIX_FMT_VDPAU; +#endif case AV_PIX_FMT_YUV420P10: #if CONFIG_VP9_DXVA2_HWACCEL *fmtp++ = AV_PIX_FMT_DXVA2_VLD; @@ -1816,6 +1820,9 @@ AVCodec ff_vp9_decoder = { #endif #if CONFIG_VP9_VAAPI_HWACCEL HWACCEL_VAAPI(vp9), +#endif +#if CONFIG_VP9_VDPAU_HWACCEL + HWACCEL_VDPAU(vp9), #endif NULL },

1 0