From patchwork Mon Aug 20 18:35:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Trimble X-Patchwork-Id: 10038 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp2831963jap; Mon, 20 Aug 2018 11:42:00 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzfQmOJAWQz8bkFazZqiBVy/PfcA4PGbEa6JKDnTfyHSaT5sv0XlzuFHe05ngMStG3Ww6gR X-Received: by 2002:a1c:e5cf:: with SMTP id c198-v6mr27044843wmh.113.1534790519923; Mon, 20 Aug 2018 11:41:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534790519; cv=none; d=google.com; s=arc-20160816; b=ijlhvDp6P+WVDM8X98gTMm5gSvE2ZbnV21zQ7lninOwac62KDs34DhdIoTaRIor2Vy H0g0xk3R6bWh5OujFYB3l/SbMIjmHd6d8IWdyJM6f1H3UqoeCOGEzvLlaI8Q1wCxQ2AB dbsbIpRovwKZ2FRG2+BNrTRDhi1lclVcabDIY8l/SzgjlR6pTqrXe7B2XSqmlfJquY3N MOZVzuIaWnY+jnJL0mB4fWqn5QMki4Qir/VODdUKSy6231si0EYFEVGimaIOmV4Zycd/ iPWU35c8BZOWCFmWskPg625PTJ3VJpH/zWQhvGud2vOzaVX1KTLTz2mx7eiBJjxLzoIB cW5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=3WVb3rNwPVFSiiK3Y63uFJwpgeO3OWjhwiL44i0W4Kw=; b=0dPr8dNHUTEegr/auA8AWFHw5klNh2zGIFPvlIiG7+ERwaP/pJoDEqXKd7IwM1fkx7 Rmyv3lx1BLEnTzAt63jGnnEoIf1JCRpCkPEC2oPcjtg6gcq9UI0/5FF+e/PDgjEdV353 FDy9opLTYxAYlCgXZGjAET3jb+kIxGbNL/ES7an6knLdZq3xO6y/jFc5sLrQljJpA/Ga WSlO/BNi7eXaSVyiIhztQQ/w4LauQjUR1BRv3qcZiIMP3d1BKe5JQSKXMGpbN22nDspK VOi5MJQoYSTziXfxIEbVnYk6kuRBAiFxAhfG32gSBAuAaIA+GMe4vVau5tj8PC4OCivp IhdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=kR+C7glR; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m82-v6si282449wma.94.2018.08.20.11.41.59; Mon, 20 Aug 2018 11:41:59 -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=@google.com header.s=20161025 header.b=kR+C7glR; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D200689CB4; Mon, 20 Aug 2018 21:41:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A176E689B43 for ; Mon, 20 Aug 2018 21:41:21 +0300 (EEST) Received: by mail-lj1-f172.google.com with SMTP id q127-v6so12370787ljq.11 for ; Mon, 20 Aug 2018 11:41:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=CF55XtwC+jyh2YCfXsiHHp1RJsVodVqHXvq119hHm6U=; b=kR+C7glRd/fEfpO/478xlefyyrfRU+iuGat7OWSou+KZ5z6aq0bGx/qUftsJUcTbNI JuVzZdVGRcOlzpaafdaVdpDmFoPbrWYcYYEqiVVYLeLIwzUbS9dJGeIgwcmlKEIzHjGS crzwRs6UdrBIb7u1usxFPqNSpp4wQ/DMKJozl2y8tavAyiZOVQb6MVddtBHC/sgOxgY2 QqIO3ZtJcW8khEi+kOwnNVTf4BCqY6BGr2/y5+n6kn3bE2TkvYFFCQTDard3ljUSSywa o50fdFTKQnyzgBBFB/LRwrq1fxGmAIgUHNkTezSqqK1G0SJT6ZuHqBHBF/cgdmEJdLZd mdCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=CF55XtwC+jyh2YCfXsiHHp1RJsVodVqHXvq119hHm6U=; b=IAhXzf/uIgWKQvTj2QTddNdZQE4/73OHIXh+snDSnf2LR+l/BFK83QWvVOPLTfBV0F rANYEQd5NS8ebmiqjR/TDyA+Sc76vJXcZE1gwHGmZAVVCwJr8ZXEexftUswDpIKXx+F0 QQrIED7xbh8rGIOqLpkkcBWvX5WuwRgYDgLyi8HYJn4kPb4DBo6D6LaVhEP/H6EyCaCj 0d2xQvaTFoEz0eWpsbBfzn/H2kF1ricLDXhBpSswKQId2m3z6vZ8d1v/2biW6v/YaKhK hQqdSnoNKT+dcw0lhXBvL1WvMjMuN6KP5QHLqH1N+iC2s6dPHaLdQHeVSJF0Sm4MiuSr Z/gQ== X-Gm-Message-State: AOUpUlGCf7Xn26GeAMAizy6SwvAYn6gTdR2u89bZ+YhI0tlgkdVE46gF 7BbeEzffZpc1jHnlW11jtTQN1KBgsfJXB0rFdKNRxbno X-Received: by 2002:a2e:5243:: with SMTP id g64-v6mr31243969ljb.144.1534790156598; Mon, 20 Aug 2018 11:35:56 -0700 (PDT) MIME-Version: 1.0 From: Jacob Trimble Date: Mon, 20 Aug 2018 11:35:45 -0700 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/opus_parser: Handle complete frames flag. 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" I am not entirely sure what this flag is supposed to be, since there is no documentation where it is defined. But this was suggested by James Almer as a fix for my encrypted Opus problems and several other codec parsers do the same thing. From 87dfe4d3d21a824c0fbe71dad2ebc8672b3fd2b4 Mon Sep 17 00:00:00 2001 From: Jacob Trimble Date: Mon, 20 Aug 2018 11:25:27 -0700 Subject: [PATCH] avcodec/opus_parser: Handle complete frames flag. Signed-off-by: Jacob Trimble --- libavcodec/opus_parser.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/libavcodec/opus_parser.c b/libavcodec/opus_parser.c index 28b0933900..a145fe7793 100644 --- a/libavcodec/opus_parser.c +++ b/libavcodec/opus_parser.c @@ -170,19 +170,24 @@ static int opus_parse(AVCodecParserContext *ctx, AVCodecContext *avctx, ParseContext *pc = &s->pc; int next, header_len; - next = opus_find_frame_end(ctx, avctx, buf, buf_size, &header_len); - - if (s->ts_framing && next != AVERROR_INVALIDDATA && - ff_combine_frame(pc, next, &buf, &buf_size) < 0) { - *poutbuf = NULL; - *poutbuf_size = 0; - return buf_size; - } + if (ctx->flags & PARSER_FLAG_COMPLETE_FRAMES) { + next = buf_size; + header_len = 0; + } else { + next = opus_find_frame_end(ctx, avctx, buf, buf_size, &header_len); + + if (s->ts_framing && next != AVERROR_INVALIDDATA && + ff_combine_frame(pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } - if (next == AVERROR_INVALIDDATA){ - *poutbuf = NULL; - *poutbuf_size = 0; - return buf_size; + if (next == AVERROR_INVALIDDATA){ + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } } *poutbuf = buf + header_len; -- 2.18.0.865.gffc8e1a3cd6-goog