diff options
author | Alexandra Hájková <alexandra@khirnov.net> | 2016-04-12 18:57:44 +0200 |
---|---|---|
committer | Alexandra Hájková <alexandra@khirnov.net> | 2016-05-22 16:47:59 +0200 |
commit | abd6a66f40dcb1abe38e686294b6242a950534af (patch) | |
tree | b245a9a5ccae5b551defe2e606817952bb3ca3ee | |
parent | ff9d63ff2bf1f0eb5460ece8cb794dd147bb9ade (diff) |
qsvenc_hevc: convert to the new bitstream reader
-rw-r--r-- | libavcodec/qsvenc_hevc.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 706191dc65..f0afd64af1 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -29,7 +29,6 @@ #include "avcodec.h" #include "bytestream.h" -#include "get_bits.h" #include "hevc.h" #include "h2645_parse.h" #include "internal.h" @@ -54,7 +53,7 @@ static int generate_fake_vps(QSVEncContext *q, AVCodecContext *avctx) GetByteContext gbc; PutByteContext pbc; - GetBitContext gb; + BitstreamContext bc; H2645NAL sps_nal = { NULL }; HEVCSPS sps = { 0 }; HEVCVPS vps = { 0 }; @@ -75,23 +74,23 @@ static int generate_fake_vps(QSVEncContext *q, AVCodecContext *avctx) return ret; } - ret = init_get_bits8(&gb, sps_nal.data, sps_nal.size); + ret = bitstream_init8(&bc, sps_nal.data, sps_nal.size); if (ret < 0) { av_freep(&sps_nal.rbsp_buffer); return ret; } - get_bits(&gb, 1); - type = get_bits(&gb, 6); + bitstream_read(&bc, 1); + type = bitstream_read(&bc, 6); if (type != NAL_SPS) { av_log(avctx, AV_LOG_ERROR, "Unexpected NAL type in the extradata: %d\n", type); av_freep(&sps_nal.rbsp_buffer); return AVERROR_INVALIDDATA; } - get_bits(&gb, 9); + bitstream_read(&bc, 9); - ret = ff_hevc_parse_sps(&sps, &gb, &sps_id, 0, NULL, avctx); + ret = ff_hevc_parse_sps(&sps, &bc, &sps_id, 0, NULL, avctx); av_freep(&sps_nal.rbsp_buffer); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error parsing the SPS\n"); |