From patchwork Thu Jul 2 14:33:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20775 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 9CFC4446D5B for ; Thu, 2 Jul 2020 17:33:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 876BD68AA64; Thu, 2 Jul 2020 17:33:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4DD868AA21 for ; Thu, 2 Jul 2020 17:33:51 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id d4so13556767pgk.4 for ; Thu, 02 Jul 2020 07:33:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=NTQF9vWNpzP7GmuNhb/4aHEhcvzToIityRpjsSHPgzQ=; b=h2W0e9oR42bU3M+WibDo3B1qNL8ED/kZBavJyyernsF7+G5FeExPu+QWjiul1kNZH/ w/Z68zIboO8IwjBYn99MntXon4WCKYjMYIb3nz+wy8PkoWl6Y5cvBseSSWicnAAx+7zk aD2mD3aKgOy0jbbZJwiBRKCZcYTKiUCc0Q63OaMnnkg6M/BiJskAfqipLLhLGjf0eJ9k 1Z4zZswRxxSkan1T03HfEJmXSLI/VTacOdvTf0GWH5TUZaGL/xSIRGTtw1r/eii94Nbg OMih51cHSs4JAFUOdSiMoMIVJOnVDFxEXx/Y/SYdUgp0xd4MOQuHG/eqx+GC8Pm3Ns/E PKRw== 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=NTQF9vWNpzP7GmuNhb/4aHEhcvzToIityRpjsSHPgzQ=; b=XGsHb4dfIVMc/7e9wr4QZixPy3627v4BfmCdJ3bZaqdJVSe9lXCyZEqzSi1MoKM4/H wGO7jjFZtvUL0QtSC6G57/RO3QPSwGEVPazAAf8Lo+rUULgAeAvZb1n2tT0tMrG9mz+e Q8xl3F4f03ibpBQgclpMyYLFzFXScgqVRm11inTwiqYRklez60BGxeO9rXTidmwhS5NX ne0WNAmYt0EeOdfay6O4dNYO/hC0xbceMD+Y490D/uSAAog8gJtYdEOwaljyPqy/uSZS S5zMC/8eEwOl/ARa0U0GOR3YIgOH0TauQN4mdAR94dzqnl4mCNJJOMe/l5CrWR+kpiMs KjrA== X-Gm-Message-State: AOAM532zk+hfP9ONhwDraFpPLgQcxjzDH92e0P4Arx9BVE7JW0CO4OFH BgNkoTQVUMVAtVjME6M6aEJYrWCn X-Google-Smtp-Source: ABdhPJynRvK2Qj8cBtEDXaWQ9kxsesmANFrpAD/vZ52YI9RZExnI8d3wVQueNwsUK4e+OC/v+stI2g== X-Received: by 2002:a62:7c97:: with SMTP id x145mr29093303pfc.80.1593700429718; Thu, 02 Jul 2020 07:33:49 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id t188sm9409114pfc.198.2020.07.02.07.33.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2020 07:33:49 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jul 2020 22:33:24 +0800 Message-Id: <1593700407-32390-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/hevcdec: add timecode metadata 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/hevcdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index e363e68..3691814 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2820,6 +2820,7 @@ static int set_side_data(HEVCContext *s) if (s->sei.timecode.present) { uint32_t *tc_sd; + char tcbuf[AV_TIMECODE_STR_SIZE]; AVFrameSideData *tcside = av_frame_new_side_data(out, AV_FRAME_DATA_S12M_TIMECODE, sizeof(uint32_t) * 4); if (!tcside) @@ -2836,6 +2837,8 @@ static int set_side_data(HEVCContext *s) int ff = s->sei.timecode.n_frames[i]; tc_sd[i + 1] = av_timecode_get_smpte(s->avctx->framerate, drop, hh, mm, ss, ff); + av_timecode_make_smpte_tc_string(tcbuf, tc_sd[i + 1], 0); + av_dict_set(&out->metadata, "timecode", tcbuf, 0); } s->sei.timecode.num_clock_ts = 0; From patchwork Thu Jul 2 14:33:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20776 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 9025F44B851 for ; Thu, 2 Jul 2020 17:34:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7755268AA6E; Thu, 2 Jul 2020 17:34:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 993596808A9 for ; Thu, 2 Jul 2020 17:33:57 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id a14so8049282pfi.2 for ; Thu, 02 Jul 2020 07:33:57 -0700 (PDT) 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; bh=tBPaHCZQzw1x/xlbdyqt4RXGgic5bo2OXlANZeX/bTw=; b=Z/sew147nYKo523YXbXbLDhKFsUVnbThLGaQta//BCllyIk8QdzvA6HcOp3UbdgHgC n/yxy+bU8k8jm7WsKF5LCkcW1R7p45NUgXLv4IRFJNhnT9YhKdDk3aQDzyvnkrXog8x7 TuveQfWL1UU2+k34aqZ7rLP1TwZtLVtqzbirA4fXTA2xHNiv7Sz/X3Zw1JF7k2pMVgSA CEPsvSfADwjO5TBncXQfLiM21Pt0h1orBwwOD9x3paVmqk3uLKyO3TGRI4Z+ueEcQ7zS a4fI/oOjXp9fMj3LU7ttYkRg7etrYILT7ibXCAbkX/sOzT48FrxlLet9lafMoUqUlkC6 gw2A== 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; bh=tBPaHCZQzw1x/xlbdyqt4RXGgic5bo2OXlANZeX/bTw=; b=kxx/uFD6X+DWYP5S5II7iVOpuYCNdJ71wYRQnZE+uxLlCN5B9RDWzZyTHFM8AovtQo vpmH52sDPUxPLcjTWUT7u6UyhofCAFv3j/K7j4+DQmEKp3acr9NCrpAE+09jOW2wnMTm rxm3gaHbVvDZt15x/b+85623pISbz7IJNHYr69z/6wfpDjJMJxSwuwcCS6ynVojoNTi0 7QxkaCyhh5O9yKRkWyBwxWkN0OLocKWVdAed2CmuDH8qAT/qR/rPkY9HMXPJMxVvmIZ+ L2FLCI6yxIBYHIMUI75fjaxCJo1TcRkNWVexifxn+mEv6NVL09bERd+joCIJlpTBNp17 z3Aw== X-Gm-Message-State: AOAM531OUnT5d1g3wOBUibhyd6SBVu+ZD0Vfh+I+SD+Qvde42V9tO8Fb Q8R97EzG/d8RdbE69Hd2jStAwheE X-Google-Smtp-Source: ABdhPJy+MeWKW1FZyPxMslgmZlSwPjPHxH+xdp5PverQ2dmidiFMeowfOVRe5u8sml4QLR1nz3AijA== X-Received: by 2002:a05:6a00:148c:: with SMTP id v12mr28485763pfu.171.1593700435508; Thu, 02 Jul 2020 07:33:55 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id t188sm9409114pfc.198.2020.07.02.07.33.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2020 07:33:55 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jul 2020 22:33:25 +0800 Message-Id: <1593700407-32390-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593700407-32390-1-git-send-email-lance.lmwang@gmail.com> References: <1593700407-32390-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/h264_slice: replace cur->f with out for better readability 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/h264_slice.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 2a41de2..725390e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1125,9 +1125,10 @@ static int h264_export_frame_props(H264Context *h) { const SPS *sps = h->ps.sps; H264Picture *cur = h->cur_pic_ptr; + AVFrame *out = cur->f; - cur->f->interlaced_frame = 0; - cur->f->repeat_pict = 0; + out->interlaced_frame = 0; + out->repeat_pict = 0; /* Signal interlacing information externally. */ /* Prioritize picture timing SEI information over used @@ -1150,59 +1151,59 @@ static int h264_export_frame_props(H264Context *h) break; case H264_SEI_PIC_STRUCT_TOP_FIELD: case H264_SEI_PIC_STRUCT_BOTTOM_FIELD: - cur->f->interlaced_frame = 1; + out->interlaced_frame = 1; break; case H264_SEI_PIC_STRUCT_TOP_BOTTOM: case H264_SEI_PIC_STRUCT_BOTTOM_TOP: if (FIELD_OR_MBAFF_PICTURE(h)) - cur->f->interlaced_frame = 1; + out->interlaced_frame = 1; else // try to flag soft telecine progressive - cur->f->interlaced_frame = h->prev_interlaced_frame; + out->interlaced_frame = h->prev_interlaced_frame; break; case H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP: case H264_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: /* Signal the possibility of telecined film externally * (pic_struct 5,6). From these hints, let the applications * decide if they apply deinterlacing. */ - cur->f->repeat_pict = 1; + out->repeat_pict = 1; break; case H264_SEI_PIC_STRUCT_FRAME_DOUBLING: - cur->f->repeat_pict = 2; + out->repeat_pict = 2; break; case H264_SEI_PIC_STRUCT_FRAME_TRIPLING: - cur->f->repeat_pict = 4; + out->repeat_pict = 4; break; } if ((pt->ct_type & 3) && pt->pic_struct <= H264_SEI_PIC_STRUCT_BOTTOM_TOP) - cur->f->interlaced_frame = (pt->ct_type & (1 << 1)) != 0; + out->interlaced_frame = (pt->ct_type & (1 << 1)) != 0; } else { /* Derive interlacing flag from used decoding process. */ - cur->f->interlaced_frame = FIELD_OR_MBAFF_PICTURE(h); + out->interlaced_frame = FIELD_OR_MBAFF_PICTURE(h); } - h->prev_interlaced_frame = cur->f->interlaced_frame; + h->prev_interlaced_frame = out->interlaced_frame; if (cur->field_poc[0] != cur->field_poc[1]) { /* Derive top_field_first from field pocs. */ - cur->f->top_field_first = cur->field_poc[0] < cur->field_poc[1]; + out->top_field_first = cur->field_poc[0] < cur->field_poc[1]; } else { if (sps->pic_struct_present_flag && h->sei.picture_timing.present) { /* Use picture timing SEI information. Even if it is a * information of a past frame, better than nothing. */ if (h->sei.picture_timing.pic_struct == H264_SEI_PIC_STRUCT_TOP_BOTTOM || h->sei.picture_timing.pic_struct == H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP) - cur->f->top_field_first = 1; + out->top_field_first = 1; else - cur->f->top_field_first = 0; - } else if (cur->f->interlaced_frame) { + out->top_field_first = 0; + } else if (out->interlaced_frame) { /* Default to top field first when pic_struct_present_flag * is not set but interlaced frame detected */ - cur->f->top_field_first = 1; + out->top_field_first = 1; } else { /* Most likely progressive */ - cur->f->top_field_first = 0; + out->top_field_first = 0; } } @@ -1211,7 +1212,7 @@ static int h264_export_frame_props(H264Context *h) h->sei.frame_packing.content_interpretation_type > 0 && h->sei.frame_packing.content_interpretation_type < 3) { H264SEIFramePacking *fp = &h->sei.frame_packing; - AVStereo3D *stereo = av_stereo3d_create_side_data(cur->f); + AVStereo3D *stereo = av_stereo3d_create_side_data(out); if (stereo) { switch (fp->arrangement_type) { case H264_SEI_FPA_TYPE_CHECKERBOARD: @@ -1258,7 +1259,7 @@ static int h264_export_frame_props(H264Context *h) h->sei.display_orientation.vflip)) { H264SEIDisplayOrientation *o = &h->sei.display_orientation; double angle = o->anticlockwise_rotation * 360 / (double) (1 << 16); - AVFrameSideData *rotation = av_frame_new_side_data(cur->f, + AVFrameSideData *rotation = av_frame_new_side_data(out, AV_FRAME_DATA_DISPLAYMATRIX, sizeof(int32_t) * 9); if (rotation) { @@ -1269,7 +1270,7 @@ static int h264_export_frame_props(H264Context *h) } if (h->sei.afd.present) { - AVFrameSideData *sd = av_frame_new_side_data(cur->f, AV_FRAME_DATA_AFD, + AVFrameSideData *sd = av_frame_new_side_data(out, AV_FRAME_DATA_AFD, sizeof(uint8_t)); if (sd) { @@ -1281,7 +1282,7 @@ static int h264_export_frame_props(H264Context *h) if (h->sei.a53_caption.buf_ref) { H264SEIA53Caption *a53 = &h->sei.a53_caption; - AVFrameSideData *sd = av_frame_new_side_data_from_buf(cur->f, AV_FRAME_DATA_A53_CC, a53->buf_ref); + AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_A53_CC, a53->buf_ref); if (!sd) av_buffer_unref(&a53->buf_ref); a53->buf_ref = NULL; @@ -1293,7 +1294,7 @@ static int h264_export_frame_props(H264Context *h) H264SEIUnregistered *unreg = &h->sei.unregistered; if (unreg->buf_ref[i]) { - AVFrameSideData *sd = av_frame_new_side_data_from_buf(cur->f, + AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_SEI_UNREGISTERED, unreg->buf_ref[i]); if (!sd) @@ -1306,7 +1307,7 @@ static int h264_export_frame_props(H264Context *h) if (h->sei.picture_timing.timecode_cnt > 0) { uint32_t *tc_sd; - AVFrameSideData *tcside = av_frame_new_side_data(cur->f, + AVFrameSideData *tcside = av_frame_new_side_data(out, AV_FRAME_DATA_S12M_TIMECODE, sizeof(uint32_t)*4); if (!tcside) From patchwork Thu Jul 2 14:33:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20778 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 0F8BE4493A2 for ; Thu, 2 Jul 2020 17:56:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D033D6882E8; Thu, 2 Jul 2020 17:56:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15A426880DC for ; Thu, 2 Jul 2020 17:55:56 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id p3so13585621pgh.3 for ; Thu, 02 Jul 2020 07:55:55 -0700 (PDT) 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; bh=i1vfTpoljZ25nvN/hr40Tznj/L3AbQAkaPjf8gAX2VI=; b=cWgzxihHcierOh6A/kcXxEMP0HYtuq1Z1XDvXFud7TQzawCXYWhS2TU0GM8zoC79Jn sPRG4BFttYc53dIDSxA5OLYf371zJm6hue2WuN6FSdOXzD1cnJMjibcJs6/0VkHAf+f7 z4goB0n6QNUgc3XVoWIdg+T5CaOQUdjf74g4P6smRQlRAmzw1rQt066ROmNP681aDof7 swFNfWtnC0rAgl6Q3PWVaOC5jBp/9eRsu7kPVA4wQj3pmWdVG4nAloFUyFMEXV0xoCLN y5Hp9Te9fNoMeH8l7rEsle7gRfpApZdh+7tc04yg0sl0zPzv03sMhiCVia/G/Y0LI3EL nrPA== 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; bh=i1vfTpoljZ25nvN/hr40Tznj/L3AbQAkaPjf8gAX2VI=; b=UvegjWXfpkCLjvoKwGDoYoQBMRktCg1nvuK0v/C/8FhN2YFl28yA5/vRoGA3ug0tAZ CjJzP9oArXd8A5fdgieFv6cQBrI4t3ml+6zwhmXWJyXd9ynq8ocvdohOsqcYbLOBzP+n pnL9iWOeSg8GoSQ/mhk52dqLGFewPTwHQKWsu9JOE4euUfxm3pV3+rljgiSOFV32pHOS Wm0ltwLu5xi5pM7Nm3ueSRnFeA1ZabcsdmJdYrP/1nK6/xGvXDGjy8hs6+wbMXynCuiP KuRf40xShBOIM5xM0qmP1Y9sNA7n4YpNE2pmdc7gcX8/5isKU/fIqYwNxOSygzxZenC2 kdMg== X-Gm-Message-State: AOAM533UEKLgc+nCihpEs7TrvEeEubtBKCpIg5AKKLgkONU4sVWN7qfK qSTm3hbwlKNXGT9DCPskE9UzY6G9 X-Google-Smtp-Source: ABdhPJxJv6uA+bCg5bJcLqX0vosSxPIZDRgw+y5uLDzpA7vUU1JnDKtMpvzFUCqOfngIigPYHRpsBw== X-Received: by 2002:a17:902:b716:: with SMTP id d22mr26628321pls.33.1593700446664; Thu, 02 Jul 2020 07:34:06 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id t188sm9409114pfc.198.2020.07.02.07.34.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2020 07:34:06 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jul 2020 22:33:26 +0800 Message-Id: <1593700407-32390-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593700407-32390-1-git-send-email-lance.lmwang@gmail.com> References: <1593700407-32390-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/h264_slice: add timecode metadata 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Please test with below command: ./ffplay -vf drawtext="fontfile=/Library/Fonts/Arial.ttf:text=\\'%{metadata\\:timecode}\\'" \ ../fate-suite/h264/crew_cif_timecode-2.h264 Signed-off-by: Limin Wang --- libavcodec/h264_slice.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 725390e..c7b2764 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1306,6 +1306,7 @@ static int h264_export_frame_props(H264Context *h) if (h->sei.picture_timing.timecode_cnt > 0) { uint32_t *tc_sd; + char tcbuf[AV_TIMECODE_STR_SIZE]; AVFrameSideData *tcside = av_frame_new_side_data(out, AV_FRAME_DATA_S12M_TIMECODE, @@ -1324,6 +1325,8 @@ static int h264_export_frame_props(H264Context *h) int ff = h->sei.picture_timing.timecode[i].frame; tc_sd[i + 1] = av_timecode_get_smpte(h->avctx->framerate, drop, hh, mm, ss, ff); + av_timecode_make_smpte_tc_string(tcbuf, tc_sd[i + 1], 0); + av_dict_set(&out->metadata, "timecode", tcbuf, 0); } h->sei.picture_timing.timecode_cnt = 0; } From patchwork Thu Jul 2 14:33:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20777 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 67CAA44B851 for ; Thu, 2 Jul 2020 17:34:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4CDA068AA24; Thu, 2 Jul 2020 17:34:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BCB368AE37 for ; Thu, 2 Jul 2020 17:34:11 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id g17so11382058plq.12 for ; Thu, 02 Jul 2020 07:34:11 -0700 (PDT) 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; bh=twS5zW/qPX54MrjQ5xT5elktIUpsxKcVYskFdPQmOd0=; b=YafQNQL5DD8mRCxk2NnB0mrCkOJhpKQItmd8DwZEb53xuuMOERzDLxG/dc02DxIzms ME0hFMn5W9y9L+A02o4Lozj4Wl/iIIPD4uZBzcIHnVk8k1Ks3ihVBiaLLHw1D5JwJa+r m/9vqXmpbuPJEX74e7mVx9Vs+wLAfz1MHvlVRWClNvQOZ8ThxaKtVDqm877c3AFyEHfy mnzxHk/WnUNcrQQ8RBhTbzulI+QwaHvri02quRrfEycQU0McDaXvgMILomf3CGtx0F8v 6G7MpOY2Rz5RxOEx5XbObxQq7AvF+L/Qtztedy+gkUwSFwt4KPeHl4jN5E23o68LERHr bRJg== 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; bh=twS5zW/qPX54MrjQ5xT5elktIUpsxKcVYskFdPQmOd0=; b=BVWSSJGVKLdPZG7WhW9hhhVsFSAenaLP58yMNXYOnp5ZlqJ9uudlbFA641ftYYXksM nPfGGZ+HqeXzeSSdNyelYMYiLWkdt6A+xYi7aUaGkiYaDwoYidP+9yKjvxrRKZvSHF+x diIrt+W5L9j3NVcT1ukvrBQRE+3UUqOVgG66ovZ4XqsbvBqv6b57QSn78jjuL73pWvgE CTe+g/sIREm68j1sEvIW427i3+7ppzBaIMBnyY3KD+FN+c6gc25cYBZPiqtXI1reyX42 7H3n+XW26TD6XTCKH+QF+/BseWxOIpItR55HwT3ZEmhgY3FN00/qwTQh/GWpZnnsJSuj v/IQ== X-Gm-Message-State: AOAM530JwlnIuF0YCM8B5fNFfz+y0sXkjtDb3UDeaUAfd0sEz+Xh8iqO O8i1OkpwRFoi9JmpQfP97sMpFvM3 X-Google-Smtp-Source: ABdhPJzfDvfj2fIP3gXdbsM4OpWRMTe0bf0XseKZmT+mEbN4GGrZI6TTBPlU4RcwgknmLifYJ/HieA== X-Received: by 2002:a17:90a:a887:: with SMTP id h7mr31931367pjq.0.1593700449726; Thu, 02 Jul 2020 07:34:09 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id t188sm9409114pfc.198.2020.07.02.07.34.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2020 07:34:09 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jul 2020 22:33:27 +0800 Message-Id: <1593700407-32390-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593700407-32390-1-git-send-email-lance.lmwang@gmail.com> References: <1593700407-32390-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/mpeg12dec: add timecode metadata 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/mpeg12dec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index e9bdccc..ab47018 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2855,6 +2855,7 @@ static int mpeg_decode_frame(AVCodecContext *avctx, void *data, s2->current_picture_ptr = NULL; if (s2->timecode_frame_start != -1 && *got_output) { + char tcbuf[AV_TIMECODE_STR_SIZE]; AVFrameSideData *tcside = av_frame_new_side_data(picture, AV_FRAME_DATA_GOP_TIMECODE, sizeof(int64_t)); @@ -2862,6 +2863,9 @@ static int mpeg_decode_frame(AVCodecContext *avctx, void *data, return AVERROR(ENOMEM); memcpy(tcside->data, &s2->timecode_frame_start, sizeof(int64_t)); + av_timecode_make_mpeg_tc_string(tcbuf, s2->timecode_frame_start); + av_dict_set(&picture->metadata, "timecode", tcbuf, 0); + s2->timecode_frame_start = -1; } }