openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-27 13:10:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dxva2_h264: fix size alignment asserts

Browse Source 
Convert them to av_assert0 in the process
This commit is contained in:
Hendrik Leppkes 2016-03-16 13:12:59 +01:00
parent c43d485811
commit c198295ded
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/dxva2_h264.c
View File

@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/avassert.h"
#include "h264.h"
#include "h264data.h"
#include "mpegutils.h"
@ -405,6 +407,8 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
dsc11->NumMBsInBuffer = mb_count;
type = D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL;
av_assert0((dsc11->DataSize & 127) == 0);
}
#endif
#if CONFIG_DXVA2
@ -416,6 +420,8 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
dsc2->NumMBsInBuffer = mb_count;
type = DXVA2_SliceControlBufferType;
av_assert0((dsc2->DataSize & 127) == 0);
}
#endif
@ -426,12 +432,6 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
slice_data = ctx_pic->slice_long;
slice_size = ctx_pic->slice_count * sizeof(*ctx_pic->slice_long);
}
#if CONFIG_D3D11VA
assert((((D3D11_VIDEO_DECODER_BUFFER_DESC *)bs)->DataSize & 127) == 0);
#endif
#if CONFIG_DXVA2
assert((((DXVA2_DecodeBufferDesc *)bs)->DataSize & 127) == 0);
#endif
return ff_dxva2_commit_buffer(avctx, ctx, sc,
type,
slice_data, slice_size, mb_count);