From patchwork Wed May 22 21:52:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonin Gouzer X-Patchwork-Id: 13253 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 12870446BB7 for ; Thu, 23 May 2019 00:54:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1E1B6807A5; Thu, 23 May 2019 00:54:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE97C6805B2 for ; Thu, 23 May 2019 00:54:10 +0300 (EEST) Received: by mail-wm1-f42.google.com with SMTP id i3so3693677wml.4 for ; Wed, 22 May 2019 14:54:10 -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=XkEaHtwCwCRCeo9ywggMRGY5nQ9p6zrrjfGgeBLX0cs=; b=WbwjicbkFn92IoLEtKyLIGeSBhPwkDhlWgFdU8DUf1O0LetzdIOFLVG3U+3EQpf0nQ rKehP7x0e6nMfTxhtO2U2R7BWk9vOs88QZNpYCBISVD7RW/uHvenZ/OjXi7Qusk9EVnF 0GzaagyU02f4bfJoPN32Ej2uvvHRVPIQ+6pZqtYJUO2iKOAG8lPGXCgINXnJSibbVrS/ Q+FDnK32BvYZHPp1922oEGMLGMmN1cEjKmfbULqQN93hWD+wYVVgl7hu0fwoGt19VeX8 oNQT5nRHzWu8+JWKeJvLh346SmXomh+/50LE10jSuN//YPpy+a8x8BqvrDirQpX+q2qm 34gg== 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=XkEaHtwCwCRCeo9ywggMRGY5nQ9p6zrrjfGgeBLX0cs=; b=MT9rr8MTwnAOA2M/r+Ea8QCneCo3A1+e6apMznpFrRw2NCMsivhB1rZ8JT7+uTayfB 7AeXgpKt++6aAX7cOOhS9DLcNhvM/yLR13rfjSzY2wo3ff+GCffVuveknGJwxL4lk9Yo GzfbKr6LEoAthZ0PjhY1EEm4InSv4qX6OuZJoO/Iq/apkg/TbZ2zIJY7kQVtIU0jtKTL /8BiD8uD/Qy+hjfXDNFXTfWQu85K1NjwKOUC03aKwtzLJ2CF2YV+OH9mCbawddRjJWoy NkW7ivAh0jYRAFbwK0SGU62JEhdT2BAnhl3M/+WzvNUE9ECJCDIJKqZ3/tVGbVZd2apP zz/Q== X-Gm-Message-State: APjAAAVbOP9skYhsrDmAoSKi0zhhYShVrliMmK9nu3R1s4VxmdGv39xm Hj6zTq8rU75+3aRnnZ404wVTL/Hb3oE= X-Google-Smtp-Source: APXvYqxvdXbrZaoZ2O97J95alU9COetHL9I9RIelhw0p9lrwRYlsLqjNUwes6MM7igvbIYZN5wGbJg== X-Received: by 2002:a1c:8004:: with SMTP id b4mr9223155wmd.79.1558562049999; Wed, 22 May 2019 14:54:09 -0700 (PDT) Received: from localhost.localdomain (81-64-226-67.rev.numericable.fr. [81.64.226.67]) by smtp.gmail.com with ESMTPSA id 20sm8774502wmj.36.2019.05.22.14.54.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 14:54:09 -0700 (PDT) From: Antonin Gouzer To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2019 23:52:17 +0200 Message-Id: <20190522215217.11590-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 v5] 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" --- Change structure to conserve one SEI data=one side data with multiple timecode elements --- fftools/ffprobe.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index dea489d02e..c9c15fc205 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 >= 8) { + 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;