mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-29 06:45:47 +00:00
9ce56f91c0
Up until now, an initialized MpegEncContext had an array of MPVPictures (way more than were ever needed) and the MPVPicture* contained in the MPVWorkPictures as well as the input_picture and reordered_input_picture arrays (for the encoder) pointed into this array. Several of the pointers could point to the same slot and because there was no reference counting involved, one had to check for aliasing before unreferencing. Furthermore, given that these pointers were not ownership pointers the pointers were often simply reset without unreferencing the slot (happened e.g. for the RV30 and RV40 decoders) or there were moved without resetting the src pointer (happened for the encoders where the entries in the input_picture and reordered_input_picture arrays were not reset). Instead actually releasing these pictures was performed by looping over the whole array and checking which one of the entries needed to be kept. Given that the array had way too many slots (36), this meant that more than 30 MPVPictures have been unnecessarily unreferenced in every ff_mpv_frame_start(); something similar happened for the encoder. This commit changes this by making the MPVPictures refcounted via the RefStruct API. The MPVPictures itself are part of a pool so that this does not entail constant allocations; instead, the amount of allocations actually goes down, because the earlier code used such a large array of MPVPictures (36 entries) and allocated an AVFrame for every one of these on every ff_mpv_common_init(). In fact, the pool is only freed when closing the codec, so that reinitializations don't lead to new allocations (this avoids having to sync the pool in update_thread_context). Making MPVPictures refcounted also has another key benefit: It makes it possible to directly share them across threads (when using frame-threaded decoding), eliminating ugly code with underlying av_frame_ref()'s; sharing these pictures can't fail any more. The pool is allocated in ff_mpv_decode_init() for decoders, which therefore can fail now. This and the fact that the pool is not unreferenced in ff_mpv_common_end() also necessitated to mark several mpegvideo-decoders with the FF_CODEC_CAP_INIT_CLEANUP flag. *: This also means that there is no good reason any more for ff_mpv_common_frame_size_change() to exist. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
128 lines
3.6 KiB
C
128 lines
3.6 KiB
C
/*
|
|
* FLV decoding.
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
#include "libavutil/imgutils.h"
|
|
|
|
#include "codec_internal.h"
|
|
#include "flvdec.h"
|
|
#include "h263dec.h"
|
|
#include "mpegvideo.h"
|
|
#include "mpegvideodec.h"
|
|
|
|
int ff_flv_decode_picture_header(MpegEncContext *s)
|
|
{
|
|
int format, width, height;
|
|
|
|
/* picture header */
|
|
if (get_bits(&s->gb, 17) != 1) {
|
|
av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
format = get_bits(&s->gb, 5);
|
|
if (format != 0 && format != 1) {
|
|
av_log(s->avctx, AV_LOG_ERROR, "Bad picture format\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
s->h263_flv = format + 1;
|
|
s->picture_number = get_bits(&s->gb, 8); /* picture timestamp */
|
|
format = get_bits(&s->gb, 3);
|
|
switch (format) {
|
|
case 0:
|
|
width = get_bits(&s->gb, 8);
|
|
height = get_bits(&s->gb, 8);
|
|
break;
|
|
case 1:
|
|
width = get_bits(&s->gb, 16);
|
|
height = get_bits(&s->gb, 16);
|
|
break;
|
|
case 2:
|
|
width = 352;
|
|
height = 288;
|
|
break;
|
|
case 3:
|
|
width = 176;
|
|
height = 144;
|
|
break;
|
|
case 4:
|
|
width = 128;
|
|
height = 96;
|
|
break;
|
|
case 5:
|
|
width = 320;
|
|
height = 240;
|
|
break;
|
|
case 6:
|
|
width = 160;
|
|
height = 120;
|
|
break;
|
|
default:
|
|
width = height = 0;
|
|
break;
|
|
}
|
|
if (av_image_check_size(width, height, 0, s->avctx))
|
|
return AVERROR(EINVAL);
|
|
s->width = width;
|
|
s->height = height;
|
|
|
|
s->pict_type = AV_PICTURE_TYPE_I + get_bits(&s->gb, 2);
|
|
s->droppable = s->pict_type > AV_PICTURE_TYPE_P;
|
|
if (s->droppable)
|
|
s->pict_type = AV_PICTURE_TYPE_P;
|
|
|
|
skip_bits1(&s->gb); /* deblocking flag */
|
|
s->chroma_qscale = s->qscale = get_bits(&s->gb, 5);
|
|
|
|
s->h263_plus = 0;
|
|
|
|
s->h263_long_vectors = 0;
|
|
|
|
/* PEI */
|
|
if (skip_1stop_8data_bits(&s->gb) < 0)
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
s->f_code = 1;
|
|
|
|
if (s->ehc_mode)
|
|
s->avctx->sample_aspect_ratio= (AVRational){1,2};
|
|
|
|
if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
|
|
av_log(s->avctx, AV_LOG_DEBUG, "%c esc_type:%d, qp:%d num:%d\n",
|
|
s->droppable ? 'D' : av_get_picture_type_char(s->pict_type),
|
|
s->h263_flv - 1, s->qscale, s->picture_number);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
const FFCodec ff_flv_decoder = {
|
|
.p.name = "flv",
|
|
CODEC_LONG_NAME("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"),
|
|
.p.type = AVMEDIA_TYPE_VIDEO,
|
|
.p.id = AV_CODEC_ID_FLV1,
|
|
.priv_data_size = sizeof(MpegEncContext),
|
|
.init = ff_h263_decode_init,
|
|
FF_CODEC_DECODE_CB(ff_h263_decode_frame),
|
|
.close = ff_mpv_decode_close,
|
|
.p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1,
|
|
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP |
|
|
FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM,
|
|
.p.max_lowres = 3,
|
|
};
|