From: Jun Zhao <jun.z...@intel.com>
Now VA-API HWAccel MJPEG decoding uninitialized huffman table, it's
will lead to the decoding error like"Failed to sync surface 0x5: 23
(internal decoding error)." in iHD open source driver.
Signed-off-by: dlin2 <decai....@intel.com>
Signed-off-by: Jun Zhao <jun.z...@intel.com>
---
libavcodec/mjpegdec.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index b0cb3ff..89effb6 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -75,6 +75,25 @@ static int build_vlc(VLC *vlc, const uint8_t *bits_table,
static int build_basic_mjpeg_vlc(MJpegDecodeContext *s)
{
int ret;
+ int i;
+
+ /* initialize default huffman tables */
+ for (i = 0; i < 16; i++)
+ s->raw_huffman_lengths[0][0][i] = avpriv_mjpeg_bits_dc_luminance[i +
1];
+ for (i = 0; i < 12; i++)
+ s->raw_huffman_values[0][0][i] = avpriv_mjpeg_val_dc[i];
+ for (i = 0; i < 16; i++)
+ s->raw_huffman_lengths[0][1][i] = avpriv_mjpeg_bits_dc_chrominance[i +
1];
+ for (i = 0; i < 12; i++)
+ s->raw_huffman_values[0][1][i] = avpriv_mjpeg_val_dc[i];
+ for (i = 0; i < 16; i++)
+ s->raw_huffman_lengths[1][0][i] = avpriv_mjpeg_bits_ac_luminance[i +
1];
+ for (i = 0; i < 162; i++)
+ s->raw_huffman_values[1][0][i] = avpriv_mjpeg_val_ac_luminance[i];
+ for (i = 0; i < 16; i++)
+ s->raw_huffman_lengths[1][1][i] = avpriv_mjpeg_bits_ac_chrominance[i +
1];
+ for (i = 0; i < 162; i++)
+ s->raw_huffman_values[1][1][i] = avpriv_mjpeg_val_ac_chrominance[i];
if ((ret = build_vlc(&s->vlcs[0][0], avpriv_mjpeg_bits_dc_luminance,
avpriv_mjpeg_val_dc, 12, 0, 0)) < 0)
--
1.7.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
