From patchwork Tue Aug 16 01:39: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: 184 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp1861704vsd; Mon, 15 Aug 2016 18:40:11 -0700 (PDT) X-Received: by 10.28.129.137 with SMTP id c131mr17133033wmd.79.1471311610966; Mon, 15 Aug 2016 18:40: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 s23si18112290wma.126.2016.08.15.18.40.10; Mon, 15 Aug 2016 18:40: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 E1A2B689AC9; Tue, 16 Aug 2016 04:40:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f52.google.com (mail-it0-f52.google.com [209.85.214.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 650C9689A7C for ; Tue, 16 Aug 2016 04:39:57 +0300 (EEST) Received: by mail-it0-f52.google.com with SMTP id x131so2768767ite.0 for ; Mon, 15 Aug 2016 18:39:59 -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=MvQkawDoL4DSArIeJYF2NlN7N9j55areV7QTo0LTwdU=; b=lSz5V+2KJPRY0Lueenkb1c+VbPfj2NLIQTqeYU4GM6BPi0+Jl/Iq+83WUw9ZmJY0Sf NGL4YD1dT4ZfMB/fUzWQd02Z15Fw5xe1zfzT8dvGtq7kP2YTIGuQW4CFoiNp7DmooF2r uA4l6njB96sgiTt7rwMkUxNOPj0Oj5IVKevLUTBc7oGPpKJbA5qWbyG25SNBnau5Pc6x +Fnv1wer+T7JRaLzDarggmtFQSRnH+P3kA+iA4G0Pl3SJvivla5JDz6NtgRM7ZBZGBan 1JtqtgIMjU0goJStwgyVu0zzxqlKqziR/ToGNuzr4SNkYLYEddqUWPIp+WxC9hkriN0G v1PQ== 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=MvQkawDoL4DSArIeJYF2NlN7N9j55areV7QTo0LTwdU=; b=X+fy060TptNB3/Ua08981mw7BR7uQOrRUNytdbH6euV5ytPVf6vie1Wn0beWktJuzg RjcWeUevyQJoW94R1OXgHKhaOSJhjGAEs65CNT6SVaar3V3QfblFRApWwPhfMFCawQtR 24yMHzHwGag0EfU5VPZcavNktXYxsnwI4hgb3SNPKLqvedLxfvQbbmjIQeJZ3hS0ZDvg VF/rODwrZsdxAe+J2j9Ea8pzu1YIShcXc5YXTBHQuK7Rv4AEpWSEIeGX7h4QstMw8KZS /wNwyf3WQW6/c8aA/1QQGTs9NQjFcavyoDDwF2oolASDMG3LJC/sukThFPBx1aq3o+ON A9VA== X-Gm-Message-State: AEkoout8qKdlqYabX5mq0j6L6wR4HJ3hsdKJNVRMXxK7JPvKw5E1MajRfKwpLdS8Lf2JbhWy X-Received: by 10.36.31.18 with SMTP id d18mr18512647itd.64.1471311598047; Mon, 15 Aug 2016 18:39:58 -0700 (PDT) Received: from isasi.mtv.corp.google.com ([172.27.82.89]) by smtp.gmail.com with ESMTPSA id 192sm2807111itk.17.2016.08.15.18.39.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Aug 2016 18:39:57 -0700 (PDT) From: Sasi Inguva To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Aug 2016 18:39:01 -0700 Message-Id: <1471311541-25901-2-git-send-email-isasi@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1471311541-25901-1-git-send-email-isasi@google.com> References: <20160814124029.GA26860@leki> <1471311541-25901-1-git-send-email-isasi@google.com> Subject: [FFmpeg-devel] [PATCH 3/4] lavc: Add a flag in AVPacket to discard packet after decoding. Discard frames after decoding based on the 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 Cc: Sasi Inguva MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Sasi Inguva --- libavcodec/avcodec.h | 6 ++++++ libavcodec/utils.c | 15 ++++++++++++++- libavcodec/version.h | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3b21537..d68da01 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1621,6 +1621,12 @@ typedef struct AVPacket { } AVPacket; #define AV_PKT_FLAG_KEY 0x0001 ///< The packet contains a keyframe #define AV_PKT_FLAG_CORRUPT 0x0002 ///< The packet content is corrupted +/** + * Flag is used to discard packets which are required to maintain valid + * decoder state but are not required for output and should be dropped + * after decoding. + **/ +#define AV_PKT_FLAG_DISCARD 0x0004 enum AVSideDataParamChangeFlags { AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001, diff --git a/libavcodec/utils.c b/libavcodec/utils.c index f7adb52..a90fe45 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -784,6 +784,12 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) } } add_metadata_from_side_data(pkt, frame); + + if (pkt->flags & AV_PKT_FLAG_DISCARD) { + frame->flags |= AV_FRAME_FLAG_DISCARD; + } else { + frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD); + } } else { frame->pkt_pts = AV_NOPTS_VALUE; av_frame_set_pkt_pos (frame, -1); @@ -2248,7 +2254,9 @@ fail: if(ret == tmp.size) ret = avpkt->size; } - + if (picture->flags & AV_FRAME_FLAG_DISCARD) { + *got_picture_ptr = 0; + } if (*got_picture_ptr) { if (!avctx->refcounted_frames) { int err = unrefcount_frame(avci, picture); @@ -2347,6 +2355,7 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, 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); + av_assert1(avctx->internal->skip_samples >= 0); discard_padding = AV_RL32(side + 4); av_log(avctx, AV_LOG_DEBUG, "skip %d / discard %d samples due to side data\n", avctx->internal->skip_samples, (int)discard_padding); @@ -2412,6 +2421,10 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, avctx->internal->skip_samples = 0; } } + + if ((frame->flags & AV_FRAME_FLAG_DISCARD) && avctx->internal->skip_samples == 0) { + *got_frame_ptr = 0; + } fail: avctx->internal->pkt = NULL; if (did_split) { diff --git a/libavcodec/version.h b/libavcodec/version.h index 4ded1ee..a697261 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 51 +#define LIBAVCODEC_VERSION_MINOR 52 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \