From patchwork Fri May 22 01:24:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19800 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 A1CD944BA89 for ; Fri, 22 May 2020 04:25:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8AF6868AD8B; Fri, 22 May 2020 04:25:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBCB268AAA0 for ; Fri, 22 May 2020 04:25:01 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id g12so7359816wrw.1 for ; Thu, 21 May 2020 18:25:01 -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 :mime-version:content-transfer-encoding; bh=oZeXpB5tLCgrqQpwrAY9LJnwsZXB+xL7gXblF7PW1po=; b=sScWDZWoUxq1mW7yEeYuy3ztFG3cXVS0CThqVN8mlxaGoIHy5aErFeSSpHAVpb/J/A corQM1sLQ428kN5xVrCiu1wgGRqHqH6CYpLHzpt1jrUZi3OdwqdhQpgNz1yAg7BX9AxB 1+fos+y2Ij/HfznOqPkRj2br8Fep71SoCXLbEbvyyJnZkQGVmH8RgIz/hh7yNfjBCz+1 cAsyD4p6xuhceXEZTZgVN5m+4P8LazKsPP5UNEr6BjmtNNhg5FMUo1efsLSrxmjbtsjA 8pCswGB+5ohpri646Im89yApRqBITUkNTbrLNh+Sd3akr+R3vXV4sdgJZM3zliGgdyTd h93A== 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:mime-version:content-transfer-encoding; bh=oZeXpB5tLCgrqQpwrAY9LJnwsZXB+xL7gXblF7PW1po=; b=kbSVb/5kwwGl63nAsNuRO1EThcF6TOvMqxYLU8nn1rwXk1PM0Y7sStPvgYeQt7VY71 zPptzh7GY/twQ+EalITgz9tiKa22n985ibwiJrRlPzzb6r67L9sdZxCXAILptk2UZGjW dIAuF5aVtmB/do737EqUbwqB2xulhVLK6tI3k+gKtrWe6yG7cB3mH+XeS3N57lPVxNI1 YXlA2aycsh3bqRyhrWeA9jh7K0VPnnFILHuWlEjjHi+KvLjUuPOpTYdbJT/wMUTGhjOs T/gUxqt+/qMhwy4oiWTGfuA7N7v20IVSA1MC/hi+YFGVEmhZkZZ9D32AzVPPkZSJyCOS gqKg== X-Gm-Message-State: AOAM533MRDuMMXnB61wrtul1k8onZVMdCff8SO2iEkgGcqncIWNdt6pW 5XPp9XylVxzbo8kijUrfYx1kiSrK X-Google-Smtp-Source: ABdhPJw/yEbLes7LX7nqEp1UvuM6x4eLKKn8Dc2qqwkqK4jaYc7dAFB7DS54x2IEn46SqH09KRMaoA== X-Received: by 2002:a5d:66c5:: with SMTP id k5mr1063109wrw.17.1590110701047; Thu, 21 May 2020 18:25:01 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id l19sm8548498wmj.14.2020.05.21.18.25.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2020 18:25:00 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 May 2020 03:24:30 +0200 Message-Id: <20200522012431.29918-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522012431.29918-1-andreas.rheinhardt@gmail.com> References: <20200522012431.29918-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/matroskaenc: Remove pointless casts 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" by using a const void * pointer as an intermediate. Signed-off-by: Andreas Rheinhardt --- Why is the side-data API (both the packet as well as the stream one) actually based around uint8_t * and not pointers to void despite side-data being mostly structures and not just buffers? libavformat/matroskaenc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f5968c17b4..9ad590cb93 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -836,7 +836,7 @@ static void mkv_write_video_color(AVIOContext *pb, const AVStream *st, uint8_t colour[(2 + 1 + 8) * 18 + (2 + 1) + 1]; AVIOContext buf, *dyn_cp = &buf; int colorinfo_size; - const uint8_t *side_data; + const void *side_data; ffio_init_context(dyn_cp, colour, sizeof(colour), 1, NULL, NULL, NULL, NULL); @@ -869,8 +869,7 @@ static void mkv_write_video_color(AVIOContext *pb, const AVStream *st, side_data = av_stream_get_side_data(st, AV_PKT_DATA_CONTENT_LIGHT_LEVEL, NULL); if (side_data) { - const AVContentLightMetadata *metadata = - (const AVContentLightMetadata*)side_data; + const AVContentLightMetadata *metadata = side_data; put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORMAXCLL, metadata->MaxCLL); put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORMAXFALL, metadata->MaxFALL); } @@ -880,8 +879,7 @@ static void mkv_write_video_color(AVIOContext *pb, const AVStream *st, if (side_data) { ebml_master meta_element = start_ebml_master( dyn_cp, MATROSKA_ID_VIDEOCOLORMASTERINGMETA, 10 * (2 + 1 + 8)); - const AVMasteringDisplayMetadata *metadata = - (const AVMasteringDisplayMetadata*)side_data; + const AVMasteringDisplayMetadata *metadata = side_data; if (metadata->has_primaries) { put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOCOLOR_RX, av_q2d(metadata->display_primaries[0][0]));