RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Anton Khirnov 2021-01-26 17:13:59 +01:00
parent 89f78dd0fe
commit fffc35b870
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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]