From patchwork Tue Nov 1 16:18:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1250 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp743925vsb; Tue, 1 Nov 2016 09:18:14 -0700 (PDT) X-Received: by 10.28.151.17 with SMTP id z17mr2390285wmd.15.1478017094725; Tue, 01 Nov 2016 09:18:14 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fk10si37197907wjb.155.2016.11.01.09.18.14; Tue, 01 Nov 2016 09:18:14 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 51920689CFE; Tue, 1 Nov 2016 18:18:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51629689CFE for ; Tue, 1 Nov 2016 18:18:03 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id c17so23324795wmc.3 for ; Tue, 01 Nov 2016 09:18:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=rXtK/I7IU2Rzm+VyjflbaIe/2a0fVncioDcOJXVRiGk=; b=wVUD0kUn93zA0fjUY2ApTFNe5bZcgmKHg8CX6ZK3OIKQhVSv/YT+EMO8RTevh67ALG ORG0Cf1fYu3L+wHpk72JNsO6kJt7zn+RS1dwYrazjDHiZ3P+Ew85yk77Bbk8WZqs68xf p6s/hTcqNc/0+T8U/Myvx/d3QgPA5Gzj4WyqVHzt/ACRQZuxN0yjJftbeX3uYgl+SYhT Kupx+hcz7bMhcS97f8/gt3+TxYBcOnIx4Q5pAFxXs0T0iDX3KznppS3/uwABXWmO+plf ejKKUeQNXoUiR5oGSKfaaJFwgPElXMi/sQARMM85CrTXwIFd+eRkrgszWFWxu7+FR7sb 4gPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=rXtK/I7IU2Rzm+VyjflbaIe/2a0fVncioDcOJXVRiGk=; b=aU0yVgXBOD7AW1JynmgrHc+V5FHc11iK7ZkzHuXFcTWb6yymVXDchT+xgqoo+WY8OV Ze9M51PjXGds+SOdLp0JoMxbM+Vzcm8wLfXCUWQVXLvcu3LsdtD+pMCO2AAAtOQbEGc+ UVPgx/ow9ilM/rpJgqVYQFJIn5W/a1D5WFik35/30FJN5TlbNX0XI85HYPxsjfFgvlhh JesKgJO00PXurQmcQf8BBv8t5JLjNsncHtsM5rDaZKcboym3MlvXvKfgAPV9gkYrQadA yjHbpXIiTDUM3thHT8we/f8fR++HJyjfcUiBdb7iPjef7BP4cKxAQnIIO79xBmRVHt8K +06g== X-Gm-Message-State: ABUngveAJVl7SEXdriJpH7Z332qPsz769CyKefn+Xo8HVq4+bwTi1cjeOQpH63vWLFk0ig== X-Received: by 10.28.25.134 with SMTP id 128mr2103090wmz.99.1478017086065; Tue, 01 Nov 2016 09:18:06 -0700 (PDT) Received: from [192.168.2.21] (pD9E8F881.dip0.t-ipconnect.de. [217.232.248.129]) by smtp.googlemail.com with ESMTPSA id io3sm36442154wjb.24.2016.11.01.09.18.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Nov 2016 09:18:05 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <1e54ae6d-e660-4d7f-687d-c4d2f72ae1bc@googlemail.com> Date: Tue, 1 Nov 2016 17:18:04 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] apngdec: use side data to pass extradata to the decoder 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes remuxing apng streams coming from the apng demuxer. This is a regression since 940b8908b94404a65f9f55e33efb4ccc6c81383c. Found-by: James Almer Signed-off-by: Andreas Cadhalpun --- libavcodec/pngdec.c | 23 ++++++++++++++-- libavformat/apngdec.c | 73 +++++++++++++++++++++++++++++++++++---------------- 2 files changed, 71 insertions(+), 25 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 36275ae..83eeb8d 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -45,6 +45,9 @@ typedef struct PNGDecContext { ThreadFrame last_picture; ThreadFrame picture; + uint8_t* extra_data; + int extra_data_size; + int state; int width, height; int cur_w, cur_h; @@ -1361,14 +1364,28 @@ static int decode_frame_apng(AVCodecContext *avctx, p = s->picture.f; if (!(s->state & PNG_IHDR)) { - if (!avctx->extradata_size) + int side_data_size = 0; + uint8_t *side_data = NULL; + if (avpkt) + side_data = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, &side_data_size); + + if (side_data_size) { + av_freep(&s->extra_data); + s->extra_data = av_mallocz(side_data_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!s->extra_data) + return AVERROR(ENOMEM); + s->extra_data_size = side_data_size; + memcpy(s->extra_data, side_data, s->extra_data_size); + } + + if (!s->extra_data_size) return AVERROR_INVALIDDATA; /* only init fields, there is no zlib use in extradata */ s->zstream.zalloc = ff_png_zalloc; s->zstream.zfree = ff_png_zfree; - bytestream2_init(&s->gb, avctx->extradata, avctx->extradata_size); + bytestream2_init(&s->gb, s->extra_data, s->extra_data_size); if ((ret = decode_frame_common(avctx, s, p, avpkt)) < 0) goto end; } @@ -1494,6 +1511,8 @@ static av_cold int png_dec_end(AVCodecContext *avctx) s->last_row_size = 0; av_freep(&s->tmp_row); s->tmp_row_size = 0; + av_freep(&s->extra_data); + s->extra_data_size = 0; return 0; } diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c index bb17896..25af3fb 100644 --- a/libavformat/apngdec.c +++ b/libavformat/apngdec.c @@ -49,6 +49,10 @@ typedef struct APNGDemuxContext { int is_key_frame; + uint8_t *extra_data; + int extra_data_size; + int extra_data_updated; + /* * loop options */ @@ -122,9 +126,9 @@ end: return AVPROBE_SCORE_MAX; } -static int append_extradata(AVCodecParameters *par, AVIOContext *pb, int len) +static int append_extradata(APNGDemuxContext *ctx, AVIOContext *pb, int len) { - int previous_size = par->extradata_size; + int previous_size = ctx->extra_data_size; int new_size, ret; uint8_t *new_extradata; @@ -132,18 +136,30 @@ static int append_extradata(AVCodecParameters *par, AVIOContext *pb, int len) return AVERROR_INVALIDDATA; new_size = previous_size + len; - new_extradata = av_realloc(par->extradata, new_size + AV_INPUT_BUFFER_PADDING_SIZE); + new_extradata = av_realloc(ctx->extra_data, new_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!new_extradata) return AVERROR(ENOMEM); - par->extradata = new_extradata; - par->extradata_size = new_size; + ctx->extra_data = new_extradata; + ctx->extra_data_size = new_size; - if ((ret = avio_read(pb, par->extradata + previous_size, len)) < 0) + if ((ret = avio_read(pb, ctx->extra_data + previous_size, len)) < 0) return ret; return previous_size; } +static int send_extradata(APNGDemuxContext *ctx, AVPacket *pkt) +{ + if (!ctx->extra_data_updated) { + uint8_t *side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, ctx->extra_data_size); + if (!side_data) + return AVERROR(ENOMEM); + memcpy(side_data, ctx->extra_data, ctx->extra_data_size); + ctx->extra_data_updated = 1; + } + return 0; +} + static int apng_read_header(AVFormatContext *s) { APNGDemuxContext *ctx = s->priv_data; @@ -178,15 +194,15 @@ static int apng_read_header(AVFormatContext *s) return ret; /* extradata will contain every chunk up to the first fcTL (excluded) */ - st->codecpar->extradata = av_malloc(len + 12 + AV_INPUT_BUFFER_PADDING_SIZE); - if (!st->codecpar->extradata) + ctx->extra_data = av_malloc(len + 12 + AV_INPUT_BUFFER_PADDING_SIZE); + if (!ctx->extra_data) return AVERROR(ENOMEM); - st->codecpar->extradata_size = len + 12; - AV_WB32(st->codecpar->extradata, len); - AV_WL32(st->codecpar->extradata+4, tag); - AV_WB32(st->codecpar->extradata+8, st->codecpar->width); - AV_WB32(st->codecpar->extradata+12, st->codecpar->height); - if ((ret = avio_read(pb, st->codecpar->extradata+16, 9)) < 0) + ctx->extra_data_size = len + 12; + AV_WB32(ctx->extra_data, len); + AV_WL32(ctx->extra_data+4, tag); + AV_WB32(ctx->extra_data+8, st->codecpar->width); + AV_WB32(ctx->extra_data+12, st->codecpar->height); + if ((ret = avio_read(pb, ctx->extra_data+16, 9)) < 0) goto fail; while (!avio_feof(pb)) { @@ -218,11 +234,11 @@ static int apng_read_header(AVFormatContext *s) switch (tag) { case MKTAG('a', 'c', 'T', 'L'): if ((ret = avio_seek(pb, -8, SEEK_CUR)) < 0 || - (ret = append_extradata(st->codecpar, pb, len + 12)) < 0) + (ret = append_extradata(ctx, pb, len + 12)) < 0) goto fail; acTL_found = 1; - ctx->num_frames = AV_RB32(st->codecpar->extradata + ret + 8); - ctx->num_play = AV_RB32(st->codecpar->extradata + ret + 12); + ctx->num_frames = AV_RB32(ctx->extra_data + ret + 8); + ctx->num_play = AV_RB32(ctx->extra_data + ret + 12); av_log(s, AV_LOG_DEBUG, "num_frames: %"PRIu32", num_play: %"PRIu32"\n", ctx->num_frames, ctx->num_play); break; @@ -236,15 +252,15 @@ static int apng_read_header(AVFormatContext *s) return 0; default: if ((ret = avio_seek(pb, -8, SEEK_CUR)) < 0 || - (ret = append_extradata(st->codecpar, pb, len + 12)) < 0) + (ret = append_extradata(ctx, pb, len + 12)) < 0) goto fail; } } fail: - if (st->codecpar->extradata_size) { - av_freep(&st->codecpar->extradata); - st->codecpar->extradata_size = 0; + if (ctx->extra_data_size) { + av_freep(&ctx->extra_data); + ctx->extra_data_size = 0; } return ret; } @@ -393,6 +409,7 @@ static int apng_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->pts = ctx->pkt_pts; pkt->duration = ctx->pkt_duration; ctx->pkt_pts += ctx->pkt_duration; + ret = send_extradata(ctx, pkt); return ret; case MKTAG('I', 'E', 'N', 'D'): ctx->cur_loop++; @@ -400,9 +417,10 @@ static int apng_read_packet(AVFormatContext *s, AVPacket *pkt) avio_seek(pb, -8, SEEK_CUR); return AVERROR_EOF; } - if ((ret = avio_seek(pb, s->streams[0]->codecpar->extradata_size + 8, SEEK_SET)) < 0) + if ((ret = avio_seek(pb, ctx->extra_data_size + 8, SEEK_SET)) < 0) return ret; - return 0; + ret = send_extradata(ctx, pkt); + return ret; default: { char tag_buf[32]; @@ -417,6 +435,14 @@ static int apng_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR_PATCHWELCOME; } +static int apng_read_close(AVFormatContext *s) +{ + APNGDemuxContext *ctx = s->priv_data; + av_freep(&ctx->extra_data); + ctx->extra_data_size = 0; + return 0; +} + static const AVOption options[] = { { "ignore_loop", "ignore loop setting" , offsetof(APNGDemuxContext, ignore_loop), AV_OPT_TYPE_BOOL, { .i64 = 1 } , 0, 1 , AV_OPT_FLAG_DECODING_PARAM }, @@ -442,6 +468,7 @@ AVInputFormat ff_apng_demuxer = { .read_probe = apng_probe, .read_header = apng_read_header, .read_packet = apng_read_packet, + .read_close = apng_read_close, .flags = AVFMT_GENERIC_INDEX, .priv_class = &demuxer_class, };