From patchwork Fri Mar 24 22:31:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3086 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp293394vsy; Fri, 24 Mar 2017 15:33:00 -0700 (PDT) X-Received: by 10.28.155.65 with SMTP id d62mr5372728wme.7.1490394780529; Fri, 24 Mar 2017 15:33:00 -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 y22si5205425wrd.301.2017.03.24.15.32.50; Fri, 24 Mar 2017 15:33:00 -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 1EA1168839A; Sat, 25 Mar 2017 00:32:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 036896882DE for ; Sat, 25 Mar 2017 00:32:10 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id o135so533017qke.2 for ; Fri, 24 Mar 2017 15:32:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=vE8/VEs3yMQ2kTM5zTTMNCAdFLE+rZkvpxS8VA2V80c=; b=QhuUCOGzWvA1OQXorT3Gog5laeIljskELiVDmgDZKFQhBIXN35OXlqpMLRrLfyyo9C JZ6t69epfkL0PvGvGkK0uPNCU32k+ewDTOeEyo4uy/AJlIdC3MJodXUK2RbI4elyyxoO WUSd48rN3OP5P5eECG+QWgHX5iWW+o0E++zPgntzhTqC03UwesPWu6BIqV0qzxCCfeO3 7stXwUrHiBh+bKt0KkV2GoxKlYNkJawtgODdTqJFMNnXxp8oqv14HCBU9GkOpHpgDzRz bqJ1ipG6nucYU762JBY0h3oLp6LYDFnW6coGL/4TRGNsGjY1sXi1ZiWP1gXV/29ZXpSY KhfA== 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:in-reply-to :references; bh=vE8/VEs3yMQ2kTM5zTTMNCAdFLE+rZkvpxS8VA2V80c=; b=EztP5QZomeKL3u01MAenqambTlpKUS13R0ZJkJX0w9TW3FNlJYIX+OAF374a5IpJVA bbB4qherUTHE2+jklCJESrBIr9xcgiBXYWcu9785+QSUOOa1xaFmWszRidyvo2MG10hd 0u+32uu3xamHV9OyeilIoKxbsjfyTDye1CVKFETcQDvonLVcrBQGTEmiJx+BHbEhzM7l GLuWIzg0KHLJA8cq8cDQhDU489Rd1EP08MeOGmpRnaE7KjAwyVZcyydajP0Wudfwxggm l6BDg+ppTwxh+1mXh2i2DRMw5J1CqFBcrOclX51UsCK933otk7uFmXkg/cq40qljuRgG S7JA== X-Gm-Message-State: AFeK/H3Nj7f0i9iOdGGnJOWCpdRhMTyiSiUTvSS4IMDq6i6cB0a9q2/RFs3PsMs40M/o4g== X-Received: by 10.55.198.15 with SMTP id b15mr9339035qkj.248.1490394750508; Fri, 24 Mar 2017 15:32:30 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id e19sm2414824qta.68.2017.03.24.15.32.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Mar 2017 15:32:30 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Mar 2017 19:31:42 -0300 Message-Id: <20170324223147.2692-2-jamrial@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170324223147.2692-1-jamrial@gmail.com> References: <20170324223147.2692-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/extract_extradata_bsf: use the parsing code from mpegvideo_split() 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" Required by some samples, like PVA_test-partial.pva Signed-off-by: James Almer --- libavcodec/extract_extradata_bsf.c | 46 ++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index 0d11f86304..d909ee6d17 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -170,19 +170,47 @@ static int extract_extradata_vc1(AVBSFContext *ctx, AVPacket *pkt, return 0; } -static int extract_extradata_mpeg124(AVBSFContext *ctx, AVPacket *pkt, +static int extract_extradata_mpeg12(AVBSFContext *ctx, AVPacket *pkt, uint8_t **data, int *size) { ExtractExtradataContext *s = ctx->priv_data; - int is_mpeg12 = ctx->par_in->codec_id == AV_CODEC_ID_MPEG1VIDEO || - ctx->par_in->codec_id == AV_CODEC_ID_MPEG2VIDEO; + uint32_t state = UINT32_MAX; + int i, found = 0; + + for (i = 0; i < pkt->size; i++) { + state = (state << 8) | pkt->data[i]; + if (state == 0x1B3) + found = 1; + else if (found && state != 0x1B5 && state < 0x200 && state >= 0x100) { + if (i > 3) { + *size = i - 3; + *data = av_malloc(*size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!*data) + return AVERROR(ENOMEM); + + memcpy(*data, pkt->data, *size); + + if (s->remove) { + pkt->data += *size; + pkt->size -= *size; + } + } + break; + } + } + return 0; +} + +static int extract_extradata_mpeg4(AVBSFContext *ctx, AVPacket *pkt, + uint8_t **data, int *size) +{ + ExtractExtradataContext *s = ctx->priv_data; uint32_t state = UINT32_MAX; int i; for (i = 0; i < pkt->size; i++) { state = (state << 8) | pkt->data[i]; - if ((is_mpeg12 && state != 0x1B3 && state != 0x1B5 && state < 0x200 && state >= 0x100) || - (!is_mpeg12 && (state == 0x1B3 || state == 0x1B6))) { + if ((state == 0x1B3 || state == 0x1B6)) { if (i > 3) { *size = i - 3; *data = av_malloc(*size + AV_INPUT_BUFFER_PADDING_SIZE); @@ -207,12 +235,12 @@ static const struct { int (*extract)(AVBSFContext *ctx, AVPacket *pkt, uint8_t **data, int *size); } extract_tab[] = { - { AV_CODEC_ID_CAVS, extract_extradata_mpeg124 }, + { AV_CODEC_ID_CAVS, extract_extradata_mpeg4 }, { AV_CODEC_ID_H264, extract_extradata_h2645 }, { AV_CODEC_ID_HEVC, extract_extradata_h2645 }, - { AV_CODEC_ID_MPEG1VIDEO, extract_extradata_mpeg124 }, - { AV_CODEC_ID_MPEG2VIDEO, extract_extradata_mpeg124 }, - { AV_CODEC_ID_MPEG4, extract_extradata_mpeg124 }, + { AV_CODEC_ID_MPEG1VIDEO, extract_extradata_mpeg12 }, + { AV_CODEC_ID_MPEG2VIDEO, extract_extradata_mpeg12 }, + { AV_CODEC_ID_MPEG4, extract_extradata_mpeg4 }, { AV_CODEC_ID_VC1, extract_extradata_vc1 }, };