dxva2_h264: fix size alignment asserts
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Mar 2016 12:12:59 +0000 (13:12 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Mar 2016 12:14:24 +0000 (13:14 +0100)
Convert them to av_assert0 in the process

libavcodec/dxva2_h264.c

index 54f2b8094e5cc3e0c2b6ac98d6cd2da714dff2f2..23cc9b1c659b8d207c56a5b72ea77dcc6d6cd6aa 100644 (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);