From patchwork Tue Sep 27 01:41:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasi Inguva X-Patchwork-Id: 743 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp2218535vsd; Mon, 26 Sep 2016 18:49:43 -0700 (PDT) X-Received: by 10.28.51.146 with SMTP id z140mr601384wmz.9.1474940983041; Mon, 26 Sep 2016 18:49:43 -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 v125si11312893wmd.15.2016.09.26.18.49.40; Mon, 26 Sep 2016 18:49:43 -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 6C6A9689E7D; Tue, 27 Sep 2016 04:49:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f170.google.com (mail-pf0-f170.google.com [209.85.192.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C04AA689C80 for ; Tue, 27 Sep 2016 04:49:14 +0300 (EEST) Received: by mail-pf0-f170.google.com with SMTP id q2so71475015pfj.3 for ; Mon, 26 Sep 2016 18:49:32 -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=yXoYAjvZw+Jfk3VhIe/GJk1bzSWhwhT6fiVeSYndHVk=; b=D6VLsB1d4i7+oTOgULPM4kKxIHu81eU9jrHN2FkAI0qF/YWPitO+E+f7kGlUxS7HcV XneHWoeeR+WTVL38/YJehSZFV4ZrkbbcXpeLqQtSA62PT3pnJGaUc2asCsGkmFYF13iS 3uvC3nixv9maKdVkqBc+HZGBtV1JJeKUfXo/ha8onXJ4E0Om568ewb0mDUWcE3pyI3co eyUISfL/IWDRmYf2OgE9DbuaMrYlD1NvPGS9RQl8Kn78XpMVqOUzPBO9TKMag9Ff3+C8 82dhIwO8OA4vIoGChXlFJzHUWmr+wFp6MzUbzTDjYyyEYxRsrzVMp62+PTkmb5s6nHrg hjNQ== 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=yXoYAjvZw+Jfk3VhIe/GJk1bzSWhwhT6fiVeSYndHVk=; b=VHIsJu5NhxSVJtFd2bLwyrbBGa2KClbcLsNfNTGs0bHYyymv0iyby1hv5xUwVpFYkI XlcNqhagJRjSHEkPn2QZXlGedDoJ3CqTJvd7tEQY93Mn2Rw8rDJpDedjiTfowV9m4NdP Q11wNwx7pUYb0Fu5mBEO/cPBHmh3Lo35PRcYPGKM46SVbUv87qPkexMvcrqy/NoLX3pI jEVDDTeMXOUsB9TDM3P6jdjPhz5yMVaEQUMaKKDkpJiSKBZP+rBAOK/kFJSqpOw+Vvuv jEAxR4GabOAUkbs/amsO0lP0L6zGiO/lIkvifD7LKW4rfzy0dnx9mZwp/ueQOgVwkOUI xLsw== X-Gm-Message-State: AE9vXwOrkQNpvEzmypPyZA7dB0Uu1163oe4LFZ+VdYaXz9QnDj30PJi0Mq6rwexDTyw7dWuy X-Received: by 10.98.54.199 with SMTP id d190mr43376198pfa.121.1474940495742; Mon, 26 Sep 2016 18:41:35 -0700 (PDT) Received: from isasi.mtv.corp.google.com ([172.27.82.89]) by smtp.gmail.com with ESMTPSA id b188sm30900643pfa.82.2016.09.26.18.41.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Sep 2016 18:41:35 -0700 (PDT) From: Sasi Inguva To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2016 18:41:01 -0700 Message-Id: <1474940461-761-1-git-send-email-isasi@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <20160927010139.GI4975@nb4> References: <20160927010139.GI4975@nb4> Subject: [FFmpeg-devel] [PATCH 1/3] lavc/utils.c: Subtract skip_samples when frame is DISCARDed. 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: Sasi Inguva MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Sasi Inguva --- libavcodec/utils.c | 16 +++++++--------- libavcodec/version.h | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b0345b6..6323156 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2320,7 +2320,6 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, uint32_t discard_padding = 0; uint8_t skip_reason = 0; uint8_t discard_reason = 0; - int demuxer_skip_samples = 0; // copy to ensure we do not change avpkt AVPacket tmp = *avpkt; int did_split = av_packet_split_side_data(&tmp); @@ -2328,7 +2327,6 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, if (ret < 0) goto fail; - demuxer_skip_samples = avctx->internal->skip_samples; avctx->internal->pkt = &tmp; if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME) ret = ff_thread_decode_frame(avctx, frame, got_frame_ptr, &tmp); @@ -2353,13 +2351,6 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, frame->sample_rate = avctx->sample_rate; } - - if (frame->flags & AV_FRAME_FLAG_DISCARD) { - // If using discard frame flag, ignore skip_samples set by the decoder. - avctx->internal->skip_samples = demuxer_skip_samples; - *got_frame_ptr = 0; - } - side= av_packet_get_side_data(avctx->internal->pkt, AV_PKT_DATA_SKIP_SAMPLES, &side_size); if(side && side_size>=10) { avctx->internal->skip_samples = AV_RL32(side); @@ -2369,6 +2360,13 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, skip_reason = AV_RL8(side + 8); discard_reason = AV_RL8(side + 9); } + + if ((frame->flags & AV_FRAME_FLAG_DISCARD) && *got_frame_ptr && + !(avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) { + avctx->internal->skip_samples -= frame->nb_samples; + *got_frame_ptr = 0; + } + if (avctx->internal->skip_samples > 0 && *got_frame_ptr && !(avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) { if(frame->nb_samples <= avctx->internal->skip_samples){ diff --git a/libavcodec/version.h b/libavcodec/version.h index 9e44eca..71dac40 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 58 +#define LIBAVCODEC_VERSION_MINOR 59 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \