From patchwork Fri Mar 1 14:02:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 12178 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 612104452E4 for ; Fri, 1 Mar 2019 16:09:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A877680CAC; Fri, 1 Mar 2019 16:09:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 402916809C1 for ; Fri, 1 Mar 2019 16:09:04 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id t18so26026876wrx.2 for ; Fri, 01 Mar 2019 06:09:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=J9MFH3idXq3JYi7MRiNI/u40vy12frc9+Mry3Dp2Lug=; b=Zeo1ynPaoaTmpKc181GBXyecX5M1Oc+4iPgqOaJzD0kKMckJS+wpDGNrAgARrdQ4xA LDf69KTKccDZkQrRcUNLwyLLvv7zYuPNCUZ/dRVDu/4Fs0lIbEnG48gnVi8CQJyeHw77 IMwgCLc2Gi9CH+sIsQVzvOQmw9hJnnH3eHXcGTGxPD/pZi63QWCKF/TLZdZiPLmr7WSe 7zvYAmERPpbxmgBMVBiHPSWYwltSm/12um+lxSGn+NoizYcrSOjEvtkpNAooJbsRi70T n8arOfYUqTxqKhEqYb/4czPObIOkD+IhdzVfYsbJW+tVqAn/0jOk15mJ0eXgtzp1C9YP VgBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=J9MFH3idXq3JYi7MRiNI/u40vy12frc9+Mry3Dp2Lug=; b=iEVL6ovvZv3n2lMR53U1GFZtKP+KIns5N62u7jBjy0HNmRQ8pL6OGiNwI6WpYHocnk 1IAR7I7Eq+phZ9acl7RuNUkR47Wr+lDxsB0K2P2pN4I8HzT0i222lQMi/bkG+dKuWctw Wxd/fpW9SmwV3FoJr4/BmgHE+8+fDj5m7KJkfkGjRG/jFXaZSkUyCIo6zjTZE0fYmdjP joRfAyCg3qdO1LEsLDw++Wkzxv7VBKjL8cNaEVpP2sDPV0YSof47arPJDy7S02i5oxzc vUIzV6Kh6YmO8z1Xva5xkOUtlJtFZmzuoTdRoAp/hR/DgAVp+58EQJKAQf5yH58igUia fVuw== X-Gm-Message-State: APjAAAWrgrw2+8/8XmuzfO0pNgC3bccKhdG2BmW/4jykdKI0DRS5/1Ng PVGPBRhfLB2X+Z8p2YYFgEuaEJSV X-Google-Smtp-Source: APXvYqydpU3hCchxZ0Xd9MPMf+l4x1Ie2IrwgowLEXEY8t89Z26T2fIBXev3d+3W7fufyIhHWIUJsg== X-Received: by 2002:a5d:528e:: with SMTP id c14mr3692567wrv.304.1551448949734; Fri, 01 Mar 2019 06:02:29 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id s3sm30119803wrt.81.2019.03.01.06.02.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Mar 2019 06:02:28 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Mar 2019 15:02:18 +0100 Message-Id: <20190301140218.16266-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/imm4: add support for mid-stream size changes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/imm4.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/libavcodec/imm4.c b/libavcodec/imm4.c index b72f0be28e..aeb29f5d44 100644 --- a/libavcodec/imm4.c +++ b/libavcodec/imm4.c @@ -41,7 +41,6 @@ typedef struct IMM4Context { uint8_t *bitstream; int bitstream_size; - int changed_size; int factor; unsigned lo; unsigned hi; @@ -370,6 +369,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, IMM4Context *s = avctx->priv_data; GetBitContext *gb = &s->gb; AVFrame *frame = data; + int width, height; unsigned type; int ret, scaled; @@ -391,9 +391,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->color_range = AVCOL_RANGE_JPEG; + width = avctx->width; + height = avctx->height; + scaled = avpkt->data[8]; if (scaled < 2) { - int width, height; int mode = avpkt->data[10]; switch (mode) { @@ -422,18 +424,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, height = 576; break; } - - if (s->changed_size == 1 && - (avctx->width != width || avctx->height != height)) { - av_log(avctx, AV_LOG_ERROR, "Frame size change is unsupported.\n"); - return AVERROR_INVALIDDATA; - } - ret = ff_set_dimensions(avctx, width, height); - if (ret < 0) - return ret; } - s->changed_size = 1; skip_bits_long(gb, 24 * 8); type = get_bits_long(gb, 32); s->hi = get_bits(gb, 16); @@ -453,6 +445,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, return AVERROR_PATCHWELCOME; } + if (!frame->key_frame && + (avctx->width != width || + avctx->height != height)) { + av_log(avctx, AV_LOG_ERROR, "Frame size change is unsupported.\n"); + return AVERROR_INVALIDDATA; + } + + ret = ff_set_dimensions(avctx, width, height); + if (ret < 0) + return ret; + if ((ret = ff_get_buffer(avctx, frame, frame->key_frame ? AV_GET_BUFFER_FLAG_REF : 0)) < 0) return ret;