diff options
| author | Anton Khirnov <anton@khirnov.net> | 2021-01-26 17:13:59 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2021-02-08 11:06:10 +0100 |
| commit | fffc35b870ea3b11689dd1ff871dbcf288462569 (patch) | |
| tree | 45021cee68d078df3b201cc26ff057cfcbcab3a6 | |
| parent | 89f78dd0fe0640c7ec3b2dfe90a91da4e1ac2618 (diff) | |
mjpegdec: stop setting the QP table
MJPEG does not have a single quantiser scale, so this does not fit into
the intended API use.
This removes the last use of the long-deprecated QP table API.
| -rw-r--r-- | libavcodec/mjpegdec.c | 11 | ||||
| -rw-r--r-- | tests/ref/fate/exif-image-embedded | 6 | ||||
| -rw-r--r-- | tests/ref/fate/exif-image-jpg | 6 |
3 files changed, 2 insertions, 21 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 8876afd966..fa4c607085 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2606,19 +2606,12 @@ eoi_parser: frame->pkt_dts = s->pkt->dts; - if (!s->lossless) { + if (!s->lossless && avctx->debug & FF_DEBUG_QP) { int qp = FFMAX3(s->qscale[0], s->qscale[1], s->qscale[2]); - int qpw = (s->width + 15) / 16; - AVBufferRef *qp_table_buf = av_buffer_alloc(qpw); - if (qp_table_buf) { - memset(qp_table_buf->data, qp, qpw); - av_frame_set_qp_table(frame, qp_table_buf, 0, FF_QSCALE_TYPE_MPEG1); - } - if(avctx->debug & FF_DEBUG_QP) - av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", qp); + av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", qp); } goto the_end; diff --git a/tests/ref/fate/exif-image-embedded b/tests/ref/fate/exif-image-embedded index d9239b3c83..9ad073e9ea 100644 --- a/tests/ref/fate/exif-image-embedded +++ b/tests/ref/fate/exif-image-embedded @@ -29,12 +29,6 @@ color_transfer=unknown chroma_location=center TAG:UserComment=AppleMark -[SIDE_DATA] -side_data_type=QP table data -[/SIDE_DATA] -[SIDE_DATA] -side_data_type=QP table properties -[/SIDE_DATA] [/FRAME] [FRAME] media_type=audio diff --git a/tests/ref/fate/exif-image-jpg b/tests/ref/fate/exif-image-jpg index eb18dede21..b266501191 100644 --- a/tests/ref/fate/exif-image-jpg +++ b/tests/ref/fate/exif-image-jpg @@ -229,10 +229,4 @@ TAG:ExposureMode= 0 TAG:WhiteBalance= 0 TAG:DigitalZoomRatio= 4000:4000 TAG:SceneCaptureType= 0 -[SIDE_DATA] -side_data_type=QP table data -[/SIDE_DATA] -[SIDE_DATA] -side_data_type=QP table properties -[/SIDE_DATA] [/FRAME] |