From patchwork Tue Aug 22 16:34:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 4796 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.137.29 with SMTP id o29csp1035117jaj; Tue, 22 Aug 2017 09:35:00 -0700 (PDT) X-Received: by 10.223.142.245 with SMTP id q108mr747275wrb.320.1503419700812; Tue, 22 Aug 2017 09:35:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503419700; cv=none; d=google.com; s=arc-20160816; b=GWT9ZZIyy3oj0Vj5gl8JppuD7WXS7hMmPtG8QnHmZtd0rQOzoriNEG0P1bDkkoAPFn knY4quc3M0D8PZyv+TGhrdKiWxiogFIZrbPeHABluRHDnuOpjSV1wfmro9TKo0BCTsRd mMtuQIeJWL7e4X3Yo2nS7B1Wqq3ckkPfSRpBsc7zFlOOpDZ8kW7LVAGvV1fwzwZ4VMKT qBRnXVULh8vz6fjVNSdXAYsFPQAp9BMjMNFzSIIgC3groOc09u1ZxkLtZIbLG7oRKpwJ 20UX2OhtAhKg1fYsGJC260aLs/L/LwTv3pSPkBrrc72E0Qcvx3CSjyT7FOVmqn5ZztYK IQGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=Cte0Ojundhb5vteyPxk4kKR0r/dJV2rUTt7X7lUevQM=; b=KhdaEeUC2AYERpQNhQLLYsjdvU126bDPcFiyH1Fyg9CDbEVuN3/KZKQstkFb+Gl6is naSoEpyGAt5dmqVco/PCRn/a61yCOTbyAnFqZC+KZIXvCwq/BxfM7EsHsbmg/ipiC60b /50NjGKAuXDWG4QEwf8Dc+3Tf4pa3fJmP2vaD/2PXxTFwkVqg6m2w07fBmN5YgaxHS5F JJ7iEzDn9C3VBnbVVuFHjIUCynL5qdpljfnqBttSoLJqLz+ZgkZlK4Pe535EbQy0nKwg /22iDjMu69UfBVLueX+s2s0q8hY8btUWDh2dj7P4QYVG8l/3iHb8WC7OLuXJeiUy2i/e opcQ== ARC-Authentication-Results: i=1; mx.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d19si6598731wrg.548.2017.08.22.09.34.59; Tue, 22 Aug 2017 09:35:00 -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; 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 797C6689C54; Tue, 22 Aug 2017 19:34:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-3.mx.upcmail.net (vie01a-qmta-pe01-3.mx.upcmail.net [62.179.121.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F711689895 for ; Tue, 22 Aug 2017 19:34:42 +0300 (EEST) Received: from [172.31.218.49] (helo=vie01a-dmta-pe05-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dkC8f-0005sy-Gr for ffmpeg-devel@ffmpeg.org; Tue, 22 Aug 2017 18:34:49 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dkC8Z-00088i-Rg for ffmpeg-devel@ffmpeg.org; Tue, 22 Aug 2017 18:34:43 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 0Gad1w0250S5wYM01GaeQh; Tue, 22 Aug 2017 18:34:38 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 22 Aug 2017 18:34:36 +0200 Message-Id: <20170822163436.10354-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170822163436.10354-1-michael@niedermayer.cc> References: <20170822163436.10354-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] ffprobe: Fix NULL pointer handling in color parameter printing 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- ffprobe.c | 88 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 39 deletions(-) diff --git a/ffprobe.c b/ffprobe.c index d4bdd9c099..ba10563b9d 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -1925,6 +1925,26 @@ static void print_pkt_side_data(WriterContext *w, writer_print_section_footer(w); } +static void print_color_range(WriterContext *w, enum AVColorRange color_range, const char *fallback) +{ + const char *val = av_color_range_name(color_range); + if (!val || color_range == AVCOL_RANGE_UNSPECIFIED) { + print_str_opt("color_range", fallback); + } else { + print_str("color_range", val); + } +} + +static void print_color_space(WriterContext *w, enum AVColorSpace color_space) +{ + const char *val = av_color_space_name(color_space); + if (!val || color_space == AVCOL_SPC_UNSPECIFIED) { + print_str_opt("color_space", "unknown"); + } else { + print_str("color_space", val); + } +} + static void print_primaries(WriterContext *w, enum AVColorPrimaries color_primaries) { const char *val = av_color_primaries_name(color_primaries); @@ -1935,6 +1955,27 @@ static void print_primaries(WriterContext *w, enum AVColorPrimaries color_primar } } +static void print_color_trc(WriterContext *w, enum AVColorTransferCharacteristic color_trc) +{ + const char *val = av_color_transfer_name(color_trc); + if (!val || color_trc == AVCOL_TRC_UNSPECIFIED) { + print_str_opt("color_transfer", "unknown"); + } else { + print_str("color_transfer", val); + } +} + +static void print_chroma_location(WriterContext *w, enum AVChromaLocation chroma_location) +{ + const char *val = av_chroma_location_name(chroma_location); + if (!val || chroma_location == AVCHROMA_LOC_UNSPECIFIED) { + print_str_opt("chroma_location", "unspecified"); + } else { + print_str("chroma_location", val); + } +} + + static void clear_log(int need_lock) { int i; @@ -2116,27 +2157,11 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, print_int("top_field_first", frame->top_field_first); print_int("repeat_pict", frame->repeat_pict); - if (frame->color_range != AVCOL_RANGE_UNSPECIFIED) - print_str("color_range", av_color_range_name(frame->color_range)); - else - print_str_opt("color_range", av_color_range_name(frame->color_range)); - - if (frame->colorspace != AVCOL_SPC_UNSPECIFIED) - print_str("color_space", av_color_space_name(frame->colorspace)); - else - print_str_opt("color_space", av_color_space_name(frame->colorspace)); - + print_color_range(w, frame->color_range, "unknown"); + print_color_space(w, frame->colorspace); print_primaries(w, frame->color_primaries); - - if (frame->color_trc != AVCOL_TRC_UNSPECIFIED) - print_str("color_transfer", av_color_transfer_name(frame->color_trc)); - else - print_str_opt("color_transfer", av_color_transfer_name(frame->color_trc)); - - if (frame->chroma_location != AVCHROMA_LOC_UNSPECIFIED) - print_str("chroma_location", av_chroma_location_name(frame->chroma_location)); - else - print_str_opt("chroma_location", av_chroma_location_name(frame->chroma_location)); + print_color_trc(w, frame->color_trc); + print_chroma_location(w, frame->chroma_location); break; case AVMEDIA_TYPE_AUDIO: @@ -2508,27 +2533,12 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id if (s) print_str ("pix_fmt", s); else print_str_opt("pix_fmt", "unknown"); print_int("level", par->level); - if (par->color_range != AVCOL_RANGE_UNSPECIFIED) - print_str ("color_range", av_color_range_name(par->color_range)); - else - print_str_opt("color_range", "N/A"); - - if (par->color_space != AVCOL_SPC_UNSPECIFIED) - print_str("color_space", av_color_space_name(par->color_space)); - else - print_str_opt("color_space", av_color_space_name(par->color_space)); - - if (par->color_trc != AVCOL_TRC_UNSPECIFIED) - print_str("color_transfer", av_color_transfer_name(par->color_trc)); - else - print_str_opt("color_transfer", av_color_transfer_name(par->color_trc)); + print_color_range(w, par->color_range, "N/A"); + print_color_space(w, par->color_space); + print_color_trc(w, par->color_trc); print_primaries(w, par->color_primaries); - - if (par->chroma_location != AVCHROMA_LOC_UNSPECIFIED) - print_str("chroma_location", av_chroma_location_name(par->chroma_location)); - else - print_str_opt("chroma_location", av_chroma_location_name(par->chroma_location)); + print_chroma_location(w, par->chroma_location); if (par->field_order == AV_FIELD_PROGRESSIVE) print_str("field_order", "progressive");