From patchwork Fri Dec 20 01:17:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16890 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 047E444894B for ; Fri, 20 Dec 2019 03:17:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D62EB689FF0; Fri, 20 Dec 2019 03:17:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81B9C687F16 for ; Fri, 20 Dec 2019 03:17:31 +0200 (EET) Received: by mail-pg1-f196.google.com with SMTP id k3so4088085pgc.3 for ; Thu, 19 Dec 2019 17:17:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=cGnTUBJtu/UcWYCtzAalmmGot1W5DnMBreWquXKS/Gk=; b=BlHBLmLeaJwWSYK73F2n3z6J/hk7sOKLg+/0vwal397LX6BahrSTSXQx7bUt4j1yWZ +6ouu0nBouOfcP33CZSB7W6vJuSoTpsD21Beh3V7msomSDM9AmccnUUAeycmEZr+wdoR ANLpHWY3nnECb2FSVFIdeD3X1kJY3yRjo3vM3bVhGT7o4cPcfbQxLcuQYmQ6KD9O26EK kTYqeAfaBDUi9cIcBnc0Y+IU8Khhvm+mY2FiIQBjblVhACliPOUiy9eTuCHIrD1nx5Z5 3sbrck4sk53fbLivsbB76aK/F+FiThCKeCLLqBXZrShSZBJEAw4u5p03ylUpUCWq0QdQ Zv/g== 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=cGnTUBJtu/UcWYCtzAalmmGot1W5DnMBreWquXKS/Gk=; b=nCMs8Pk5ymOOXjJH7yc0PurFoHUkaLqfmKOKlJE9c1ceeQlbpKn3e1IiTxUeRQr0dS y0sRC1HCaxE9Jk8sewVUnHtefB6Pw2zqcs9OAx5WGgTKjv1Kdy2Mqt8vGRFNboztBuh8 z/1C96snnPZZaXf+p2SUf2UpZfkU7fzx7egIlIm4or7C1bbZDs5niNhp5oLDgn6t9hXg NPQklopdtvuREJucJtrcK8ke6VMVVeNKlw89jE//ePh1Snbe8CrKMKXg1z35exNhLTfc hR+xKlCcN39Z98u94mxZ/kXiD0PzOAME7N63hPidXgyjb4Bjtsi0r5r4GVUslKydNLbE kOww== X-Gm-Message-State: APjAAAWDS7pnY+i+hMIG8XrNxLbz1vzZUQPY76QTrGY5K+PoESZUhTm3 A2q8SboP4GqzT4fPkmCvfVyLQskH X-Google-Smtp-Source: APXvYqwBv+guhEV+eDjFdZOjaGnKE12G822I5pT1WZLvyLTwssWywM+3rISj5CruGdntBIZPM+w1yg== X-Received: by 2002:a65:6216:: with SMTP id d22mr12069521pgv.437.1576804649163; Thu, 19 Dec 2019 17:17:29 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id u23sm10087167pfm.29.2019.12.19.17.17.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Dec 2019 17:17:28 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Dec 2019 09:17:21 +0800 Message-Id: <20191220011721.9795-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1] avcodec/hevc_sei: switch to AVBufferRef buffer for a53 caption 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 --- Please apply after the following patch: https://patchwork.ffmpeg.org/patch/16878/ libavcodec/hevc_sei.c | 15 +++++++-------- libavcodec/hevc_sei.h | 3 +-- libavcodec/hevcdec.c | 16 ++++++++-------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 7f738a049c..b87871e52a 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -177,7 +177,8 @@ static int decode_registered_user_data_closed_caption(HEVCSEIA53Caption *s, GetB size -= 2; if (cc_count && size >= cc_count * 3) { - const uint64_t new_size = (s->a53_caption_size + cc_count + int old_size = s->buf_ref ? s->buf_ref->size : 0; + const uint64_t new_size = (old_size + cc_count * UINT64_C(3)); int i, ret; @@ -185,14 +186,14 @@ static int decode_registered_user_data_closed_caption(HEVCSEIA53Caption *s, GetB return AVERROR(EINVAL); /* Allow merging of the cc data from two fields. */ - ret = av_reallocp(&s->a53_caption, new_size); + ret = av_buffer_realloc(&s->buf_ref, new_size); if (ret < 0) return ret; for (i = 0; i < cc_count; i++) { - s->a53_caption[s->a53_caption_size++] = get_bits(gb, 8); - s->a53_caption[s->a53_caption_size++] = get_bits(gb, 8); - s->a53_caption[s->a53_caption_size++] = get_bits(gb, 8); + s->buf_ref->data[old_size++] = get_bits(gb, 8); + s->buf_ref->data[old_size++] = get_bits(gb, 8); + s->buf_ref->data[old_size++] = get_bits(gb, 8); } skip_bits(gb, 8); // marker_bits } @@ -392,9 +393,7 @@ int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEI *s, void ff_hevc_reset_sei(HEVCSEI *s) { - s->a53_caption.a53_caption_size = 0; - av_freep(&s->a53_caption.a53_caption); - + av_buffer_unref(&s->a53_caption.buf_ref); for (int i = 0; i < s->unregistered.nb_buf_ref; i++) av_buffer_unref(&s->unregistered.buf_ref[i]); s->unregistered.nb_buf_ref = 0; diff --git a/libavcodec/hevc_sei.h b/libavcodec/hevc_sei.h index 2464117d47..a8a2ab7dc6 100644 --- a/libavcodec/hevc_sei.h +++ b/libavcodec/hevc_sei.h @@ -83,8 +83,7 @@ typedef struct HEVCSEIPictureTiming { } HEVCSEIPictureTiming; typedef struct HEVCSEIA53Caption { - int a53_caption_size; - uint8_t *a53_caption; + AVBufferRef *buf_ref; } HEVCSEIA53Caption; typedef struct HEVCSEIUnregistered { diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index a4981e983c..451a58fb7f 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2778,14 +2778,14 @@ static int set_side_data(HEVCContext *s) metadata->MaxCLL, metadata->MaxFALL); } - if (s->sei.a53_caption.a53_caption) { - AVFrameSideData* sd = av_frame_new_side_data(out, - AV_FRAME_DATA_A53_CC, - s->sei.a53_caption.a53_caption_size); - if (sd) - memcpy(sd->data, s->sei.a53_caption.a53_caption, s->sei.a53_caption.a53_caption_size); - av_freep(&s->sei.a53_caption.a53_caption); - s->sei.a53_caption.a53_caption_size = 0; + if (s->sei.a53_caption.buf_ref) { + HEVCSEIA53Caption *a53 = &s->sei.a53_caption; + + 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; + s->avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; }