Commit 27d3361e authored by Laurent Aimar's avatar Laurent Aimar Committed by Michael Niedermayer

h264: add entries for 11 and 12 bits in ff_h264_chroma_qp[][]

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent bcf881a6
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
*/ */
#define DELAYED_PIC_REF 4 #define DELAYED_PIC_REF 4
#define QP_MAX_NUM (51 + 2*6) // The maximum supported qp #define QP_MAX_NUM (51 + 4*6) // The maximum supported qp
/* NAL unit types */ /* NAL unit types */
enum { enum {
...@@ -594,7 +594,7 @@ typedef struct H264Context{ ...@@ -594,7 +594,7 @@ typedef struct H264Context{
}H264Context; }H264Context;
extern const uint8_t ff_h264_chroma_qp[3][QP_MAX_NUM+1]; ///< One chroma qp table for each supported bit depth (8, 9, 10). extern const uint8_t ff_h264_chroma_qp[5][QP_MAX_NUM+1]; ///< One chroma qp table for each possible bit depth (8-12).
/** /**
* Decode SEI * Decode SEI
......
...@@ -70,7 +70,7 @@ static const AVRational pixel_aspect[17]={ ...@@ -70,7 +70,7 @@ static const AVRational pixel_aspect[17]={
QP(37,d), QP(37,d), QP(37,d), QP(38,d), QP(38,d), QP(38,d),\ QP(37,d), QP(37,d), QP(37,d), QP(38,d), QP(38,d), QP(38,d),\
QP(39,d), QP(39,d), QP(39,d), QP(39,d) QP(39,d), QP(39,d), QP(39,d), QP(39,d)
const uint8_t ff_h264_chroma_qp[3][QP_MAX_NUM+1] = { const uint8_t ff_h264_chroma_qp[5][QP_MAX_NUM+1] = {
{ {
CHROMA_QP_TABLE_END(8) CHROMA_QP_TABLE_END(8)
}, },
...@@ -83,6 +83,19 @@ const uint8_t ff_h264_chroma_qp[3][QP_MAX_NUM+1] = { ...@@ -83,6 +83,19 @@ const uint8_t ff_h264_chroma_qp[3][QP_MAX_NUM+1] = {
6, 7, 8, 9, 10, 11, 6, 7, 8, 9, 10, 11,
CHROMA_QP_TABLE_END(10) CHROMA_QP_TABLE_END(10)
}, },
{
0, 1, 2, 3, 4, 5,
6, 7, 8, 9, 10, 11,
12,13,14,15, 16, 17,
CHROMA_QP_TABLE_END(11)
},
{
0, 1, 2, 3, 4, 5,
6, 7, 8, 9, 10, 11,
12,13,14,15, 16, 17,
18,19,20,21, 22, 23,
CHROMA_QP_TABLE_END(12)
},
}; };
static const uint8_t default_scaling4[2][16]={ static const uint8_t default_scaling4[2][16]={
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment