From patchwork Tue Oct 4 00:45:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Toohill X-Patchwork-Id: 864 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1880431vsd; Mon, 3 Oct 2016 17:45:36 -0700 (PDT) X-Received: by 10.28.4.143 with SMTP id 137mr9068827wme.91.1475541936455; Mon, 03 Oct 2016 17:45:36 -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 y5si1216920wjl.57.2016.10.03.17.45.36; Mon, 03 Oct 2016 17:45:36 -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; 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 81CE1689C74; Tue, 4 Oct 2016 03:45:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pa0-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 85A45689A7B for ; Tue, 4 Oct 2016 03:45:06 +0300 (EEST) Received: by mail-pa0-f46.google.com with SMTP id qn7so66181692pac.3 for ; Mon, 03 Oct 2016 17:45:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uAcDUmpcjSQ/+60ASf9ZH44sUUGi+5ztpBckz6pw0u0=; b=QMrmki6NMwEwKx52uAZLuMbhRc81C/wPLRy+UvuncZJhlJq+RPEkK1jg2IDs3FFwo/ K8xYT/gDqnCGveFDJp3Co5ZBsPPIBoehr2fusPIjXNf2G4bEdUs9mwcOyQJshgo/f6/I hxwpYL5JrhQSk10/XdP4Ta25FAvR4IrHeNOwc1V+3iYE9PPbU69O/0kFT+s8rhKZQ7+p +e/A3KOcjS5kqH1i+rw0Fk95OR0HFaM3JcZB9YwbFAjgzLEamJmPcSo2t2qb9tnB1ZU0 e7EBX6GYNEw57kcB1D3MHJkIyv2Bw+8Kkb53JzCbIUOh4LYVAy9/7PQhsXmRG76u3gRP iOxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uAcDUmpcjSQ/+60ASf9ZH44sUUGi+5ztpBckz6pw0u0=; b=PWHdPXybMBgBsX4x9hvD3bbIMjsfcBxE5DXEGxXdbXV5zBNuF0rV8QnoLDjrSo0mjB /XRQcclbtXVttF9FLIE9yM1pGHkQTIBbZh220lJzQYu+/V2N32dQn5NqFF5LlCcxQJ/V HzNcAsJLl2jlAjo8+z3cUo+zhJeKZu4qWKPoSX/1/g9xRl1RZic43RzdrE26hHFiB/ve mlG/iwOUwTtJpVwQJnDZ5lEGOAEcngU8g5aTbSSE8/Bx3tAzFifroHlmt9WXRXxFTrSi Uw+2exNmtreonAmBB2TKQ2wlLtR0GkGmWAVQc02/WS/Xbo3uKDUsFrKJm8Kc5CobAJUM sRKA== X-Gm-Message-State: AA6/9RkyvNBcHSB7fGddhGjBxP08iEx3Z0Cfpagd4TEA5TEZ7GSQLFLFGcn+6bTwu8XoaOuX X-Received: by 10.67.12.203 with SMTP id es11mr1224863pad.186.1475541919281; Mon, 03 Oct 2016 17:45:19 -0700 (PDT) Received: from mungolini.mtv.corp.google.com ([100.96.2.73]) by smtp.gmail.com with ESMTPSA id i62sm49813834pfg.89.2016.10.03.17.45.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Oct 2016 17:45:18 -0700 (PDT) From: Jon Toohill To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Oct 2016 17:45:06 -0700 Message-Id: <1475541908-21260-2-git-send-email-jtoohill@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1475541908-21260-1-git-send-email-jtoohill@google.com> References: <1475087343-29745-1-git-send-email-jtoohill@google.com> <1475541908-21260-1-git-send-email-jtoohill@google.com> Subject: [FFmpeg-devel] [PATCH 1/3] lavc/libmp3lame: send encoder padding in side data of final packet 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 Cc: Jon Toohill MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/libmp3lame.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 5642264..a1bf122 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -185,7 +185,7 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, { LAMEContext *s = avctx->priv_data; MPADecodeHeader hdr; - int len, ret, ch; + int len, ret, ch, discard_padding; int lame_result; uint32_t h; @@ -269,6 +269,25 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, ff_af_queue_remove(&s->afq, avctx->frame_size, &avpkt->pts, &avpkt->duration); + discard_padding = avctx->frame_size - avpkt->duration; + // Check if subtraction resulted in an overflow + if ((discard_padding < avctx->frame_size) != (avpkt->duration > 0)) { + av_packet_unref(avpkt); + av_free(avpkt); + return AVERROR(EINVAL); + } + if (discard_padding > 0) { + uint8_t* side_data = av_packet_new_side_data(avpkt, + AV_PKT_DATA_SKIP_SAMPLES, + 10); + if(!side_data) { + av_packet_unref(avpkt); + av_free(avpkt); + return AVERROR(ENOMEM); + } + AV_WL32(side_data + 4, discard_padding); + } + avpkt->size = len; *got_packet_ptr = 1; }