From patchwork Tue Mar 21 14:36:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 3046 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp1918096vsy; Tue, 21 Mar 2017 07:43:01 -0700 (PDT) X-Received: by 10.28.84.18 with SMTP id i18mr3310088wmb.12.1490107381796; Tue, 21 Mar 2017 07:43:01 -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 e23si20176029wmi.95.2017.03.21.07.43.01; Tue, 21 Mar 2017 07:43:01 -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=@gmail.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=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F5C368836C; Tue, 21 Mar 2017 16:42:40 +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 9B6ED680457 for ; Tue, 21 Mar 2017 16:42:33 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id u132so3311695wmg.1 for ; Tue, 21 Mar 2017 07:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=DsJmAU68qcKngVku3TDEFmi5wgSqX5Elo86R2sRAygQ=; b=QUXcfV4t3u7T+vM+WGrb26r+7Tq4hcyyXtpRWG+fg5jcfNW0xEXjUR3KXBQz0OWs7H 5g+PRPHGTGhfxMk0pIxx+sw2GuV0YTjQrz0bcRiy80lNC5JenMkLk1C2VKN5fNS0cwQv FsgiN4Fvqf9kONaRU4H3Zkpxo6PyoQnXgeXdrqDSvkbu3quA2GTXFya6XSl/tA6sWodO JSDsTYKuImsu/QvU6eSOwYFOkxxB52DGU8w+m8s9WHnLtQb3baQEbUvF4JZREpHyNI4N QfD1vFSk5G4hqTqqAPU88L30sSztSqjCcAPnJKUmQOtCOk/mU5x2dlW/BV+z8GQ5hVzV 5isQ== 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=DsJmAU68qcKngVku3TDEFmi5wgSqX5Elo86R2sRAygQ=; b=Ao0lcCGZhApkWoXXKIHjRf2yD4QnemL9Hr1FL6A67jOiLiX9xi03UwAJ2JH4O0jHRq vGd9Is4ynjXmSVbq499qzXtFpRQoqKimTCCQ9pF8QBQkQff8BIfwnWI2YgEUWvyljren 6NRgMHsYnI6sZM4AOuc44/zdJZvMpYco6/4WfTLreQpYgKjVYlq1NmW21HcraCA6NUyI htS7TV3F25ItnNTdTvUqdTEEDEOHOjECBQ3R26+epvhCg2pvcUp9xELq9U4nfIvC+mHy rPl7/VRkje5qFfxhFErTrUlAJ44HxXn1uZbkQKZuZJVsvIPjeRJW8CRTSviIM++Lb5EL 9r0g== X-Gm-Message-State: AFeK/H3ohGdWmSijaKLDSWj2eTc3ZnvuOwXBDPAaI1r8Z5KI/76i6MZ5Z7655XOvDRjxGA== X-Received: by 10.28.218.197 with SMTP id r188mr3115275wmg.0.1490107024037; Tue, 21 Mar 2017 07:37:04 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id e16sm18811370wra.62.2017.03.21.07.37.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Mar 2017 07:37:03 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2017 15:36:39 +0100 Message-Id: <20170321143639.16898-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avcodec/dnxhd_parser: take into account compressed frame size and skip it 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" Fixes #6214. Signed-off-by: Paul B Mahol --- libavcodec/dnxhd_parser.c | 65 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 7 deletions(-) diff --git a/libavcodec/dnxhd_parser.c b/libavcodec/dnxhd_parser.c index 033b8ee..4f9bbce 100644 --- a/libavcodec/dnxhd_parser.c +++ b/libavcodec/dnxhd_parser.c @@ -31,8 +31,24 @@ typedef struct { ParseContext pc; int interlaced; int cur_field; /* first field is 0, second is 1 */ + int cur_byte; + int remaining; + int w, h; } DNXHDParserContext; +static int dnxhd_get_hr_frame_size(int cid, int w, int h) +{ + int result, i = ff_dnxhd_get_cid_table(cid); + + if (i < 0) + return i; + + result = ((h + 15) / 16) * ((w + 15) / 16) * ff_dnxhd_cid_table[i].packet_scale.num / ff_dnxhd_cid_table[i].packet_scale.den; + result = (result + 2048) / 4096 * 4096; + + return FFMAX(result, 8192); +} + static int dnxhd_find_frame_end(DNXHDParserContext *dctx, const uint8_t *buf, int buf_size) { @@ -51,30 +67,65 @@ static int dnxhd_find_frame_end(DNXHDParserContext *dctx, pic_found = 1; interlaced = (state&2)>>1; /* byte following the 5-byte header prefix */ cur_field = state&1; + dctx->cur_byte = 0; + dctx->remaining = 0; break; } } } - if (pic_found) { + if (pic_found && !dctx->remaining) { if (!buf_size) /* EOF considered as end of frame */ return 0; for (; i < buf_size; i++) { + dctx->cur_byte++; state = (state << 8) | buf[i]; - if (ff_dnxhd_check_header_prefix(state & 0xffffffffff00LL) != 0) { - if (!interlaced || dctx->cur_field) { + + if (dctx->cur_byte == 24) { + dctx->h = (state >> 32) & 0xFFFF; + } else if (dctx->cur_byte == 26) { + dctx->w = (state >> 32) & 0xFFFF; + } else if (dctx->cur_byte == 42) { + int cid = (state >> 32) & 0xFFFFFFFF; + + if (cid <= 0) + continue; + + dctx->remaining = avpriv_dnxhd_get_frame_size(cid); + if (dctx->remaining <= 0) { + dctx->remaining = dnxhd_get_hr_frame_size(cid, dctx->w, dctx->h); + if (dctx->remaining <= 0) + return dctx->remaining; + } + if (buf_size - i >= dctx->remaining && (!dctx->interlaced || dctx->cur_field)) { + int remaining = dctx->remaining; + pc->frame_start_found = 0; pc->state64 = -1; dctx->interlaced = interlaced; dctx->cur_field = 0; - return i - 5; + dctx->cur_byte = 0; + dctx->remaining = 0; + return remaining; } else { - /* continue, to get the second field */ - dctx->interlaced = interlaced = (state&2)>>1; - dctx->cur_field = cur_field = state&1; + dctx->remaining -= buf_size; } } } + } else if (pic_found) { + if (dctx->remaining > buf_size) { + dctx->remaining -= buf_size; + } else { + int remaining = dctx->remaining; + + pc->frame_start_found = 0; + pc->state64 = -1; + dctx->interlaced = interlaced; + dctx->cur_field = 0; + dctx->cur_byte = 0; + dctx->remaining = 0; + return remaining; + } } pc->frame_start_found = pic_found; pc->state64 = state;