From patchwork Wed Oct 5 19:37:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Toohill X-Patchwork-Id: 891 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp501021vsd; Wed, 5 Oct 2016 12:38:10 -0700 (PDT) X-Received: by 10.28.4.74 with SMTP id 71mr11447889wme.19.1475696290426; Wed, 05 Oct 2016 12:38:10 -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 f194si13693095wmf.65.2016.10.05.12.38.10; Wed, 05 Oct 2016 12:38:10 -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 1C4B1689B79; Wed, 5 Oct 2016 22:37:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pa0-f45.google.com (mail-pa0-f45.google.com [209.85.220.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 135A3689742 for ; Wed, 5 Oct 2016 22:37:39 +0300 (EEST) Received: by mail-pa0-f45.google.com with SMTP id cd13so85293134pac.0 for ; Wed, 05 Oct 2016 12:37:54 -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=EoRUDfXvSgS6HBGuUgG/BlqVBZSRl9GRt2YmQykRnT8=; b=gXCsBo2aXIk3YOeQ8M9/QnLHS9xhMrppxfeOehf4yAgjTq73H6uJevIGetuCIGxz1B VmrgfhUgR3qHTlK4CWmqzI6RGLpyjeTl4mr57BgVdRXY6nTCP6Bc58tCDLJyTy5BoN9u DEjWgWX2JIXxTr4WN+mcFt2wk78HCSqENrSlCOeL49HPT1I9yio/EQ5lAo1V3U/MnKVu cPzO6P3Mho6ruY0wKWpUy9FXZnwjRLTknSNj9+281RBjPM6y47L/vU8mQG1Qrs0cwOnf h1d5AjFyL5dY/nJJdZ4rGsTSDilZPa/wZ+5qdj+n1Q6RlfYfPo65wrvZJywId+nJ7Unh PuRQ== 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=EoRUDfXvSgS6HBGuUgG/BlqVBZSRl9GRt2YmQykRnT8=; b=Aq0X5vuZ4eFUtHj7DiawyNx+AqHGVyUEEOnnim7GAGdioSG1dmclBPnhkVie/v4AnX LdBCdggdaH2/R85dEqqNeyWfk4WUov7zVOzLAyeZKw2HDROfcr5Gz6ouI3HEtLJkJguw /EvO3SF4POxWADZxHVPvozjteI+NmWWyuE6h3N4SGH+nfcSbvN7xYaAnS2dfclJhTAku xc8oAk5MLid4DFsWd9D0BCE/0xVZTWVnYJ2j/7S2Uq4yMw4mDV44p/K9H+JYpx8WgynW +VJT8oeySaqhMtpeamkX9bZZb4rSPFIVMBjTHLZrJFI1k2+ogabDRYlAgt11zhecNYtd 97HA== X-Gm-Message-State: AA6/9Rlu9wtqOxxfl6mig0uwEv8Gu1wwffDMKHU280qYlY5bsn48Htm5NnUueKm5QXj/WI42 X-Received: by 10.66.193.71 with SMTP id hm7mr16077611pac.164.1475696272516; Wed, 05 Oct 2016 12:37:52 -0700 (PDT) Received: from mungolini.mtv.corp.google.com ([100.96.2.73]) by smtp.gmail.com with ESMTPSA id ra13sm16256249pac.29.2016.10.05.12.37.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Oct 2016 12:37:52 -0700 (PDT) From: Jon Toohill To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Oct 2016 12:37:36 -0700 Message-Id: <1475696257-12390-2-git-send-email-jtoohill@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1475696257-12390-1-git-send-email-jtoohill@google.com> References: <1475541908-21260-1-git-send-email-jtoohill@google.com> <1475696257-12390-1-git-send-email-jtoohill@google.com> Subject: [FFmpeg-devel] [PATCH 1/2] lavc/libmp3lame: send encoder delay/padding in packet side data 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 | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 5642264..b3ba0d8 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -50,6 +50,7 @@ typedef struct LAMEContext { int reservoir; int joint_stereo; int abr; + int delay_sent; float *samples_flt[2]; AudioFrameQueue afq; AVFloatDSPContext *fdsp; @@ -185,7 +186,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 +270,29 @@ 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 ((!s->delay_sent && avctx->initial_padding > 0) || 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); + } + if (!s->delay_sent) { + AV_WL32(side_data, avctx->initial_padding); + s->delay_sent = 1; + } + AV_WL32(side_data + 4, discard_padding); + } + avpkt->size = len; *got_packet_ptr = 1; }