From patchwork Fri Nov 18 14:11:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 1471 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp92330vsb; Fri, 18 Nov 2016 06:11:53 -0800 (PST) X-Received: by 10.28.216.65 with SMTP id p62mr21836168wmg.92.1479478313029; Fri, 18 Nov 2016 06:11:53 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bt18si7692043wjb.137.2016.11.18.06.11.51; Fri, 18 Nov 2016 06:11:53 -0800 (PST) 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 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 A9E9E689C59; Fri, 18 Nov 2016 16:11:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CB75689B97 for ; Fri, 18 Nov 2016 16:11:40 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id a20so6603165wme.2 for ; Fri, 18 Nov 2016 06:11:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=+bzu9Cd0y5RG5BTNKy4iW1qwYvRKxnKUyqD2BVsAfSk=; b=LrEacMc4J5VoMU7AXMQWURPzw4/aFvelTqtVTk4X+qskFxdniThaGtFPzNBxdv9+IZ FGVD9T59f3dN21OeS5xYCs+6PrFcosJ0DjLoXZsyloKm6Bk50IUuirVOof8Upe28jOiU KVhaRjH1baySNGzgjzE3MOJwdah/Ytvr/YKbXltJSURVEKNn6aQYSktWNU4yV6GCYkCU JsnihXXbpN+qt2+4K864M1TZz89T3KDx8RbEr3cHPzr7AH0e0CeDE7tqkI0JQQtezBXP dFnHjb+xe27/L5jeR56bfoam2MrVfBr7y9wuzzYx2dfB8e6M07JI2QT7HFZg95QVuk7H Lb+A== 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:date:message-id; bh=+bzu9Cd0y5RG5BTNKy4iW1qwYvRKxnKUyqD2BVsAfSk=; b=XvK3mx+2S9un0JMzpVhtTf3oGH8beNa2iwAOlv3IRsg6HfXYh2AacT7d/DAAo2FYFZ 24BdafVPjZv580S7F0+anrlu5L8XHm8hIoOndyaxA3z44O34Q8ZdXcgOfLbv5P4mIQRm wy3FSE2S6TvZkbfWOROVSsvFO89SqsUKhehVoPhz37Z09rh0tXl9r38EjIHlzVCxTVYG 7AYWogxR4pR+rPiMrZcfPaEIHyutRKH/sNVFs5Yq2ZBCvjSahZzvVSi9m/8KCJnmC8yI nf7SOPWNHQFNW7K3Q1QdxbSzdevSxxuPszccyxRQ8nXxPv0nvAFvjmC8lP9+MwRKbSNa hKXw== X-Gm-Message-State: AKaTC02ROAOLLwi6WWkivZPAWHbMb+gi8Jybhf8bH+nc1wvNqY5vcALEgtBawwWirpo/rg== X-Received: by 10.194.88.201 with SMTP id bi9mr5651999wjb.71.1479478301095; Fri, 18 Nov 2016 06:11:41 -0800 (PST) Received: from localhost (p5DC18C25.dip0.t-ipconnect.de. [93.193.140.37]) by smtp.gmail.com with ESMTPSA id t82sm3574580wmd.17.2016.11.18.06.11.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Nov 2016 06:11:40 -0800 (PST) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Nov 2016 15:11:36 +0100 Message-Id: <20161118141137.1888-1-h.leppkes@gmail.com> X-Mailer: git-send-email 2.10.2.windows.1 Subject: [FFmpeg-devel] [PATCH 1/2] vc1dec: support multiple slices in frame coded images with hwaccel 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" Based on a patch by Jun Zhao --- libavcodec/vc1dec.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 4f78aa8..75d3365 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -634,6 +634,8 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, uint8_t *buf; GetBitContext gb; int mby_start; + const uint8_t *rawbuf; + int raw_size; } *slices = NULL, *tmp; v->second_field = 0; @@ -716,6 +718,8 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, /* assuming that the field marker is at the exact middle, hope it's correct */ slices[n_slices].mby_start = s->mb_height + 1 >> 1; + slices[n_slices].rawbuf = start; + slices[n_slices].raw_size = size + 4; n_slices1 = n_slices - 1; // index of the last slice of the first field n_slices++; break; @@ -743,6 +747,8 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, init_get_bits(&slices[n_slices].gb, slices[n_slices].buf, buf_size3 << 3); slices[n_slices].mby_start = get_bits(&slices[n_slices].gb, 9); + slices[n_slices].rawbuf = start; + slices[n_slices].raw_size = size + 4; n_slices++; break; } @@ -779,6 +785,8 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, init_get_bits(&slices[n_slices].gb, slices[n_slices].buf, buf_size3 << 3); slices[n_slices].mby_start = s->mb_height + 1 >> 1; + slices[n_slices].rawbuf = divider; + slices[n_slices].raw_size = buf + buf_size - divider; n_slices1 = n_slices - 1; n_slices++; } @@ -921,6 +929,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, } else #endif if (avctx->hwaccel) { + s->mb_y = 0; if (v->field_mode && buf_start_second_field) { // decode first field s->picture_structure = PICT_BOTTOM_FIELD - v->tff; @@ -953,8 +962,36 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, s->picture_structure = PICT_FRAME; if ((ret = avctx->hwaccel->start_frame(avctx, buf_start, (buf + buf_size) - buf_start)) < 0) goto err; - if ((ret = avctx->hwaccel->decode_slice(avctx, buf_start, (buf + buf_size) - buf_start)) < 0) - goto err; + + if (n_slices == 0) { + // no slices, decode the frame as-is + if ((ret = avctx->hwaccel->decode_slice(avctx, buf_start, (buf + buf_size) - buf_start)) < 0) + goto err; + } else { + // decode the frame part as the first slice + if ((ret = avctx->hwaccel->decode_slice(avctx, buf_start, slices[0].rawbuf - buf_start)) < 0) + goto err; + + // and process the slices as additional slices afterwards + for (i = 0 ; i < n_slices; i++) { + s->gb = slices[i].gb; + s->mb_y = slices[i].mby_start; + + v->pic_header_flag = get_bits1(&s->gb); + if (v->pic_header_flag) { + if (ff_vc1_parse_frame_header_adv(v, &s->gb) < 0) { + av_log(v->s.avctx, AV_LOG_ERROR, "Slice header damaged\n"); + ret = AVERROR_INVALIDDATA; + if (avctx->err_recognition & AV_EF_EXPLODE) + goto err; + continue; + } + } + + if ((ret = avctx->hwaccel->decode_slice(avctx, slices[i].rawbuf, slices[i].raw_size)) < 0) + goto err; + } + } if ((ret = avctx->hwaccel->end_frame(avctx)) < 0) goto err; }