From patchwork Mon Jun 15 14:27:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20420 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 7AE57449931 for ; Mon, 15 Jun 2020 17:27:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E1DA68B5D8; Mon, 15 Jun 2020 17:27:32 +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 570FC68B4FB for ; Mon, 15 Jun 2020 17:27:26 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id z63so6962885pfb.1 for ; Mon, 15 Jun 2020 07:27:26 -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=jQYetOOLLqEJEHDEySpt/Okut5DPlaHrf5zFcyhjWIJxQ3Cmnwk60HyFoQqPaooUQQ WLpBI2yxIjRqdNGiqi/TpkUx389c56IO1KKsRfiGA2dlEO358pt05YmY9t34p2Go7cmI KVJ7938qdprDvYYmRj07P/yXgpoLIWJ8DoxL2rFjzntEnttjmpYRoNH5SXmbHupn0pND ktA3O063ht9OQfwzzFZKaoixhLV2se/gI91FdADvFAlfqnQtAIwCJNcXMF5DuGmo71Ny 2p6x60BLOJGk1anr0AUsdLgdtMAgapExvB03JogPx1swlF0XmAP5V53445Zbv15VlPN4 8NRQ== 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=C/ynB3CamL9MifgjLExLZgJRG4V4/Ql7veEWJioLV7Vx4TxcPL4flBw7Vj5XkeF2A3 MvuzgeVdRAeh/l0hi0kxeRi6ivvWOwu+ViYz4Ii/gZR+NhUHqtjPiGUSqU5dQlvNhSFF 74NbhlUmPMqBpwrwIK+qs8wtOx21UscvxB9zDTVKDT+xOe9+3n3Ajpm8ojmXyWwku++G VEyr1oCKHIdh04q6xOtNtd+v8gcoc6r/O6JmZgCCtOynjpYRf6Mdp3OXJFAGMI+nIjI2 +n9I+ecD+hJz5fb3IvxGWkCUaGNmHFkvRCLV25nxfnUR2D+jkLZ86hAZ4naCN2eLtqO3 qBgg== X-Gm-Message-State: AOAM531JsuoMfsBG2jzOQqrrthMIvG/CiN58zidYNFOxO9atJBdHHBWK GGf2o+yxB7+h6IiCzdwrcdfHYiHg X-Google-Smtp-Source: ABdhPJzhnDOk1x18p/4dFy6E5Lj2dYYtqzFVpYEVQ1KrMeMjHkq/lHVx3mqDd7+g9LA5czOKDP3VzA== X-Received: by 2002:aa7:9093:: with SMTP id i19mr22738320pfa.152.1592231244280; Mon, 15 Jun 2020 07:27:24 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id u61sm13437547pjb.7.2020.06.15.07.27.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jun 2020 07:27:23 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 22:27:14 +0800 Message-Id: <1592231234-6049-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1592231234-6049-1-git-send-email-lance.lmwang@gmail.com> References: <1592231234-6049-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] 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; }