From patchwork Thu May 7 19:19:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19539 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 5DB3A44A52F for ; Thu, 7 May 2020 22:20:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4349268A8E9; Thu, 7 May 2020 22:20:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7AB8B68A450 for ; Thu, 7 May 2020 22:20:05 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id l18so7731811wrn.6 for ; Thu, 07 May 2020 12:20:05 -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=YAjnkeKxkevgjVm+cg0+57BQGOhwwbtzsP/gGvZExHk=; b=EjgEoashUVWPOhUS6HSrfQXsB2rfqsj4v+Zt3fWPcNY21fy3bgCXGcGvVvftRZNtBV Zh4YmTRBtbnFanvFhXEVSrOrzcQyLl196G+CmpjLPwWeBbM7uXOJpgsqws/dj5fsbvhd HpOKz2MRRjn+FWT6NjUkMt4+OiiRWk91AUGHFR1Z9J0GCld3BqnqKa5juvMruNn50vJt EpRYKKNZLHhokSp+WFz9Hqzr/0MhS+kWh5G0iZfdLXK+TIUgyj3idsNQJvY2SUmN49j8 KiwuHu+XnxdR5I2Wz/x+ay280yAgSmm+kAg+lwwwnPyJGHqw/Tqj8ShnmcyDm0XznlGI QqaQ== 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=YAjnkeKxkevgjVm+cg0+57BQGOhwwbtzsP/gGvZExHk=; b=PSa7xP7Q6yisOi+81cWhYHvTk4k5dvU+y1K8z2xzGIWezH5ywavo08UIUelIpjCiEO lkHcMX4/N7A4SYwT0riha40XN/65QirJ6RtRLA2DumbaH97oCAErlmah9n/0/9ZdsNnX wP7PDgJcvYabf2inm8gMcK8mwn8/0voOUK3bEzam3ZEB5drRmaQPPjVVmCBfBdIXEBEC pJeCduVIeAzNrWivnf1qZEg2l+5Do6k4Gc+omNCNdw72N+rAOYiCfqYGXiW9OFhY1J6r iQPIHQgTWAAhopgFaHOeeHzJlfxNGE4TutbOOxHWXjXnFw9s1aNtDqoanFP1QgQ4Jh9b 0W1w== X-Gm-Message-State: AGi0Pua+qr9xpcUng8oq+BQX1DrxESKDtzUpGLk7gq5no2/5RH53Iwn9 2p4yKaghxQBbCJEXCLmo0ULKatIx X-Google-Smtp-Source: APiQypKAtUsh6UvgTqm4Gzz+rcSUXLD+qHFBLrQGKbcvlAIhgMEzE6zwGfpoF7uEVemmsjIiypqcyA== X-Received: by 2002:adf:fe90:: with SMTP id l16mr9511187wrr.222.1588879204727; Thu, 07 May 2020 12:20:04 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id m188sm8928964wme.47.2020.05.07.12.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2020 12:20:04 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 May 2020 21:19:31 +0200 Message-Id: <20200507191937.16691-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200502171700.28991-8-andreas.rheinhardt@gmail.com> References: <20200502171700.28991-8-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/21] avformat/matroskaenc: Use av_stream_get_side_data() instead of loop 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" in mkv_write_stereo_mode(). Also check the size of the AVStereo3D side data. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 158193738e..4bb6a0e0d4 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1029,6 +1029,8 @@ static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb, int ret = 0; const AVDictionaryEntry *tag; MatroskaVideoStereoModeType format = MATROSKA_VIDEO_STEREOMODE_TYPE_NB; + const AVStereo3D *stereo; + int side_data_size = 0; *h_width = 1; *h_height = 1; @@ -1051,12 +1053,9 @@ static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb, } } - // iterate to find the stereo3d side data - for (i = 0; i < st->nb_side_data; i++) { - AVPacketSideData sd = st->side_data[i]; - if (sd.type == AV_PKT_DATA_STEREO3D) { - AVStereo3D *stereo = (AVStereo3D *)sd.data; - + stereo = (const AVStereo3D*)av_stream_get_side_data(st, AV_PKT_DATA_STEREO3D, + &side_data_size); + if (side_data_size >= sizeof(AVStereo3D)) { switch (stereo->type) { case AV_STEREO3D_2D: format = MATROSKA_VIDEO_STEREOMODE_TYPE_MONO; @@ -1096,8 +1095,6 @@ static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb, format++; break; } - break; - } } if (format == MATROSKA_VIDEO_STEREOMODE_TYPE_NB)