diff options
| author | Oskar Arvidsson <oskar@irock.se> | 2011-03-29 17:48:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-10 22:33:42 +0200 |
| commit | d268bed209828923b891aeab7979d7ef14a730b2 (patch) | |
| tree | b13903328124723168ab1c5e35295bab0b1dfae5 /libavcodec/h264.h | |
| parent | 436c4523ed447b88759900b3e6647c5b9d03a63b (diff) | |
| download | ffmpeg-d268bed209828923b891aeab7979d7ef14a730b2.tar.gz | |
Add support for higher QP values in h264.
In high bit depth, the QP values may now be up to (51 + 6*(bit_depth-8)).
Preparatory patch for high bit depth h264 decoding support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 7182c86a8c..d3ae90cd65 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -108,6 +108,7 @@ */ #define DELAYED_PIC_REF 4 +#define QP_MAX_MAX (51 + 2*6) // The maximum supported qp /* NAL unit types */ enum { @@ -354,8 +355,8 @@ typedef struct H264Context{ */ PPS pps; //FIXME move to Picture perhaps? (->no) do we need that? - uint32_t dequant4_buffer[6][52][16]; //FIXME should these be moved down? - uint32_t dequant8_buffer[2][52][64]; + uint32_t dequant4_buffer[6][QP_MAX_MAX+1][16]; //FIXME should these be moved down? + uint32_t dequant8_buffer[2][QP_MAX_MAX+1][64]; uint32_t (*dequant4_coeff[6])[16]; uint32_t (*dequant8_coeff[2])[64]; @@ -603,7 +604,7 @@ typedef struct H264Context{ }H264Context; -extern const uint8_t ff_h264_chroma_qp[52]; +extern const uint8_t ff_h264_chroma_qp[3][QP_MAX_MAX+1]; ///< One chroma qp table for each supported bit depth (8, 9, 10). /** * Decode SEI |