From patchwork Thu Nov 22 14:56:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 11120 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B9B6744C2D3 for ; Thu, 22 Nov 2018 16:56:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4636868A0C2; Thu, 22 Nov 2018 16:56:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58358689F03 for ; Thu, 22 Nov 2018 16:56:49 +0200 (EET) Received: by mail-pl1-f195.google.com with SMTP id 101so3092741pld.6 for ; Thu, 22 Nov 2018 06:56:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NImF1UeftDO1JtUFcaoi6LNLYTG3jkisshBA4sj1OAA=; b=aRUXVvqFsM3NGS4L0mWVvyXLBjQQtgUDRMW2NJgr8rfTaLgD8nfmQJBeDgVHu6HBJf r+HoQP/OM1458FPYpPZ+OB+sVOZeFJYrTJx+hytwvzm6snKD+yb3LFtjHovjZ8jPVscE LlfGmI+vUYdn1OkAfuBMuTmi3rZMjS3WOQEOhFeHUM8BTx/f9f+3ft/vQedm7BX2xZEG P/g/K6BJy4TA37PnOh+dmEQGtdQvHnIjZE/gvQbsFVgkbX1lhsdYRICiGmJnXRC/WHER k6cB/7gxucwQs8SYXfV0Dh99/MP3FhR1ZB9gj4dzzsw+Xr0rPDTm8UAUKqi15cwMuxtz lu7w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=NImF1UeftDO1JtUFcaoi6LNLYTG3jkisshBA4sj1OAA=; b=n8Pm068Vvt139kv6iTm8vD6l387evIVxDrHayektOQwHJxUXC/+yZAly+9V8R3cTDb l9lFlM58IuDHKtBYW5hwKTbidw8h9kpHRVuG9wx7OA5e0lx3KnARsvOqfjqI8CGcVViD n8heg16OVIqBSaHnIGs8cGHsoa0wnP0HLrSkxlAt29h3B1nB1f7BLbxwaNkatr7L9/DB jK6qIREpmT5PDVLf1Idgm8Cj9WYnWPj4WJ/uOmYNm2zMjH/xGnW/iuhay058rApIUpm0 PlUYiYgt/6JacJbqWRCrrQTl1knmtEpe0VcHu6ZDz22sbdkj1VAwd5jWEcEupz1nKZZq zlRA== X-Gm-Message-State: AA+aEWY6EDXJM5V96hBp1+89NiwYdITeI2R1TiwEHdX6ZvWC9Ly+TIb9 WYXVzXyMaNP1mxbAPwn5NxdLnvQ89Ck= X-Google-Smtp-Source: AFSGD/UpNz62+B9WoCZU/q+PM4ASQSvnr90xb8BRTzUH4VOcLPRgTq1IyAFwLH5StxC0hUqAhDylvg== X-Received: by 2002:a17:902:8346:: with SMTP id z6mr11557500pln.340.1542898610482; Thu, 22 Nov 2018 06:56:50 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id s2-v6sm110834933pfk.133.2018.11.22.06.56.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Nov 2018 06:56:49 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Nov 2018 22:56:19 +0800 Message-Id: <1542898579-13278-8-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1542898579-13278-1-git-send-email-mypopydev@gmail.com> References: <1542898579-13278-1-git-send-email-mypopydev@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V3 7/7] fftools/ffprobe: fix max_bit_rate dump. 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: Jun Zhao Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" ‘codec’ is deprecated in AVStream, so used the dec_ctx to dump max_bit_rate in ffprobe. Clean the warning like: "warning: ‘codec’ is deprecated [-Wdeprecated-declarations]" Reviewed-by: Moritz Barsnick Signed-off-by: Jun Zhao --- fftools/ffprobe.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index dea489d..349ea9f 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2622,10 +2622,8 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id print_time("duration", stream->duration, &stream->time_base); if (par->bit_rate > 0) print_val ("bit_rate", par->bit_rate, unit_bit_per_second_str); else print_str_opt("bit_rate", "N/A"); -#if FF_API_LAVF_AVCTX - if (stream->codec->rc_max_rate > 0) print_val ("max_bit_rate", stream->codec->rc_max_rate, unit_bit_per_second_str); - else print_str_opt("max_bit_rate", "N/A"); -#endif + if (dec_ctx && dec_ctx->rc_max_rate >0) print_val ("max_bit_rate", dec_ctx->rc_max_rate, unit_bit_per_second_str); + else print_str_opt("max_bit_rate", "N/A"); if (dec_ctx && dec_ctx->bits_per_raw_sample > 0) print_fmt("bits_per_raw_sample", "%d", dec_ctx->bits_per_raw_sample); else print_str_opt("bits_per_raw_sample", "N/A"); if (stream->nb_frames) print_fmt ("nb_frames", "%"PRId64, stream->nb_frames); @@ -2915,6 +2913,7 @@ static int open_input_file(InputFile *ifile, const char *filename) ist->dec_ctx->pkt_timebase = stream->time_base; ist->dec_ctx->framerate = stream->avg_frame_rate; + ist->dec_ctx->rc_max_rate = stream->rc_max_rate; #if FF_API_LAVF_AVCTX ist->dec_ctx->coded_width = stream->codec->coded_width; ist->dec_ctx->coded_height = stream->codec->coded_height;