From: Alexandra Hájková <[email protected]>
---
libavcodec/vaapi_mpeg2.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index cb77745..12bf9cd 100644
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "bitstream.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "vaapi_internal.h"
@@ -103,21 +104,21 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext
*avctx, const uint8_t *buffer
{
MpegEncContext * const s = avctx->priv_data;
VASliceParameterBufferMPEG2 *slice_param;
- GetBitContext gb;
+ BitstreamContext bc;
uint32_t quantiser_scale_code, intra_slice_flag, macroblock_offset;
/* Determine macroblock_offset */
- init_get_bits(&gb, buffer, 8 * size);
- if (get_bits_long(&gb, 32) >> 8 != 1) /* start code */
+ bitstream_init(&bc, buffer, 8 * size);
+ if (bitstream_read(&bc, 32) >> 8 != 1) /* start code */
return AVERROR_INVALIDDATA;
- quantiser_scale_code = get_bits(&gb, 5);
- intra_slice_flag = get_bits1(&gb);
+ quantiser_scale_code = bitstream_read(&bc, 5);
+ intra_slice_flag = bitstream_read_bit(&bc);
if (intra_slice_flag) {
- skip_bits(&gb, 8);
- while (get_bits1(&gb) != 0)
- skip_bits(&gb, 8);
+ bitstream_skip(&bc, 8);
+ while (bitstream_read_bit(&bc) != 0)
+ bitstream_skip(&bc, 8);
}
- macroblock_offset = get_bits_count(&gb);
+ macroblock_offset = bitstream_tell(&bc);
/* Fill in VASliceParameterBufferMPEG2 */
slice_param = (VASliceParameterBufferMPEG2
*)ff_vaapi_alloc_slice(avctx->hwaccel_context, buffer, size);
--
2.7.3
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
