From patchwork Sat Jun 16 10:49:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 9420 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1776189jad; Sat, 16 Jun 2018 03:49:53 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJxt1InE5ydtNqaZaEDh4ZRmlTFzdfR8N3/s2T2IKCuEn4QOM54qXRNsRfpOJtPBis1CxkJ X-Received: by 2002:a1c:e146:: with SMTP id y67-v6mr3711424wmg.17.1529146193224; Sat, 16 Jun 2018 03:49:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529146193; cv=none; d=google.com; s=arc-20160816; b=JNFUf+uCuqdNdGJvI2S1/3gGm096TByxrCp3y+Gk9f/sn336n3l6os/2devPBjTaEk 97NGJ/jvKt9HaP9b+gEJpPE2VBMzztB391IW5pEbnhGzcvQTeOkzsTn1o8CPw8F/QgJh KZyorKZJLNe9eQlDaC+B4Kkp0tYI2yk6oRAYnOVehepjSF8y1qazezmsvDUQNxAAQBdG 0MBvLu39Thzq+VFcf9DyaPaJ6sOFUGguBfFslIEF7E7Hw2jC5VvhpOAFlOm1amGKQda9 61WOCDknjyorDtS86Cwhf9os/yMGI7a1t/tEUJrFq39ihwzGk0lQlfnAMQJNA0Q0UwuR Rc2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=cKvxELkDkWOTcvjQAjn90lCPSBD0t9BJosVNN9ObFJ4=; b=fYVyUHMyfYLFA5OSvpXq2b/nzJqTKL7DnG7JBbBZzAjVt8x7EzTAW9orrmFXEmG3un qhrBp9ZhKJrKMc3uf4y9LogVKcJF15Onx9N67yLywFdNgcGTuF4V6LksbNrTQov3nsDN xEdQj4FEJ/qYswS7uGo6W4Y2sv/wDOlu/EHlxfk8z+qlgK5AqSmfooX/yw2oCT/35WSO pRp1JLaiLk/rHxj0YbER2Gi0okALIwl7A+yaSPekKczVb+3VRIalqzrjS5OVyJQ/pJmt OZHsfXezaygPH2+ihqmYiCZ8jdmFfpCduy83nuGmL3gm1rnCpsh6arGvmr0xECahLJPw MYEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KgxRry0f; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l1-v6si1958978wrp.228.2018.06.16.03.49.52; Sat, 16 Jun 2018 03:49:53 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KgxRry0f; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 04A6B68A2BD; Sat, 16 Jun 2018 13:48:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5B6F689BC6 for ; Sat, 16 Jun 2018 13:48:52 +0300 (EEST) Received: by mail-pg0-f65.google.com with SMTP id w8-v6so2456508pgp.7 for ; Sat, 16 Jun 2018 03:49:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=9i68YU3JTs4vO97Cm6ZCuhciWXdIvyb7Da0ggrfgMMs=; b=KgxRry0fxkgrPb0C9rhU8PdsumrsdRbe4iNKM+mAvCuIwZ1275PkqiS3+NWbCrgRy1 lUO7Im00fp2QIKCWUka+xqK3PZdspC8A+f0+zDUJTgKl+Yhs47FxB6FSMG4zuo1Nhcn0 flTsu2p7lkUV+fM2UXx/NkU1HZHSlOwulSj3pVUTNK2H3ivbusO7Gw/cJz2rfAcRcGY0 ImzyrWBF8xAJsnmHriPwTqnnnmEzNjgxf+axUSVVJocJHSNygr+Hhjy2ZFW7SMUyKhVS uNgJhjr8mor9Y7OGS2YZYxqQNW08T1JCNfMV+JxjSWKc8RgduvXaVBDNv5Yjk2yF9pjN zCog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=9i68YU3JTs4vO97Cm6ZCuhciWXdIvyb7Da0ggrfgMMs=; b=fqcvOSa3Sg3iV3z0dv7SsMnARiomL2/K2O/aFshfiIYOUHy8DkrCS4C4trMNqFAjoY TZ4Zrw5mWoBtMtiIgzTkm2RGZyRfmHbxGEyVigpszXsLVC18N+cVuJJRj/889FPgQsmf 50UFkOqief7zlIsCAMPvlPPU7hks1IQRICSn6lP4vBccOnQ0a+cRAr+sS/5WLTdMj6pT 7Z1yNxgKhEzXU3Kyr6JMw1Z8ZRVS8yAmE0EonSdp6iXrC0+Ykeuc8Omwz73iielW2JJQ 1DaiVjdrqeDBoHLzMsUCz11yIXTUsidyMs8PWXfc6FZknsRGNJU2eLCa+BpxwRHGXOYp iwpQ== X-Gm-Message-State: APt69E3chasRufvtfsYjkRdMjf9b4TcnEowkJHNJgLF8ZIHU26xK6thB W63va8Cdt7BX5aNr3lS+/fPSe5MH X-Received: by 2002:a63:370f:: with SMTP id e15-v6mr4774732pga.192.1529146182170; Sat, 16 Jun 2018 03:49:42 -0700 (PDT) Received: from [192.168.1.225] ([103.206.133.45]) by smtp.gmail.com with ESMTPSA id x24-v6sm18719356pfj.104.2018.06.16.03.49.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Jun 2018 03:49:40 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: Date: Sat, 16 Jun 2018 16:19:35 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] avformat/movenc: read track title from correct key 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Activates functionality added a few years ago. Regards, Gyan From bead9f22630f2b8efc4a3859568cb0fc46102dd3 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Sat, 16 Jun 2018 15:31:51 +0530 Subject: [PATCH] avformat/movenc: read track title from correct key da9cc22d5bd allowed the MOV muxer to relay a custom stream handler name, whether populated from the input stream or user-set. However, the entry key didn't match the key set by the MOV demuxer, so it wasn't effective. Fixed. Due to the change, four FATE refs have to be updated. Verified that the target payload of the tests hasn't changed in terms of CRC. --- libavformat/movenc.c | 2 +- tests/ref/fate/binsub-movtextenc | 2 +- tests/ref/fate/copy-psp | 4 ++-- tests/ref/fate/copy-trac236 | 4 ++-- tests/ref/lavf-fate/mov_qtrle_mace6 | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index db266b7765..3661d24f4f 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2599,7 +2599,7 @@ static int mov_write_hdlr_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra // of the track. So if an alternate handler description is // specified, use it. AVDictionaryEntry *t; - t = av_dict_get(track->st->metadata, "handler", NULL, 0); + t = av_dict_get(track->st->metadata, "handler_name", NULL, 0); if (t && utf8len(t->value)) descr = t->value; } diff --git a/tests/ref/fate/binsub-movtextenc b/tests/ref/fate/binsub-movtextenc index 22ee85a2f8..dacee0931e 100644 --- a/tests/ref/fate/binsub-movtextenc +++ b/tests/ref/fate/binsub-movtextenc @@ -1 +1 @@ -af6a8f38d7c11d9af7823cc44554d2ad +66b25412f7ca699ee525ba162246edb6 diff --git a/tests/ref/fate/copy-psp b/tests/ref/fate/copy-psp index 81eb172549..44ec461265 100644 --- a/tests/ref/fate/copy-psp +++ b/tests/ref/fate/copy-psp @@ -1,5 +1,5 @@ -cada61453a2483ef8ba1fb82c8bbff25 *tests/data/fate/copy-psp.psp -2041433 tests/data/fate/copy-psp.psp +65a177552e03123c9a62ddb942970d05 *tests/data/fate/copy-psp.psp +2041445 tests/data/fate/copy-psp.psp #extradata 0: 51, 0xaf6d1012 #extradata 1: 2, 0x00b200a1 #tb 0: 1/90000 diff --git a/tests/ref/fate/copy-trac236 b/tests/ref/fate/copy-trac236 index c5240ca3d3..6470c05a05 100644 --- a/tests/ref/fate/copy-trac236 +++ b/tests/ref/fate/copy-trac236 @@ -1,5 +1,5 @@ -d6e3d97b522ce881ed29c5da74cc7e63 *tests/data/fate/copy-trac236.mov -630810 tests/data/fate/copy-trac236.mov +8b57d14c14bb4cdaca660d161e08eb8f *tests/data/fate/copy-trac236.mov +630861 tests/data/fate/copy-trac236.mov #tb 0: 100/2997 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/lavf-fate/mov_qtrle_mace6 b/tests/ref/lavf-fate/mov_qtrle_mace6 index f8428aaa49..3afb909574 100644 --- a/tests/ref/lavf-fate/mov_qtrle_mace6 +++ b/tests/ref/lavf-fate/mov_qtrle_mace6 @@ -1,3 +1,3 @@ -dcc9c4c182a5809dee9a9366f4533797 *./tests/data/lavf-fate/lavf.mov -1270387 ./tests/data/lavf-fate/lavf.mov +f9715cc38a3206bcdf105786905255af *./tests/data/lavf-fate/lavf.mov +1270415 ./tests/data/lavf-fate/lavf.mov ./tests/data/lavf-fate/lavf.mov CRC=0x9320cd26