[FFmpeg-cvslog] hwcontext_vaapi: Add an assert in vaapi_map_from_drm()

Haihao Xiang git at videolan.org
Thu May 10 22:03:55 EEST 2018


ffmpeg | branch: master | Haihao Xiang <haihao.xiang at intel.com> | Thu May 10 11:08:23 2018 +0800| [bed670a1de29b58fcb3fe046562d8bd125b1457f] | committer: Mark Thompson

hwcontext_vaapi: Add an assert in vaapi_map_from_drm()

Every fourcc in vaapi_drm_format_map should be in
vaapi_format_map, so add an assert to ensure we have the right maps.

Signed-off-by: Haihao Xiang <haihao.xiang at intel.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bed670a1de29b58fcb3fe046562d8bd125b1457f
---

 libavutil/hwcontext_vaapi.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
index 7daaa951cc..e55bb8db3f 100644
--- a/libavutil/hwcontext_vaapi.c
+++ b/libavutil/hwcontext_vaapi.c
@@ -1028,6 +1028,8 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst,
             va_rt_format = vaapi_format_map[i].rt_format;
     }
 
+    av_assert0(i < FF_ARRAY_ELEMS(vaapi_format_map));
+
     buffer_handle = desc->objects[0].fd;
     buffer_desc.pixel_format = va_fourcc;
     buffer_desc.width        = src_fc->width;



More information about the ffmpeg-cvslog mailing list