From patchwork Tue Nov 17 21:11:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Foucu X-Patchwork-Id: 23667 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 B0BDA44B7F8 for ; Tue, 17 Nov 2020 23:36:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B1AA68A83C; Tue, 17 Nov 2020 23:36:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79ADC68A0C3 for ; Tue, 17 Nov 2020 23:36:11 +0200 (EET) Received: by mail-pj1-f65.google.com with SMTP id r9so1196064pjl.5 for ; Tue, 17 Nov 2020 13:36:11 -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:mime-version :content-transfer-encoding; bh=OVBgDkPOWZ6qBRMF+6MmqVlw6WHzzQdzGpnGNBrBJA0=; b=X0nD68PtWbzavqbW4bKAeF5bocn+1dxXDkvj6QSnZNX+ltZE+jEuqiAr2HYJz7Vce3 xLf96A7dhy14xZtOhTJkuo4zmdn1SETP74SQFHnV0nBjliW0T23J86L2dv+E4OG+hSRH Jx7/E2/vKY0DafxLudSgnYrSOq0FzGOGIttwJ4TDG1ZByZ7AzxHdaJVfi3S379EfBzVS waK5ZEgtQNzVozqiQbeSf8n/m4F/a8rh5Z5le7jRYJYWgG+H9SGqoKV8wfEW6bJpxBzX KvKiAB3OyNn3/hOYNqlPUd9whk1gReA7fVvJNCvkzus7s0Sqo/zkE3AigBagGf/1LO0M x/+w== 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:mime-version :content-transfer-encoding; bh=OVBgDkPOWZ6qBRMF+6MmqVlw6WHzzQdzGpnGNBrBJA0=; b=r4n01+RhK+7ztB9tQ2rm01nOk8ppKg2S28sCwMMH3ZoULdX+jVXPIOe1ZW2xkR/+a8 z1K/Q0Ap5fjy179KZ9dqbNIPsvgpt91tw3aSlbSGJJnmtvGLhiF7JCZC5u87kqBKY3Pa Ptmx5QV7IO04jlggFjN7ljug1cC0ylKrobIkfE5gFPrKYUiGjUNksHiJeIhRCKX7mSri XB2J93FM4+vg5B8N2H0RvF2TGMn57FeDlEwx0ktUe9NTHdeJK1/tF5TK6wfQs9ffsym3 /pdvtUbYEXeugIOY6I9Rs2EptcDH+LDKNwe+rqv1Mryi/VWIA9Ggf8+JO/MlR5RE0GOx d39g== X-Gm-Message-State: AOAM533DKx7X4UjGAjeFJc11nnTgmugWzLVRsZzksAO5SMfItVqgmoQf eLy6Y7LChjfNrq9lDeH06MMtbe/8huk= X-Google-Smtp-Source: ABdhPJyHGTy0nlVVDekbPtAwQpezPF4XN5WRwfI0Z5en0usISRDv9A7FMXbg92zvr/7HVnlvWUJDSA== X-Received: by 2002:a17:902:bcc2:b029:d8:f4a9:5093 with SMTP id o2-20020a170902bcc2b02900d8f4a95093mr973579pls.83.1605647490393; Tue, 17 Nov 2020 13:11:30 -0800 (PST) Received: from tfoucu.mtv.corp.google.com ([2620:0:1000:4001:a28c:fdff:feed:4b81]) by smtp.gmail.com with ESMTPSA id cv4sm3942842pjb.1.2020.11.17.13.11.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 13:11:29 -0800 (PST) From: Thierry Foucu To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Nov 2020 13:11:26 -0800 Message-Id: <20201117211126.402607-1-tfoucu@gmail.com> X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/mov.c: export vendor id as metadata 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: Thierry Foucu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/mov.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2b90e31170..1f9163d658 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2095,6 +2095,8 @@ static void mov_parse_stsd_video(MOVContext *c, AVIOContext *pb, uint8_t codec_name[32] = { 0 }; int64_t stsd_start; unsigned int len; + int32_t id = 0; + char vendor_id[5]; /* The first 16 bytes of the video sample description are already * read in ff_mov_read_stsd_entries() */ @@ -2102,7 +2104,15 @@ static void mov_parse_stsd_video(MOVContext *c, AVIOContext *pb, avio_rb16(pb); /* version */ avio_rb16(pb); /* revision level */ - avio_rb32(pb); /* vendor */ + id = avio_rb32(pb); /* vendor */ + if (id != 0) { + vendor_id[0] = (id >> 24) & 0xff; + vendor_id[1] = (id >> 16) & 0xff; + vendor_id[2] = (id >> 8) & 0xff; + vendor_id[3] = (id >> 0) & 0xff; + vendor_id[4] = 0; + av_dict_set(&st->metadata, "vendor_id", vendor_id, 0); + } avio_rb32(pb); /* temporal quality */ avio_rb32(pb); /* spatial quality */ @@ -2150,10 +2160,20 @@ static void mov_parse_stsd_audio(MOVContext *c, AVIOContext *pb, { int bits_per_sample, flags; uint16_t version = avio_rb16(pb); + int32_t id = 0; + char vendor_id[5]; AVDictionaryEntry *compatible_brands = av_dict_get(c->fc->metadata, "compatible_brands", NULL, AV_DICT_MATCH_CASE); avio_rb16(pb); /* revision level */ - avio_rb32(pb); /* vendor */ + id = avio_rb32(pb); /* vendor */ + if (id != 0) { + vendor_id[0] = (id >> 24) & 0xff; + vendor_id[1] = (id >> 16) & 0xff; + vendor_id[2] = (id >> 8) & 0xff; + vendor_id[3] = (id >> 0) & 0xff; + vendor_id[4] = 0; + av_dict_set(&st->metadata, "vendor_id", vendor_id, 0); + } st->codecpar->channels = avio_rb16(pb); /* channel count */ st->codecpar->bits_per_coded_sample = avio_rb16(pb); /* sample size */