Browse Source

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.
tags/n4.4
Anton Khirnov 5 years ago
parent
commit
fffc35b870
3 changed files with 2 additions and 21 deletions
  1. +2
    -9
      libavcodec/mjpegdec.c
  2. +0
    -6
      tests/ref/fate/exif-image-embedded
  3. +0
    -6
      tests/ref/fate/exif-image-jpg

+ 2
- 9
libavcodec/mjpegdec.c View File

@@ -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;


+ 0
- 6
tests/ref/fate/exif-image-embedded View File

@@ -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


+ 0
- 6
tests/ref/fate/exif-image-jpg View File

@@ -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]

Loading…
Cancel
Save