From patchwork Fri May 24 07:46:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonin Gouzer X-Patchwork-Id: 13269 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 B9B2644821F for ; Fri, 24 May 2019 10:52:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 984196808BB; Fri, 24 May 2019 10:52:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8092A6806DB for ; Fri, 24 May 2019 10:52:41 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id i3so8280365wml.4 for ; Fri, 24 May 2019 00:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=yvkknyl3lqtp4YetXf/XSakXiUQ5C/CEUd0zaocdU/w=; b=XtMg64kYQgqxiq53t3xJ+PdKYwSi/Nmj8dPdqJ2VlIzQsx16+U0/wMbJb5wdBgQnYH zmw5c9/wUGyHP7YpEmylESglcT81xj7J8VWoUPz4ShOGyuj0Bkd6X4XQXB5vZRmZg1co AMHy5WJOyj1wJ4d9mZZ+3BPYnpAQanBAiGvTJYESDcP+avHGLYgxFovLuIyUnjMivBwh TlowvIel94eh+KhjqV248twUw4e2QbKG7eZJczBvZNYYFaB7h5JHBvIOQX/b8QDMqIkf msiUx56Kdw9diPQ9KPNgClMNxSggC6SCQAFV7uswcwjPmJKt5piTB7o6a1uvXVnNI4Xq sooA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=yvkknyl3lqtp4YetXf/XSakXiUQ5C/CEUd0zaocdU/w=; b=BcXAhopzbJNe3RbE4doNtfQp9HXdWf37aqlMOqspOKe98TzeFgngt3QhGRhXID9B3x ueUhEQ39ZcpKuRJzRZxtdUbt9vR3G47HVaOUhtGF2/uLCNwJzmJlpgadFVYui/wsTaVf YNbmbBrV3jBT629PcD9M/N82QheNDjRxlbW8pfZ05jO6PfISw916fe+6ckYZxpauRdRn nku9ht/iLmlp8HxdRll4fUAvKmNkbXv1wkXcG7onqKpGWdWZqtfpYfi9YFqiW52orFf0 j7TDGVFq6QKo+ccg9GOEmyOHkZHvqw7/H43kKKm4QC/Xca6IDfVxKZyCghqISq5JzHWu Q6Bw== X-Gm-Message-State: APjAAAVVkKgCpt9Kqhn4jUi7VxoJL22lHBebqNPcXaBYRMMws8lYRryQ kxBZ+mB/kGR/fk4PUzKwXPh/qQIeDVw= X-Google-Smtp-Source: APXvYqyXanyGtoTX9cvFZ143QRQX2stCrvtszLuXlf+dHZdxMkm8hCQSfl/SI5GOO7D2jrBuB8j44w== X-Received: by 2002:a1c:f319:: with SMTP id q25mr1077807wmq.129.1558684053350; Fri, 24 May 2019 00:47:33 -0700 (PDT) Received: from localhost.localdomain (81-64-226-67.rev.numericable.fr. [81.64.226.67]) by smtp.gmail.com with ESMTPSA id d9sm1701328wro.26.2019.05.24.00.47.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 May 2019 00:47:32 -0700 (PDT) From: Antonin Gouzer To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 May 2019 09:46:50 +0200 Message-Id: <20190524074650.2171-1-antonin.gouzer@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190511195914.9833-1-antonin.gouzer@gmail.com> References: <20190511195914.9833-1-antonin.gouzer@gmail.com> Subject: [FFmpeg-devel] [FFMPEG DEVEL] [PATCH v6] fftools/ffprobe: Add S12M Timecode output as side data (such as SEI TC) 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" --- Add S12M Timecode output with the show_frame option Multiple timecodes (3) for one frame support Control side date Size to 16 Correct ffrpobe.xsd to allow multiple timecodes in side_data element --- doc/ffprobe.xsd | 8 ++++++++ fftools/ffprobe.c | 14 +++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index 3e58da0f46..818e54c2c5 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -147,11 +147,19 @@ + + + + + + + + diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index dea489d02e..6e290d5d88 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -165,6 +165,7 @@ typedef enum { SECTION_ID_FRAME_TAGS, SECTION_ID_FRAME_SIDE_DATA_LIST, SECTION_ID_FRAME_SIDE_DATA, + SECTION_ID_FRAME_SIDE_DATA_TIMECODE, SECTION_ID_FRAME_LOG, SECTION_ID_FRAME_LOGS, SECTION_ID_LIBRARY_VERSION, @@ -209,7 +210,8 @@ static struct section sections[] = { [SECTION_ID_FRAME] = { SECTION_ID_FRAME, "frame", 0, { SECTION_ID_FRAME_TAGS, SECTION_ID_FRAME_SIDE_DATA_LIST, SECTION_ID_FRAME_LOGS, -1 } }, [SECTION_ID_FRAME_TAGS] = { SECTION_ID_FRAME_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "frame_tags" }, [SECTION_ID_FRAME_SIDE_DATA_LIST] ={ SECTION_ID_FRAME_SIDE_DATA_LIST, "side_data_list", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA, -1 }, .element_name = "side_data", .unique_name = "frame_side_data_list" }, - [SECTION_ID_FRAME_SIDE_DATA] = { SECTION_ID_FRAME_SIDE_DATA, "side_data", 0, { -1 } }, + [SECTION_ID_FRAME_SIDE_DATA] = { SECTION_ID_FRAME_SIDE_DATA, "side_data", 0, { SECTION_ID_FRAME_SIDE_DATA_TIMECODE, -1 } }, + [SECTION_ID_FRAME_SIDE_DATA_TIMECODE] = { SECTION_ID_FRAME_SIDE_DATA_TIMECODE, "timecode", 0, { -1 } }, [SECTION_ID_FRAME_LOGS] = { SECTION_ID_FRAME_LOGS, "logs", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_LOG, -1 } }, [SECTION_ID_FRAME_LOG] = { SECTION_ID_FRAME_LOG, "log", 0, { -1 }, }, [SECTION_ID_LIBRARY_VERSIONS] = { SECTION_ID_LIBRARY_VERSIONS, "library_versions", SECTION_FLAG_IS_ARRAY, { SECTION_ID_LIBRARY_VERSION, -1 } }, @@ -2199,6 +2201,16 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, char tcbuf[AV_TIMECODE_STR_SIZE]; av_timecode_make_mpeg_tc_string(tcbuf, *(int64_t *)(sd->data)); print_str("timecode", tcbuf); + } else if (sd->type == AV_FRAME_DATA_S12M_TIMECODE && sd->size == 16) { + uint32_t *tc = (uint32_t*)sd->data; + int m = FFMIN(tc[0],3); + for (int j = 1; j <= m ; j++) { + char tcbuf[AV_TIMECODE_STR_SIZE]; + av_timecode_make_smpte_tc_string(tcbuf, tc[j], 0); + writer_print_section_header(w, SECTION_ID_FRAME_SIDE_DATA_TIMECODE); + print_str("value", tcbuf); + writer_print_section_footer(w); + } } else if (sd->type == AV_FRAME_DATA_MASTERING_DISPLAY_METADATA) { AVMasteringDisplayMetadata *metadata = (AVMasteringDisplayMetadata *)sd->data;