From patchwork Thu Mar 30 15:05:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 3197 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp1600401vss; Thu, 30 Mar 2017 08:05:56 -0700 (PDT) X-Received: by 10.28.86.130 with SMTP id k124mr4031080wmb.58.1490886356326; Thu, 30 Mar 2017 08:05:56 -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 j8si3879240wra.66.2017.03.30.08.05.55; Thu, 30 Mar 2017 08:05:56 -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=@googlemail.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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E99F689A67; Thu, 30 Mar 2017 18:05:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06DC3688375 for ; Thu, 30 Mar 2017 18:05:45 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id k6so11668363wre.3 for ; Thu, 30 Mar 2017 08:05:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=NPxWB8uVECl6Re8+AOgxeWONLbMPg29eoeX+0cWr6Ho=; b=Iv/0+r8nVsI7Ig+hibIGI2GnXS1BulN9UDiUdREuOmWHyE2Po65WfjpPOeUS2veKql u+XAFNOqKCNLy5SXegLwPmNskCLHuL4kQeYOoMD7YFYmmVMZyNLde8b40d67ntSMhbk4 GtBgXYpdrlUtLM+PFMdnnhv4BNtq0vPlh2vpMH/zkWCnrnwy1lca8W8eSe2fXUcjOijD 3/r4v4euptW0nEklPKlc9kGG88RvjECqz80k+B0DOsJLqijqCUgoKV07+/VR9VdPuPyG MczDE2008J5A5W2mURVbF9ZQekYWQ4U4gR3gS4afxlqDLYlt/OTInqeJclv/cubl34BB Yrfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NPxWB8uVECl6Re8+AOgxeWONLbMPg29eoeX+0cWr6Ho=; b=G46v6Cya45ixryQI9/ksyhdsVZljhxPCUHst+5TM1FibAjl+UyOSXJHUq+3AU6jf4b S0v9USq3ZE3y8daHWskV+PGw3HSdypUI9WujKqW+AlWB1IX4YP30pxLUkEL4YhXKK/TC OioG/4cLtg2TdL2sTmv67v5v4zCfX0ECm3oygJRfF1F+JhpjS7mv++sdvzpezhPyQANx ja/mZyMYATce08fk6pMd/hK5a4vJQRAC6UNb9a238YKsyiUwQg1eQ14KFi4dcSkS7YAD hPGFsAI3fPQ46BSybHQi857VxzvDGzbga2X3wOL8Vt5l2hIlm3W5zHjgHAYcWPQLbhnJ PRIQ== X-Gm-Message-State: AFeK/H2LqRHnwBPfY5bOF0UUrYCpeCy6g/sv2+51+WyD4FMvTrkpfp1Ubvbfy33suKG1qw== X-Received: by 10.223.166.97 with SMTP id k88mr179000wrc.33.1490886345655; Thu, 30 Mar 2017 08:05:45 -0700 (PDT) Received: from localhost.localdomain ([79.240.1.32]) by smtp.googlemail.com with ESMTPSA id x1sm3091068wrd.63.2017.03.30.08.05.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Mar 2017 08:05:44 -0700 (PDT) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Mar 2017 17:05:36 +0200 Message-Id: <20170330150536.13390-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] ffprobe: port to new decode API 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: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Not sure if it behaves ideally in presence of decoding errors. --- The original version of this patch is actually 1 year old. --- ffprobe.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/ffprobe.c b/ffprobe.c index fa60894833..c35d4cfcd9 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -2134,7 +2134,8 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, static av_always_inline int process_frame(WriterContext *w, InputFile *ifile, - AVFrame *frame, AVPacket *pkt) + AVFrame *frame, AVPacket *pkt, + int *packet_new) { AVFormatContext *fmt_ctx = ifile->fmt_ctx; AVCodecContext *dec_ctx = ifile->streams[pkt->stream_index].dec_ctx; @@ -2146,24 +2147,39 @@ static av_always_inline int process_frame(WriterContext *w, if (dec_ctx && dec_ctx->codec) { switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: - ret = avcodec_decode_video2(dec_ctx, frame, &got_frame, pkt); - break; - case AVMEDIA_TYPE_AUDIO: - ret = avcodec_decode_audio4(dec_ctx, frame, &got_frame, pkt); + if (*packet_new) { + ret = avcodec_send_packet(dec_ctx, pkt); + if (ret == AVERROR(EAGAIN)) { + ret = 0; + } else if (ret >= 0 || ret == AVERROR_EOF) { + ret = 0; + *packet_new = 0; + } + } + if (ret >= 0) { + ret = avcodec_receive_frame(dec_ctx, frame); + if (ret >= 0) { + got_frame = 1; + } else if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) { + ret = 0; + } + } break; case AVMEDIA_TYPE_SUBTITLE: ret = avcodec_decode_subtitle2(dec_ctx, &sub, &got_frame, pkt); + *packet_new = 0; break; + default: + *packet_new = 0; } + } else { + *packet_new = 0; } if (ret < 0) return ret; - ret = FFMIN(ret, pkt->size); /* guard against bogus return values */ - pkt->data += ret; - pkt->size -= ret; if (got_frame) { int is_sub = (par->codec_type == AVMEDIA_TYPE_SUBTITLE); nb_streams_frames[pkt->stream_index]++; @@ -2175,7 +2191,7 @@ static av_always_inline int process_frame(WriterContext *w, if (is_sub) avsubtitle_free(&sub); } - return got_frame; + return got_frame || *packet_new; } static void log_read_interval(const ReadInterval *interval, void *log_ctx, int log_level) @@ -2206,7 +2222,7 @@ static int read_interval_packets(WriterContext *w, InputFile *ifile, const ReadInterval *interval, int64_t *cur_ts) { AVFormatContext *fmt_ctx = ifile->fmt_ctx; - AVPacket pkt, pkt1; + AVPacket pkt; AVFrame *frame = NULL; int ret = 0, i = 0, frame_count = 0; int64_t start = -INT64_MAX, end = interval->end; @@ -2283,8 +2299,8 @@ static int read_interval_packets(WriterContext *w, InputFile *ifile, nb_streams_packets[pkt.stream_index]++; } if (do_read_frames) { - pkt1 = pkt; - while (pkt1.size && process_frame(w, ifile, frame, &pkt1) > 0); + int packet_new = 1; + while (process_frame(w, ifile, frame, &pkt, &packet_new) > 0); } } av_packet_unref(&pkt); @@ -2296,7 +2312,7 @@ static int read_interval_packets(WriterContext *w, InputFile *ifile, for (i = 0; i < fmt_ctx->nb_streams; i++) { pkt.stream_index = i; if (do_read_frames) - while (process_frame(w, ifile, frame, &pkt) > 0); + while (process_frame(w, ifile, frame, &pkt, &(int){1}) > 0); } end: