MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

smvjpegdec: merge into mjpegdec 

SMVJPEG stores frames as slices of a big JPEG image. The decoder is
implemented as a wrapper that instantiates a full internal MJPEG
decoder, then forwards the decoded frames with offset data pointers.
This is unnecessarily complex and fragile, not supporting useful decoder
capabilities like direct rendering.

Re-implement the decoder inside the MJPEG decoder, which is accomplished
by returning each decoded frame multiple times, setting cropping
information appropriately on each instance.

One peculiar aspect of the previous design is that since
- the smvjpeg decoder returns one frame per input packet
- there are multiple frames in each packets (the aformentioned slices)
the demuxer needs to return each packet multiple times.
This is now also eliminated - the demuxer now returns each packet
exactly once, with the duration set to the number of frames it decodes
to.

This also removes one of the last remaining internal uses of the old
video decoding API.
This commit is contained in:
Anton Khirnov 2020-12-01 19:32:00 +01:00
parent e9a2a87773
commit 19ce064239
8 changed files with 97 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -235,7 +235,6 @@ Codecs:
rv10.c Michael Niedermayer
s3tc* Ivo van Poorten
smc.c Mike Melanson
smvjpegdec.c Ash Hughes
snow* Michael Niedermayer, Loren Merritt
sonic.c Alex Beregszaszi
speedhq.c Steinar H. Gunderson

1
configure vendored
View File

@ -2838,6 +2838,7 @@ rv40_decoder_select="golomb h264pred h264qpel mpegvideo rv34dsp"
screenpresso_decoder_deps="zlib"
shorten_decoder_select="bswapdsp"
sipr_decoder_select="lsp"
smvjpeg_decoder_select="mjpeg_decoder"
snow_decoder_select="dwt h264qpel hpeldsp me_cmp rangecoder videodsp"
snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder"
sonic_decoder_select="golomb rangecoder"

1
libavcodec/Makefile
View File

@ -618,7 +618,6 @@ OBJS-$(CONFIG_SIREN_DECODER) += siren.o
OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o
OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o
OBJS-$(CONFIG_SMC_DECODER) += smc.o
OBJS-$(CONFIG_SMVJPEG_DECODER) += smvjpegdec.o
OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o snow_dwt.o
OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o snow_dwt.o \
h263.o h263data.o ituh263enc.o

89
libavcodec/mjpegdec.c
View File

@ -198,7 +198,19 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
s->interlace_polarity = 1;
}
if ( avctx->extradata_size > 8
if (avctx->codec_id == AV_CODEC_ID_SMVJPEG) {
if (avctx->extradata_size >= 4)
s->smv_frames_per_jpeg = AV_RL32(avctx->extradata);
if (s->smv_frames_per_jpeg <= 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid number of frames per jpeg.\n");
return AVERROR_INVALIDDATA;
}
s->smv_frame = av_frame_alloc();
if (!s->smv_frame)
return AVERROR(ENOMEM);
} else if (avctx->extradata_size > 8
&& AV_RL32(avctx->extradata) == 0x2C
&& AV_RL32(avctx->extradata+4) == 0x18) {
parse_avid(s, avctx->extradata, avctx->extradata_size);
@ -472,6 +484,12 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
size_change = 0;
}
if (s->avctx->codec_id == AV_CODEC_ID_SMVJPEG) {
s->avctx->height = s->avctx->coded_height / s->smv_frames_per_jpeg;
if (s->avctx->height <= 0)
return AVERROR_INVALIDDATA;
}
if (s->got_picture && s->interlaced && (s->bottom_field == !s->interlace_polarity)) {
if (s->progressive) {
avpriv_request_sample(s->avctx, "progressively coded interlaced picture");
@ -2336,6 +2354,42 @@ static void reset_icc_profile(MJpegDecodeContext *s)
s->iccnum = 0;
}
// SMV JPEG just stacks several output frames into one JPEG picture
// we handle that by setting up the cropping parameters appropriately
static int smv_process_frame(AVCodecContext *avctx, AVFrame *frame)
{
MJpegDecodeContext *s = avctx->priv_data;
int ret;
if (s->smv_next_frame > 0) {
av_assert0(s->smv_frame->buf[0]);
av_frame_unref(frame);
ret = av_frame_ref(frame, s->smv_frame);
if (ret < 0)
return ret;
} else {
av_assert0(frame->buf[0]);
av_frame_unref(s->smv_frame);
ret = av_frame_ref(s->smv_frame, frame);
if (ret < 0)
return ret;
}
av_assert0((s->smv_next_frame + 1) * avctx->height <= avctx->coded_height);
frame->width = avctx->coded_width;
frame->height = avctx->coded_height;
frame->crop_top = FFMIN(s->smv_next_frame * avctx->height, frame->height);
frame->crop_bottom = frame->height - (s->smv_next_frame + 1) * avctx->height;
s->smv_next_frame = (s->smv_next_frame + 1) % s->smv_frames_per_jpeg;
if (s->smv_next_frame == 0)
av_frame_unref(s->smv_frame);
return 0;
}
static int mjpeg_get_packet(AVCodecContext *avctx)
{
MJpegDecodeContext *s = avctx->priv_data;
@ -2372,6 +2426,9 @@ int ff_mjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame)
int ret = 0;
int is16bit;
if (avctx->codec_id == AV_CODEC_ID_SMVJPEG && s->smv_next_frame > 0)
return smv_process_frame(avctx, frame);
av_dict_free(&s->exif_metadata);
av_freep(&s->stereo3d);
s->adobe_transform = -1;
@ -2833,6 +2890,14 @@ the_end:
av_dict_copy(&frame->metadata, s->exif_metadata, 0);
av_dict_free(&s->exif_metadata);
if (avctx->codec_id == AV_CODEC_ID_SMVJPEG) {
ret = smv_process_frame(avctx, frame);
if (ret < 0) {
av_frame_unref(frame);
return ret;
}
}
ret = 0;
the_end_no_picture:
@ -2861,6 +2926,8 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx)
av_packet_free(&s->pkt);
av_frame_free(&s->smv_frame);
av_freep(&s->buffer);
av_freep(&s->stereo3d);
av_freep(&s->ljpeg_buffer);
@ -2887,6 +2954,9 @@ static void decode_flush(AVCodecContext *avctx)
{
MJpegDecodeContext *s = avctx->priv_data;
s->got_picture = 0;
s->smv_next_frame = 0;
av_frame_unref(s->smv_frame);
}
#if CONFIG_MJPEG_DECODER
@ -2949,3 +3019,20 @@ AVCodec ff_thp_decoder = {
FF_CODEC_CAP_SETS_PKT_DTS,
};
#endif
#if CONFIG_SMVJPEG_DECODER
AVCodec ff_smvjpeg_decoder = {
.name = "smvjpeg",
.long_name = NULL_IF_CONFIG_SMALL("SMV JPEG"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_SMVJPEG,
.priv_data_size = sizeof(MJpegDecodeContext),
.init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end,
.receive_frame = ff_mjpeg_receive_frame,
.flush = decode_flush,
.capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_EXPORTS_CROPPING |
FF_CODEC_CAP_SETS_PKT_DTS,
};
#endif

4
libavcodec/mjpegdec.h
View File

@ -142,6 +142,10 @@ typedef struct MJpegDecodeContext {
int iccnum;
int iccread;
AVFrame *smv_frame;
int smv_frames_per_jpeg;
int smv_next_frame;
// Raw stream data for hwaccel use.
const uint8_t *raw_image_buffer;
size_t raw_image_buffer_size;

224
libavcodec/smvjpegdec.c
View File

@ -1,224 +0,0 @@
/*
* SMV JPEG decoder
* Copyright (c) 2013 Ash Hughes
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* @file
* SMV JPEG decoder.
*/
// #define DEBUG
#include "avcodec.h"
#include "libavutil/opt.h"
#include "libavutil/imgutils.h"
#include "mjpegdec.h"
#include "internal.h"
typedef struct SMVJpegDecodeContext {
MJpegDecodeContext jpg;
AVFrame *picture[2]; /* pictures array */
AVCodecContext* avctx;
int frames_per_jpeg;
int mjpeg_data_size;
} SMVJpegDecodeContext;
static inline void smv_img_pnt_plane(uint8_t **dst, uint8_t *src,
int src_linesize, int height, int nlines)
{
if (!dst || !src)
return;
src += (nlines) * src_linesize * height;
*dst = src;
}
static inline void smv_img_pnt(uint8_t *dst_data[4], uint8_t *src_data[4],
const int src_linesizes[4],
enum AVPixelFormat pix_fmt, int width, int height,
int nlines)
{
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
int i, planes_nb = 0;
if (desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
return;
for (i = 0; i < desc->nb_components; i++)
planes_nb = FFMAX(planes_nb, desc->comp[i].plane + 1);
for (i = 0; i < planes_nb; i++) {
int h = height;
if (i == 1 || i == 2) {
h = AV_CEIL_RSHIFT(height, desc->log2_chroma_h);
}
smv_img_pnt_plane(&dst_data[i], src_data[i],
src_linesizes[i], h, nlines);
}
if (desc->flags & AV_PIX_FMT_FLAG_PAL ||
desc->flags & FF_PSEUDOPAL)
dst_data[1] = src_data[1];
}
static av_cold int smvjpeg_decode_end(AVCodecContext *avctx)
{
SMVJpegDecodeContext *s = avctx->priv_data;
MJpegDecodeContext *jpg = &s->jpg;
jpg->picture_ptr = NULL;
av_frame_free(&s->picture[0]);
av_frame_free(&s->picture[1]);
avcodec_free_context(&s->avctx);
return 0;
}
static av_cold int smvjpeg_decode_init(AVCodecContext *avctx)
{
SMVJpegDecodeContext *s = avctx->priv_data;
AVCodec *codec;
AVDictionary *thread_opt = NULL;
int ret = 0, r;
s->frames_per_jpeg = 0;
s->picture[0] = av_frame_alloc();
if (!s->picture[0])
return AVERROR(ENOMEM);
s->picture[1] = av_frame_alloc();
if (!s->picture[1]) {
av_frame_free(&s->picture[0]);
return AVERROR(ENOMEM);
}
s->jpg.picture_ptr = s->picture[0];
if (avctx->extradata_size >= 4)
s->frames_per_jpeg = AV_RL32(avctx->extradata);
if (s->frames_per_jpeg <= 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid number of frames per jpeg.\n");
ret = AVERROR_INVALIDDATA;
}
codec = avcodec_find_decoder(AV_CODEC_ID_MJPEG);
if (!codec) {
av_log(avctx, AV_LOG_ERROR, "MJPEG codec not found\n");
smvjpeg_decode_end(avctx);
return AVERROR_DECODER_NOT_FOUND;
}
s->avctx = avcodec_alloc_context3(codec);
av_dict_set(&thread_opt, "threads", "1", 0);
s->avctx->refcounted_frames = 1;
s->avctx->flags = avctx->flags;
s->avctx->idct_algo = avctx->idct_algo;
if ((r = avcodec_open2(s->avctx, codec, &thread_opt)) < 0) {
av_log(avctx, AV_LOG_ERROR, "MJPEG codec failed to open\n");
ret = r;
}
av_dict_free(&thread_opt);
if (ret < 0)
smvjpeg_decode_end(avctx);
return ret;
}
static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
AVPacket *avpkt)
{
const AVPixFmtDescriptor *desc;
SMVJpegDecodeContext *s = avctx->priv_data;
AVFrame* mjpeg_data = s->picture[0];
int i, cur_frame = 0, ret = 0;
cur_frame = avpkt->pts % s->frames_per_jpeg;
/* cur_frame is later used to calculate the buffer offset, so it mustn't be negative */
if (cur_frame < 0)
cur_frame += s->frames_per_jpeg;
/* Are we at the start of a block? */
if (!cur_frame) {
av_frame_unref(mjpeg_data);
ret = avcodec_decode_video2(s->avctx, mjpeg_data, &s->mjpeg_data_size, avpkt);
if (ret < 0) {
s->mjpeg_data_size = 0;
return ret;
}
} else if (!s->mjpeg_data_size)
return AVERROR(EINVAL);
desc = av_pix_fmt_desc_get(s->avctx->pix_fmt);
av_assert0(desc);
if (mjpeg_data->height % (s->frames_per_jpeg << desc->log2_chroma_h)) {
av_log(avctx, AV_LOG_ERROR, "Invalid height\n");
return AVERROR_INVALIDDATA;
}
/*use the last lot... */
*data_size = s->mjpeg_data_size;
avctx->pix_fmt = s->avctx->pix_fmt;
/* We shouldn't get here if frames_per_jpeg <= 0 because this was rejected
in init */
ret = ff_set_dimensions(avctx, mjpeg_data->width, mjpeg_data->height / s->frames_per_jpeg);
if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Failed to set dimensions\n");
return ret;
}
if (*data_size) {
s->picture[1]->extended_data = NULL;
s->picture[1]->width = avctx->width;
s->picture[1]->height = avctx->height;
s->picture[1]->format = avctx->pix_fmt;
smv_img_pnt(s->picture[1]->data, mjpeg_data->data, mjpeg_data->linesize,
avctx->pix_fmt, avctx->width, avctx->height, cur_frame);
for (i = 0; i < AV_NUM_DATA_POINTERS; i++)
s->picture[1]->linesize[i] = mjpeg_data->linesize[i];
ret = av_frame_ref(data, s->picture[1]);
if (ret < 0)
return ret;
}
return avpkt->size;
}
static const AVClass smvjpegdec_class = {
.class_name = "SMVJPEG decoder",
.item_name = av_default_item_name,
.version = LIBAVUTIL_VERSION_INT,
};
AVCodec ff_smvjpeg_decoder = {
.name = "smvjpeg",
.long_name = NULL_IF_CONFIG_SMALL("SMV JPEG"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_SMVJPEG,
.priv_data_size = sizeof(SMVJpegDecodeContext),
.init = smvjpeg_decode_init,
.close = smvjpeg_decode_end,
.decode = smvjpeg_decode_frame,
.priv_class = &smvjpegdec_class,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};

12
libavformat/wavdec.c
View File

@ -58,7 +58,6 @@ typedef struct WAVDemuxContext {
int ignore_length;
int max_size;
int spdif;
int smv_cur_pt;
int smv_given_first;
int unaligned; // e.g. if an odd number of bytes ID3 tag was prepended
int rifx; // RIFX: integer byte order for parameters is big endian
@ -497,7 +496,6 @@ static int wav_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA;
}
AV_WL32(vst->codecpar->extradata, wav->smv_frames_per_jpeg);
wav->smv_cur_pt = 0;
goto break_loop;
case MKTAG('L', 'I', 'S', 'T'):
case MKTAG('l', 'i', 's', 't'):
@ -717,12 +715,9 @@ smv_retry:
if (ret < 0)
goto smv_out;
pkt->pos -= 3;
pkt->pts = wav->smv_block * wav->smv_frames_per_jpeg + wav->smv_cur_pt;
wav->smv_cur_pt++;
if (wav->smv_frames_per_jpeg > 0)
wav->smv_cur_pt %= wav->smv_frames_per_jpeg;
if (!wav->smv_cur_pt)
wav->smv_block++;
pkt->pts = wav->smv_block * wav->smv_frames_per_jpeg;
pkt->duration = wav->smv_frames_per_jpeg;
wav->smv_block++;
pkt->stream_index = 1;
smv_out:
@ -784,7 +779,6 @@ static int wav_read_seek(AVFormatContext *s,
timestamp = av_rescale_q(smv_timestamp, s->streams[1]->time_base, s->streams[0]->time_base);
if (wav->smv_frames_per_jpeg > 0) {
wav->smv_block = smv_timestamp / wav->smv_frames_per_jpeg;
wav->smv_cur_pt = smv_timestamp % wav->smv_frames_per_jpeg;
}
}

2
tests/ref/fate/smvjpeg
View File

@ -2,7 +2,7 @@
#media_type 0: video
#codec_id 0: rawvideo
#dimensions 0: 128x160
#sar 0: 0/1
#sar 0: 72/72
0, 0, 0, 1, 30720, 0x3a821807
0, 1, 1, 1, 30720, 0x95168e5d
0, 2, 2, 1, 30720, 0xd4d98e45