mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

encoder: jpeg: Fix the packed header generation

Browse source 
This is a work-around to satisfy the va-intel-driver.
Normalize the quality factor and scale QM values (only for packed header
generation) similar to what VA-Intel driver is doing . Otherwise the
generated packed headers will be wrong, since the driver itself is
scaling the QM values using the normalized quality factor.

https://bugzilla.gnome.org/show_bug.cgi?id=748335

Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
This commit is contained in:
Sreerenj Balachandran 2015-06-02 08:52:53 +03:00
parent d2791a7844
commit 2a2ecbe865
1 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gst-libs/gst/vaapi/gstvaapiencoder_jpeg.c
View file

@ -67,6 +67,7 @@ struct _GstVaapiEncoderJpeg
GstVaapiProfile profile; GstVaapiProfile profile;
guint quality; guint quality;
GstJpegQuantTables quant_tables; GstJpegQuantTables quant_tables;
GstJpegQuantTables scaled_quant_tables;
gboolean has_quant_tables; gboolean has_quant_tables;
GstJpegHuffmanTables huff_tables; GstJpegHuffmanTables huff_tables;
gboolean has_huff_tables; gboolean has_huff_tables;
@ -243,6 +244,34 @@ ensure_picture (GstVaapiEncoderJpeg * encoder, GstVaapiEncPicture * picture,
return TRUE; return TRUE;
} }
/* This is a work-around: Normalize the quality factor and scale QM
* values similar to what VA-Intel driver is doing. Otherwise the
* generated packed headers will be wrong, since the driver itself
* is scaling the QM values using the normalized quality factor */
static void
generate_scaled_qm (GstJpegQuantTables * quant_tables,
GstJpegQuantTables * scaled_quant_tables, guint quality)
{
guint qt_val, nm_quality, i;
nm_quality = quality == 0 ? 1 : quality;
nm_quality =
(nm_quality < 50) ? (5000 / nm_quality) : (200 - (nm_quality * 2));
g_assert (quant_tables != NULL);
g_assert (scaled_quant_tables != NULL);
for (i = 0; i < GST_JPEG_MAX_QUANT_ELEMENTS; i++) {
/* Luma QM */
qt_val = (quant_tables->quant_tables[0].quant_table[i] * nm_quality) / 100;
scaled_quant_tables->quant_tables[0].quant_table[i] =
CLAMP (qt_val, 1, 255);
/* Chroma QM */
qt_val = (quant_tables->quant_tables[1].quant_table[i] * nm_quality) / 100;
scaled_quant_tables->quant_tables[1].quant_table[i] =
CLAMP (qt_val, 1, 255);
}
}
static gboolean static gboolean
fill_quantization_table (GstVaapiEncoderJpeg * encoder, fill_quantization_table (GstVaapiEncoderJpeg * encoder,
GstVaapiEncPicture * picture) GstVaapiEncPicture * picture)
@ -262,6 +291,8 @@ fill_quantization_table (GstVaapiEncoderJpeg * encoder,
if (!encoder->has_quant_tables) { if (!encoder->has_quant_tables) {
gst_jpeg_get_default_quantization_tables (&encoder->quant_tables); gst_jpeg_get_default_quantization_tables (&encoder->quant_tables);
encoder->has_quant_tables = TRUE; encoder->has_quant_tables = TRUE;
generate_scaled_qm (&encoder->quant_tables, &encoder->scaled_quant_tables,
encoder->quality);
} }
q_matrix->load_lum_quantiser_matrix = 1; q_matrix->load_lum_quantiser_matrix = 1;
for (i = 0; i < GST_JPEG_MAX_QUANT_ELEMENTS; i++) { for (i = 0; i < GST_JPEG_MAX_QUANT_ELEMENTS; i++) {
@ -472,8 +503,11 @@ bs_write_jpeg_header (GstBitWriter * bs, GstVaapiEncoderJpeg * encoder,
/* Add quantization table */ /* Add quantization table */
if (!encoder->has_quant_tables) { if (!encoder->has_quant_tables) {
gst_jpeg_get_default_quantization_tables (&encoder->quant_tables); gst_jpeg_get_default_quantization_tables (&encoder->quant_tables);
generate_scaled_qm (&encoder->quant_tables, &encoder->scaled_quant_tables,
encoder->quality);
encoder->has_quant_tables = TRUE; encoder->has_quant_tables = TRUE;
} }
gst_bit_writer_put_bits_uint8 (bs, 0xFF, 8); gst_bit_writer_put_bits_uint8 (bs, 0xFF, 8);
gst_bit_writer_put_bits_uint8 (bs, GST_JPEG_MARKER_DQT, 8); gst_bit_writer_put_bits_uint8 (bs, GST_JPEG_MARKER_DQT, 8);
gst_bit_writer_put_bits_uint16 (bs, 3 + GST_JPEG_MAX_QUANT_ELEMENTS, 16); //Lq gst_bit_writer_put_bits_uint16 (bs, 3 + GST_JPEG_MAX_QUANT_ELEMENTS, 16); //Lq
@ -481,7 +515,7 @@ bs_write_jpeg_header (GstBitWriter * bs, GstVaapiEncoderJpeg * encoder,
gst_bit_writer_put_bits_uint8 (bs, 0, 4); //Tq gst_bit_writer_put_bits_uint8 (bs, 0, 4); //Tq
for (i = 0; i < GST_JPEG_MAX_QUANT_ELEMENTS; i++) { for (i = 0; i < GST_JPEG_MAX_QUANT_ELEMENTS; i++) {
gst_bit_writer_put_bits_uint16 (bs, gst_bit_writer_put_bits_uint16 (bs,
encoder->quant_tables.quant_tables[0].quant_table[i], 8); encoder->scaled_quant_tables.quant_tables[0].quant_table[i], 8);
} }
gst_bit_writer_put_bits_uint8 (bs, 0xFF, 8); gst_bit_writer_put_bits_uint8 (bs, 0xFF, 8);
gst_bit_writer_put_bits_uint8 (bs, GST_JPEG_MARKER_DQT, 8); gst_bit_writer_put_bits_uint8 (bs, GST_JPEG_MARKER_DQT, 8);
@ -490,7 +524,7 @@ bs_write_jpeg_header (GstBitWriter * bs, GstVaapiEncoderJpeg * encoder,
gst_bit_writer_put_bits_uint8 (bs, 1, 4); //Tq gst_bit_writer_put_bits_uint8 (bs, 1, 4); //Tq
for (i = 0; i < GST_JPEG_MAX_QUANT_ELEMENTS; i++) { for (i = 0; i < GST_JPEG_MAX_QUANT_ELEMENTS; i++) {
gst_bit_writer_put_bits_uint16 (bs, gst_bit_writer_put_bits_uint16 (bs,
encoder->quant_tables.quant_tables[1].quant_table[i], 8); encoder->scaled_quant_tables.quant_tables[1].quant_table[i], 8);
} }
/*Add frame header */ /*Add frame header */
@ -713,6 +747,8 @@ gst_vaapi_encoder_jpeg_init (GstVaapiEncoder * base_encoder)
encoder->has_quant_tables = FALSE; encoder->has_quant_tables = FALSE;
memset (&encoder->quant_tables, 0, sizeof (encoder->quant_tables)); memset (&encoder->quant_tables, 0, sizeof (encoder->quant_tables));
memset (&encoder->scaled_quant_tables, 0,
sizeof (encoder->scaled_quant_tables));
encoder->has_huff_tables = FALSE; encoder->has_huff_tables = FALSE;
memset (&encoder->huff_tables, 0, sizeof (encoder->huff_tables)); memset (&encoder->huff_tables, 0, sizeof (encoder->huff_tables));