From patchwork Wed Jun 17 16:07:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20439 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 D81704430C4 for ; Wed, 17 Jun 2020 19:07:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B9F0768B4FA; Wed, 17 Jun 2020 19:07:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E8DD68B393 for ; Wed, 17 Jun 2020 19:07:22 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id d66so1349659pfd.6 for ; Wed, 17 Jun 2020 09:07:22 -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=T8JZKVWzRakP5nfC6PNqfo08HorKUHaX2wCeEg4S4nE=; b=gnZEGm1OFM5qDSYJOotbta/1GqZYt89W5lqKQyJAtmmPuITFyvcTUTabKq064CCdGb 1/T6S3NLXedRpzL14VxlRpOunNQIMFdq8BKVK066sa56Nv2Ppg/K1hNRDVGlg5X2E12U lWCwlYsvbQGrHzaghY+y5FOL5MZaoTl6bz7jNwNZQ9skitvrW6V+ezZ4V/XtzOcx6f6G SgbIZyJRPbNtCygsnTst2SuvUDmN+XzLHEZGEVWd+1xhIU/VX7c4Rm9tJBheA5wxp/4D WhDRlWPj3CU0S87KAM0hVf5O9Qc6hHQx2KgR4QZM/6S53sapb4bNcm4HVEA+FflKcZLn j+mg== 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=T8JZKVWzRakP5nfC6PNqfo08HorKUHaX2wCeEg4S4nE=; b=DnRRdZYnyP8NkwfENaXSBlnSP/k79myTQ1hPXITcEKxFUpBlr2CY7bO4ZmKpLsETEi LyvfK3jiHhni+xJeQ+RlCtmnOIy5/PVH+lh+aHzRjB2MktrH+q1B0fQIIFbEuFQTL6DU ucYEiWR2s3KoeKyOlr4pHqJhsVy8CKrvyFdv7MRoJ/ipM3dIeeBzD4dgjJJJBXR/DnoE DlIZdHsx4cN5D771ne/GFx++30OJmSgip34OBhr7M2Vota7Z5qiC/XIqni6AxZw1Bzwe FUSxh998z2TFTuIDLPDFO7fSYPsFucYrhzthy7OGwH+0ibU6JTpiBRpNpCpMAZTmXkDR F5XQ== X-Gm-Message-State: AOAM531uo4Xp9clGZ5OYyhyQrgxBPP/1+QTiDSAH7uCRSvDq0YSuEIsD /C/8PWLi6VNykA3jfCubjdmgHU9t X-Google-Smtp-Source: ABdhPJyvm16DTBZhJCSxHwLXZtk0gLP0sivVHn5orDa/4DxYSQ56fnwCPk+/1KrJqaAo2+V51MOGpA== X-Received: by 2002:a63:4407:: with SMTP id r7mr7373736pga.274.1592410040527; Wed, 17 Jun 2020 09:07:20 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id g84sm318178pfb.113.2020.06.17.09.07.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jun 2020 09:07:19 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jun 2020 00:07:08 +0800 Message-Id: <1592410030-6553-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1592410030-6553-1-git-send-email-lance.lmwang@gmail.com> References: <1592231234-6049-1-git-send-email-lance.lmwang@gmail.com> <1592410030-6553-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/4] avcodec/hevcdec: create AVFrame side data from HEVC timecodes like H.264 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 | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index c9e28f5..39abbb9 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2808,6 +2808,50 @@ static int set_side_data(HEVCContext *s) } s->sei.unregistered.nb_buf_ref = 0; + if (s->sei.timecode.present) { + uint32_t tc = 0; + uint32_t *tc_sd; + AVFrameSideData *tcside = av_frame_new_side_data(out, AV_FRAME_DATA_S12M_TIMECODE, + sizeof(uint32_t) * 4); + if (!tcside) + return AVERROR(ENOMEM); + + tc_sd = (uint32_t*)tcside->data; + tc_sd[0] = s->sei.timecode.num_clock_ts; + + for (int i = 0; i < tc_sd[0]; i++) { + uint32_t frames; + + /* For SMPTE 12-M timecodes, frame count is a special case if > 30 FPS. + See SMPTE ST 12-1:2014 Sec 12.1 for more info. */ + if (av_cmp_q(s->avctx->framerate, (AVRational) {30, 1}) == 1) { + frames = s->sei.timecode.n_frames[i] / 2; + if (s->sei.timecode.n_frames[i] % 2 == 1) { + if (av_cmp_q(s->avctx->framerate, (AVRational) {50, 1}) == 0) + tc |= (1 << 7); + else + tc |= (1 << 23); + } + } else { + frames = s->sei.timecode.n_frames[i]; + } + + tc |= s->sei.timecode.cnt_dropped_flag[i] << 30; + tc |= (frames / 10) << 28; + tc |= (frames % 10) << 24; + tc |= (s->sei.timecode.seconds_value[i] / 10) << 20; + tc |= (s->sei.timecode.seconds_value[i] % 10) << 16; + tc |= (s->sei.timecode.minutes_value[i] / 10) << 12; + tc |= (s->sei.timecode.minutes_value[i] % 10) << 8; + tc |= (s->sei.timecode.hours_value[i] / 10) << 4; + tc |= (s->sei.timecode.hours_value[i] % 10); + + tc_sd[i + 1] = tc; + } + + s->sei.timecode.num_clock_ts = 0; + } + return 0; }