diff options
Diffstat (limited to 'libavcodec/cavs.h')
| -rw-r--r-- | libavcodec/cavs.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h index cb549f161e..6bfb22ce48 100644 --- a/libavcodec/cavs.h +++ b/libavcodec/cavs.h @@ -2,31 +2,31 @@ * Chinese AVS video (AVS1-P2, JiZhun profile) decoder. * Copyright (c) 2006 Stefan Gehrer <stefan.gehrer@gmx.de> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef AVCODEC_CAVS_H #define AVCODEC_CAVS_H -#include "bitstream.h" #include "cavsdsp.h" #include "blockdsp.h" #include "h264chroma.h" #include "idctdsp.h" +#include "get_bits.h" #include "videodsp.h" #define SLICE_MAX_START_CODE 0x000001af @@ -167,7 +167,7 @@ typedef struct AVSContext { IDCTDSPContext idsp; VideoDSPContext vdsp; CAVSDSPContext cdsp; - BitstreamContext bc; + GetBitContext gb; AVSFrame cur; ///< currently decoded frame AVSFrame DPB[2]; ///< reference frames int dist[2]; ///< temporal distances from current frame to ref frames @@ -216,6 +216,7 @@ typedef struct AVSContext { int luma_scan[4]; int qp; int qp_fixed; + int pic_qp_fixed; int cbp; ScanTable scantable; @@ -241,6 +242,7 @@ typedef struct AVSContext { int16_t *block; } AVSContext; +extern const uint8_t ff_cavs_chroma_qp[64]; extern const uint8_t ff_cavs_partition_flags[30]; extern const cavs_vector ff_cavs_intra_mv; extern const cavs_vector ff_cavs_dir_mv; @@ -269,8 +271,8 @@ void ff_cavs_mv(AVSContext *h, enum cavs_mv_loc nP, enum cavs_mv_loc nC, enum cavs_mv_pred mode, enum cavs_block size, int ref); void ff_cavs_init_mb(AVSContext *h); int ff_cavs_next_mb(AVSContext *h); -void ff_cavs_init_pic(AVSContext *h); -void ff_cavs_init_top_lines(AVSContext *h); +int ff_cavs_init_pic(AVSContext *h); +int ff_cavs_init_top_lines(AVSContext *h); int ff_cavs_init(AVCodecContext *avctx); int ff_cavs_end (AVCodecContext *avctx); |