164442 2008-06-19 12:04:07 +0000 manage videos just like photos [patch] 2017-08-10 12:14:53 +0000 1 1 2 Applications digikam Metadata-Video 3.0.0 unspecified Linux RESOLVED FIXED NOR wishlist --- 0 olivier.lahaye1 digikam-bugs-null ahuggel caulier.gilles dpac.mittal2 geow812 mail.abu.to marcel.wiesweg matt.muchowski philippe.roubach smit.meh sreedharpalayil http://commits.kde.org/digikam/2434a79b8c16edac245e2a64d982bacf1d94fc64 3.2.0 45 oldest_to_newest 613493 0 olivier.lahaye1 2008-06-19 12:04:07 +0000 Version: 0.10.0 (using KDE 4.0.80) OS: Linux Manage videos like photos. Make video and photo library available to other softwares. Example: in kdenlive, instead of having kdenlive manage its own video library, it could use a digikam plugin. the plugin would allow to chose videos. Digikam would be used to manage the videos. That would centralize media management while simplifying other softwares. 613497 1 caulier.gilles 2008-06-19 12:08:52 +0000 Olivier, I'm not agree to make digiKam has video editing tool. this is not the goal. Video support have been improved in KDE4 port of digiKam, in term of file management. It still metadata management and search tool from video files to improve... Gilles Caulier 644818 2 me 2008-09-08 22:18:06 +0000 *** Bug 170387 has been marked as a duplicate of this bug. *** 676086 3 caulier.gilles 2008-12-05 20:07:27 +0000 Andreas, Since a lots of digital camera provide movies capture, I thinks we need to study metadata support for mpg, avi, and mov files with Exiv2... What do you think about ? Gilles Caulier 678403 4 ahuggel 2008-12-09 13:21:37 +0000 Gilles, If these video formats contain metadata and there is a need to access that, then yes, it is within the scope of Exiv2 to deal with it. Technically, we need to have a unified metadata container before it is practical to introduce new types of metadata. That is one of the major features I plan for 0.19. Andreas 678404 5 caulier.gilles 2008-12-09 13:49:49 +0000 Andreas, I don't think that AVI, MOC, MPG, and other main video format as exif info, but XMP is it: RIFF based files (AVI) : http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/RIFF.html QuickTime (MOV and MPEG4) : http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/QuickTime.html DIVX (ASF) : http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/ASF.html Gilles Caulier 678415 6 ahuggel 2008-12-09 14:32:48 +0000 Gilles, Thanks for the links. Of course as long as the metadata is encoded in one of the already supported metadata formats - Exif, IPTC, XMP - then it's just a matter of writing a new Image class, using the existing parsers. Anyone can do it anytime. Andreas 795354 7 caulier.gilles 2009-07-20 11:18:34 +0000 Andreas, Do you now if somebody work on video format support to Exiv2 ? Gilles Caulier 795380 8 ahuggel 2009-07-20 12:05:04 +0000 Nobody as far as I know. Andreas 795392 9 caulier.gilles 2009-07-20 12:22:02 +0000 Hum... I really need this feature since i buy a new digital camera recorder: http://www.trustedreviews.com/camcorders/review/2009/05/30/Sony-Handycam-HDR-CX105E/p1 Gilles 977479 10 philippe.roubach 2010-06-12 10:43:56 +0000 i agree with Olivier how to say that ? i don't make video editing but more and more for an event i take half photos and half movies (.mov) it' not true movie but very short movie 30 s i called "snap movie" i don't make any differences between the twos i manage photos and movies the same way 977663 11 caulier.gilles 2010-06-12 16:47:42 +0000 We have planed to talk about in coding sprint : http://techbase.kde.org/Projects/Digikam/CodingSprint2010#Common_Topics_for_Discussion_and_Coding Gilles Caulier 1198766 12 caulier.gilles 2011-12-13 09:25:04 +0000 *** Bug 227259 has been marked as a duplicate of this bug. *** 1200834 13 caulier.gilles 2011-12-17 09:34:48 +0000 Andreas, Some news about video support in Exiv2 ? Do you have some found contributors about ? Gilles Caulier 1237306 14 dpac.mittal2 2012-03-16 22:34:27 +0000 Is it necessary to modify Exiv2. Why don't we just use one of the several available XMP libraries for the file formats that Exiv2 don't support? 1237312 15 caulier.gilles 2012-03-16 22:53:18 +0000 because Exiv2 must be fixed to support video file, to be more universal. A GSoC 2012 project have been open in this way... Gilles Caulier 1237362 16 ahuggel 2012-03-17 02:23:55 +0000 > Some news about video support in Exiv2 ? Do you have some found contributors > about ? Two have shown interest. I think I copied you on all the conversations so far. -ahu. 1274625 17 caulier.gilles 2012-07-10 06:20:15 +0000 Git commit 9c361bc4b3d4a625210c75aea67b66ab35ab7300 by Abhinav Badola. Committed on 10/07/2012 at 08:04. Pushed by badola into branch 'development/3.0.0'. Added basic support for Video metadata, adding of records in database VideoMetadata M +40 -0 data/database/dbconfig.xml.cmake M +123 -0 libs/database/albumdb.cpp M +33 -0 libs/database/albumdb.h M +6 -3 libs/database/databasechangesets.cpp M +1 -0 libs/database/databasecopymanager.cpp M +30 -2 libs/database/databasefields.h M +21 -0 libs/database/databaseinfocontainers.h M +12 -0 libs/database/imageinfo.cpp M +2 -0 libs/database/imageinfo.h M +1 -0 libs/database/imagelister.cpp M +33 -0 libs/database/imagequerybuilder.cpp M +85 -3 libs/database/imagescanner.cpp M +1 -0 libs/database/imagescanner.h M +27 -0 libs/database/schemaupdater.cpp M +16 -0 libs/dmetadata/dmetadata.cpp M +9 -1 libs/dmetadata/metadatainfo.h M +2 -0 libs/imageproperties/imagepropertiessidebardb.cpp http://commits.kde.org/digikam/9c361bc4b3d4a625210c75aea67b66ab35ab7300 1278702 18 mail.abu.to 2012-07-24 21:02:48 +0000 Git commit 7ceb80ccd8ae4e7531afdb82197ca1754f9dd4ce by Abhinav Badola. Committed on 24/07/2012 at 22:42. Pushed by badola into branch 'development/3.0.0'. Made all text entries in video metadata database Changed all entries to text in datbase. Improved data reading functionality. M +6 -6 data/database/dbconfig.xml.cmake M +3 -3 libs/database/albumdb.h M +3 -3 libs/database/databaseinfocontainers.h M +3 -3 libs/database/imagequerybuilder.cpp M +5 -4 libs/dmetadata/metadatainfo.h http://commits.kde.org/digikam/7ceb80ccd8ae4e7531afdb82197ca1754f9dd4ce 1278703 19 mail.abu.to 2012-07-24 21:02:48 +0000 Git commit e9727d9d5048dfdd6280587c86991f2857abbacd by Abhinav Badola. Committed on 24/07/2012 at 22:48. Pushed by badola into branch 'development/3.0.0'. Added support for Video metadata in Image Properties Sidebar Though the entries are visible in the sidebar, the values are not being read properly. Needs revision. M +22 -0 libs/database/imageinfo.cpp M +2 -0 libs/database/imageinfo.h M +31 -12 libs/database/imagescanner.cpp M +6 -6 libs/database/schemaupdater.cpp M +55 -1 libs/dmetadata/dmetadata.cpp M +4 -0 libs/dmetadata/dmetadata.h M +81 -0 libs/dmetadata/photoinfocontainer.cpp M +29 -0 libs/dmetadata/photoinfocontainer.h M +13 -0 libs/imageproperties/imagepropertiessidebardb.cpp M +145 -1 libs/imageproperties/imagepropertiestab.cpp M +10 -0 libs/imageproperties/imagepropertiestab.h http://commits.kde.org/digikam/e9727d9d5048dfdd6280587c86991f2857abbacd 1278709 20 mail.abu.to 2012-07-24 21:14:40 +0000 I have made the entries in most of the files that had entries for Photograph Metadata as well. But still the data is not being fetched properly. The data is being stored in the database VideoMetadata, but somehow it is not being fetched into VideoInfoContainer. Can please anyone guide me where I may be going wrong..? 1278983 21 mail.abu.to 2012-07-25 22:08:38 +0000 Git commit c37f212f7fc8e1668c2c227ddf5aa1cc02a5e1c2 by Abhinav Badola. Committed on 25/07/2012 at 23:50. Pushed by badola into branch 'development/3.0.0'. Improved support for Video metadata in Image Properties Sidebar Video Bit Depth Corrected. Entries are visible in the sidebar, the values are not being read properly. Needs revision. M +1 -0 digikam/utils/tooltipfiller.cpp M +1 -1 libs/database/imagescanner.cpp M +1 -0 libs/dimg/loaders/dimgloader.h M +116 -1 libs/imageproperties/cameraitempropertiestab.cpp M +15 -0 libs/imageproperties/imagepropertiessidebar.cpp M +16 -16 libs/imageproperties/imagepropertiestab.cpp M +51 -0 utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp M +1 -0 utilities/qmlshow/qmlshow.h http://commits.kde.org/digikam/c37f212f7fc8e1668c2c227ddf5aa1cc02a5e1c2 1279141 22 mail.abu.to 2012-07-26 14:44:45 +0000 Git commit c3e65017cd8e7d034a5c445cfd5d4e8eedcfda75 by Abhinav Badola. Committed on 26/07/2012 at 16:41. Pushed by badola into branch 'development/3.0.0'. Improved Dimensions of Video metadata in Image Properties Sidebar Video width, height added. ImagePropertiesSidebar is not fetching data. VideoInfo Container is not fetching data. M +2 -5 libs/database/imagescanner.cpp M +89 -7 libs/dialogs/imagedialog.cpp M +4 -1 libs/dmetadata/dmetadata.cpp M +3 -1 libs/dmetadata/metadatainfo.h M +1 -1 libs/imageproperties/imagepropertiessidebar.cpp M +1 -1 libs/imageproperties/imagepropertiessidebardb.cpp http://commits.kde.org/digikam/c3e65017cd8e7d034a5c445cfd5d4e8eedcfda75 1279240 23 mail.abu.to 2012-07-27 00:30:28 +0000 Git commit c8c086f7f53b3762284581c5fa02f7f2af5107a0 by Abhinav Badola. Committed on 27/07/2012 at 02:29. Pushed by badola into branch 'development/3.0.0'. Enable Show/Hide for Display of Video metadata in Image Properties Sidebar Fixed dmetadata.cpp to fetch data for VideoInfo Container, from the database. M +1 -5 libs/database/imagescanner.cpp M +10 -1 libs/dmetadata/dmetadata.cpp M +2 -2 libs/imageproperties/imagepropertiestab.cpp http://commits.kde.org/digikam/c8c086f7f53b3762284581c5fa02f7f2af5107a0 1279478 24 mail.abu.to 2012-07-28 08:58:52 +0000 Git commit f42b504a5a83cab2b70c8183ef5888835640f1a8 by Abhinav Badola. Committed on 28/07/2012 at 10:57. Pushed by badola into branch 'development/3.0.0'. Completed Tool Tip Display/Settings of Video metadata M +123 -1 digikam/utils/albumsettings.cpp M +24 -0 digikam/utils/albumsettings.h M +104 -1 digikam/utils/tooltipfiller.cpp M +72 -1 utilities/setup/setuptooltip.cpp http://commits.kde.org/digikam/f42b504a5a83cab2b70c8183ef5888835640f1a8 1279498 25 mail.abu.to 2012-07-28 12:06:01 +0000 Git commit e025d7dd74215408cc7c6d9c23e88a412b0edba3 by Abhinav Badola. Committed on 28/07/2012 at 14:03. Pushed by badola into branch 'development/3.0.0'. Removed Resolution field in Video metadata M +4 -6 data/database/dbconfig.xml.cmake M +0 -3 digikam/utils/albumsettings.h M +2 -7 libs/database/albumdb.cpp M +1 -2 libs/database/albumdb.h M +1 -3 libs/database/databasefields.h M +0 -1 libs/database/databaseinfocontainers.h M +0 -1 libs/database/imageinfo.cpp M +0 -4 libs/database/imagequerybuilder.cpp M +1 -3 libs/database/imagescanner.cpp M +1 -11 libs/dialogs/imagedialog.cpp M +0 -8 libs/dmetadata/dmetadata.cpp M +0 -1 libs/dmetadata/metadatainfo.h M +2 -7 libs/dmetadata/photoinfocontainer.cpp M +0 -1 libs/dmetadata/photoinfocontainer.h M +2 -12 libs/imageproperties/cameraitempropertiestab.cpp M +0 -1 libs/imageproperties/imagepropertiessidebar.cpp M +0 -1 libs/imageproperties/imagepropertiessidebardb.cpp M +2 -16 libs/imageproperties/imagepropertiestab.cpp M +0 -1 libs/imageproperties/imagepropertiestab.h M +0 -6 utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp http://commits.kde.org/digikam/e025d7dd74215408cc7c6d9c23e88a412b0edba3 1280311 26 caulier.gilles 2012-07-31 19:09:14 +0000 Abhinav, In 3.0.0 branch, i polished all code relevant of Advanced Search tool. To close this entry, we need to implement video search feature. Tomorow, i create a mockup for GUI to discut about the dialog implementation. In the background, search is performed through an XML interface to query the DB, coded by Marcel. It's very powerful and hack-able as well. I will list all the implementation relevant to patch about... Gilles Caulier 1280345 27 mail.abu.to 2012-07-31 21:06:03 +0000 Gilles, Thanks, I will be looking forward to it. 1280537 28 mail.abu.to 2012-08-01 19:59:07 +0000 Git commit e4def9e597b3e236b1a97309c8c0e177c57085e2 by Abhinav Badola. Committed on 01/08/2012 at 21:57. Pushed by badola into branch 'development/3.0.0'. Updated DBSCHEMA.ODS, registered VideoMetadata table in it. M +- -- project/documents/DBSCHEMA.ODS http://commits.kde.org/digikam/e4def9e597b3e236b1a97309c8c0e177c57085e2 1280716 29 caulier.gilles 2012-08-02 11:49:39 +0000 Abhinav, Can you reproduce : digikam(8170)/digikam (core) Digikam::ImageScanner::addImage: Adding new item "/mnt/data/photos.test/Videos/2012-07-07_17.27.34.mp4" ( 32): ftyp : ( 1214229): mdat :Unprocessed ( 12880): moov :( 108): mvhd : ( 12154): trak : ( 92): tkhd : Stream |0| ( 12054): mdia :( 32): mdhd : ( 37): hdlr : ( 11977): minf :( 20): vmhd : ( 36): dinf :( 28): dref :( 12): url : ( 11913): stbl :( 117): stsd : ( 7232): stts :: 902 ( 316): stsc :Unprocessed ( 4016): stsz :Unprocessed ( 204): stco :Unprocessed ( 20): stss :Unprocessed ( 610): trak : ( 92): tkhd : Stream |1| ( 510): mdia :( 32): mdhd : ( 37): hdlr :*** glibc detected *** /usr/bin/digikam: double free or corruption (!prev): 0xad355210 *** ======= Backtrace: ========= /lib/i686/libc.so.6(+0x6cbe2)[0xb49b5be2] /usr/lib/libstdc++.so.6(_ZdlPv+0x1f)[0xb4bb9c7f] /usr/lib/libstdc++.so.6(_ZdaPv+0x1b)[0xb4bb9cdb] /usr/lib/libexiv2.so.12(_ZN5Exiv27DataBufD2Ev+0x28)[0xb381c64e] /usr/lib/libexiv2.so.12(_ZN5Exiv214QuickTimeVideo14handlerDecoderEm+0x686)[0xb38b85d0] /usr/lib/libexiv2.so.12(_ZN5Exiv214QuickTimeVideo10tagDecoderERNS_7DataBufEm+0x254)[0xb38b57d8] /usr/lib/libexiv2.so.12(_ZN5Exiv214QuickTimeVideo11decodeBlockEv+0x177)[0xb38b555b] /usr/lib/libexiv2.so.12(_ZN5Exiv214QuickTimeVideo12readMetadataEv+0x3bd)[0xb38b52cd] /usr/lib/libkexiv2.so.11(_ZNK11KExiv2Iface6KExiv24loadERK7QString+0x11c)[0xb7378c32] /usr/lib/libdigikamcore.so.3(_ZNK7Digikam9DMetadata4loadERK7QString+0x37)[0xb6f11555] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam12ImageScanner12loadFromDiskEv+0x64)[0xb6afacec] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner11scanNewFileERK9QFileInfoi+0x86)[0xb6aa6008] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner9scanAlbumERKNS_18CollectionLocationERK7QString+0x610)[0xb6aa5516] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner9scanAlbumERKNS_18CollectionLocationERK7QString+0x7e4)[0xb6aa56ea] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner13scanAlbumRootERKNS_18CollectionLocationE+0x81)[0xb6aa4167] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner12completeScanEv+0x278)[0xb6aa2b56] /usr/bin/digikam[0x81f7c6c] /usr/lib/libQtCore.so.4(+0x67bf0)[0xb4df2bf0] /lib/i686/libpthread.so.0(+0x6a37)[0xb4d77a37] /lib/i686/libc.so.6(clone+0x5e)[0xb4a1d98e] Exiv2 from video support branch rev. 2791 digiKam 3.0.0 from git. 1280717 30 caulier.gilles 2012-08-02 11:52:00 +0000 Another one : digikam(8427)/digikam (core) Digikam::ImageScanner::addImage: Adding new item "/mnt/data/photos.test/Videos/2012-07-07_17-49-07_398.3gp" ( 32): ftyp : ( 1214229): mdat :Unprocessed ( 12880): moov :( 108): mvhd : ( 12154): trak : ( 92): tkhd : Stream |0| ( 12054): mdia :( 32): mdhd : ( 37): hdlr : ( 11977): minf :( 20): vmhd : ( 36): dinf :( 28): dref :( 12): url : ( 11913): stbl :( 117): stsd : ( 7232): stts :: 902 ( 316): stsc :Unprocessed ( 4016): stsz :Unprocessed ( 204): stco :Unprocessed ( 20): stss :Unprocessed ( 610): trak : ( 92): tkhd : Stream |1| ( 510): mdia :( 32): mdhd : ( 37): hdlr :*** glibc detected *** /usr/bin/digikam: double free or corruption (!prev): 0xad352988 *** ======= Backtrace: ========= /lib/i686/libc.so.6(+0x6cbe2)[0xb49b5be2] /usr/lib/libstdc++.so.6(_ZdlPv+0x1f)[0xb4bb9c7f] /usr/lib/libstdc++.so.6(_ZdaPv+0x1b)[0xb4bb9cdb] /usr/lib/libexiv2.so.12(_ZN5Exiv27DataBufD2Ev+0x28)[0xb381c64e] /usr/lib/libexiv2.so.12(_ZN5Exiv214QuickTimeVideo14handlerDecoderEm+0x686)[0xb38b85d0] /usr/lib/libexiv2.so.12(_ZN5Exiv214QuickTimeVideo10tagDecoderERNS_7DataBufEm+0x254)[0xb38b57d8] /usr/lib/libexiv2.so.12(_ZN5Exiv214QuickTimeVideo11decodeBlockEv+0x177)[0xb38b555b] /usr/lib/libexiv2.so.12(_ZN5Exiv214QuickTimeVideo12readMetadataEv+0x3bd)[0xb38b52cd] /usr/lib/libkexiv2.so.11(_ZNK11KExiv2Iface6KExiv24loadERK7QString+0x11c)[0xb7378c32] /usr/lib/libdigikamcore.so.3(_ZNK7Digikam9DMetadata4loadERK7QString+0x37)[0xb6f11555] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam12ImageScanner12loadFromDiskEv+0x64)[0xb6afacec] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner11scanNewFileERK9QFileInfoi+0x86)[0xb6aa6008] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner9scanAlbumERKNS_18CollectionLocationERK7QString+0x610)[0xb6aa5516] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner9scanAlbumERKNS_18CollectionLocationERK7QString+0x7e4)[0xb6aa56ea] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner13scanAlbumRootERKNS_18CollectionLocationE+0x81)[0xb6aa4167] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner12completeScanEv+0x278)[0xb6aa2b56] /usr/bin/digikam[0x81f7c6c] /usr/lib/libQtCore.so.4(+0x67bf0)[0xb4df2bf0] /lib/i686/libpthread.so.0(+0x6a37)[0xb4d77a37] /lib/i686/libc.so.6(clone+0x5e)[0xb4a1d98e] Gilles Caulier 1280718 31 caulier.gilles 2012-08-02 11:53:33 +0000 again : digikam(8497)/digikam (core) Digikam::ImageScanner::addImage: Adding new item "/mnt/data/photos.test/Videos/05112011034.mp4" ( 32): ftyp : ( 1214229): mdat :Unprocessed ( 12880): moov :( 108): mvhd : ( 12154): trak : ( 92): tkhd : Stream |0| ( 12054): mdia :( 32): mdhd : ( 37): hdlr : ( 11977): minf :( 20): vmhd : ( 36): dinf :( 28): dref :( 12): url : ( 11913): stbl :( 117): stsd : ( 7232): stts :: 902 ( 316): stsc :Unprocessed ( 4016): stsz :Unprocessed ( 204): stco :Unprocessed ( 20): stss :Unprocessed ( 610): trak : ( 92): tkhd : Stream |1| ( 510): mdia :( 32): mdhd : ( 37): hdlr :*** glibc detected *** /usr/bin/digikam: double free or corruption (!prev): 0xad30a7d8 *** ======= Backtrace: ========= /lib/i686/libc.so.6(+0x6cbe2)[0xb49b5be2] /usr/lib/libstdc++.so.6(_ZdlPv+0x1f)[0xb4bb9c7f] /usr/lib/libstdc++.so.6(_ZdaPv+0x1b)[0xb4bb9cdb] /usr/lib/libexiv2.so.12(_ZN5Exiv27DataBufD2Ev+0x28)[0xb381c64e] /usr/lib/libexiv2.so.12(_ZN5Exiv214QuickTimeVideo14handlerDecoderEm+0x686)[0xb38b85d0] /usr/lib/libexiv2.so.12(_ZN5Exiv214QuickTimeVideo10tagDecoderERNS_7DataBufEm+0x254)[0xb38b57d8] /usr/lib/libexiv2.so.12(_ZN5Exiv214QuickTimeVideo11decodeBlockEv+0x177)[0xb38b555b] /usr/lib/libexiv2.so.12(_ZN5Exiv214QuickTimeVideo12readMetadataEv+0x3bd)[0xb38b52cd] /usr/lib/libkexiv2.so.11(_ZNK11KExiv2Iface6KExiv24loadERK7QString+0x11c)[0xb7378c32] /usr/lib/libdigikamcore.so.3(_ZNK7Digikam9DMetadata4loadERK7QString+0x37)[0xb6f11555] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam12ImageScanner12loadFromDiskEv+0x64)[0xb6afacec] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner11scanNewFileERK9QFileInfoi+0x86)[0xb6aa6008] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner9scanAlbumERKNS_18CollectionLocationERK7QString+0x610)[0xb6aa5516] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner9scanAlbumERKNS_18CollectionLocationERK7QString+0x7e4)[0xb6aa56ea] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner13scanAlbumRootERKNS_18CollectionLocationE+0x81)[0xb6aa4167] /usr/lib/libdigikamdatabase.so.3(_ZN7Digikam17CollectionScanner12completeScanEv+0x278)[0xb6aa2b56] /usr/bin/digikam[0x81f7c6c] /usr/lib/libQtCore.so.4(+0x67bf0)[0xb4df2bf0] /lib/i686/libpthread.so.0(+0x6a37)[0xb4d77a37] /lib/i686/libc.so.6(clone+0x5e)[0xb4a1d98e] Gilles Caulier 1280720 32 caulier.gilles 2012-08-02 11:58:36 +0000 Same backtrace when i try to scan some video files collected through Exiv2 wiki. With this one especially 04072012033.mp4, i can see this bt from Exiv2 : (gdb) bt #0 0xb49b62fd in _int_free () from /lib/i686/libc.so.6 #1 0xb4bb9c7f in operator delete(void*) () from /usr/lib/libstdc++.so.6 #2 0xb4bb9cdb in operator delete[](void*) () from /usr/lib/libstdc++.so.6 #3 0xb381c64e in Exiv2::DataBuf::~DataBuf() () from /usr/lib/libexiv2.so.12 #4 0xb38b85d0 in Exiv2::QuickTimeVideo::handlerDecoder(unsigned long) () from /usr/lib/libexiv2.so.12 #5 0xb38b57d8 in Exiv2::QuickTimeVideo::tagDecoder(Exiv2::DataBuf&, unsigned long) () from /usr/lib/libexiv2.so.12 #6 0xb38b555b in Exiv2::QuickTimeVideo::decodeBlock() () from /usr/lib/libexiv2.so.12 #7 0xb38b52cd in Exiv2::QuickTimeVideo::readMetadata() () from /usr/lib/libexiv2.so.12 #8 0xb7378c32 in KExiv2Iface::KExiv2::load (this=0xadc19dc8, filePath=...) at /mnt/data/Devel/GIT/3.x/extra/libkexiv2/libkexiv2/kexiv2.cpp:300 #9 0xb6f11555 in Digikam::DMetadata::load (this=0xadc19dc8, filePath=...) at /mnt/data/Devel/GIT/3.x/core/libs/dmetadata/dmetadata.cpp:109 #10 0xb6afacec in Digikam::ImageScanner::loadFromDisk (this=0xadc19dc0) at /mnt/data/Devel/GIT/3.x/core/libs/database/imagescanner.cpp:1250 #11 0xb6aa6008 in Digikam::CollectionScanner::scanNewFile (this=0xadc1a1a4, info=..., albumId=300) at /mnt/data/Devel/GIT/3.x/core/libs/database/collectionscanner.cpp:1026 #12 0xb6aa5516 in Digikam::CollectionScanner::scanAlbum (this=0xadc1a1a4, location=..., album=...) at /mnt/data/Devel/GIT/3.x/core/libs/database/collectionscanner.cpp:903 #13 0xb6aa56ea in Digikam::CollectionScanner::scanAlbum (this=0xadc1a1a4, location=..., album=...) at /mnt/data/Devel/GIT/3.x/core/libs/database/collectionscanner.cpp:926 #14 0xb6aa4167 in Digikam::CollectionScanner::scanAlbumRoot (this=0xadc1a1a4, location=...) at /mnt/data/Devel/GIT/3.x/core/libs/database/collectionscanner.cpp:658 #15 0xb6aa2b56 in Digikam::CollectionScanner::completeScan (this=0xadc1a1a4) at /mnt/data/Devel/GIT/3.x/core/libs/database/collectionscanner.cpp:332 #16 0x081f7c6c in Digikam::ScanController::run (this=0x86c6b10) at /mnt/data/Devel/GIT/3.x/core/digikam/database/scancontroller.cpp:732 #17 0xb4df2bf0 in ?? () from /usr/lib/libQtCore.so.4 #18 0xb4d77a37 in start_thread () from /lib/i686/libpthread.so.0 #19 0xb4a1d98e in clone () from /lib/i686/libc.so.6 Backtrace stopped: Not enough registers or memory available to unwind further (gdb) Gilles Caulier 1280728 33 caulier.gilles 2012-08-02 12:23:20 +0000 My Advanced Video Search mockup based on registered video properties from DB (which are currently show on Properties tab and tooltip : http://www.flickr.com/photos/digikam/7697497988/sizes/o/in/photostream/ Gilles Caulier 1280731 34 72896 caulier.gilles 2012-08-02 12:27:21 +0000 Created attachment 72896 Video Search mockup patch This is the patch to introduce video search properties in Advanced Search tool... It's only GUI stuff, nothing is done in background on DB to perform search. This must be implemented. Also review values that i assigned to video search field. Some need to be adapted and fixed... Look TODO also. This is the good start to implement video search feature. Gilles Caulier 1280759 35 caulier.gilles 2012-08-02 14:33:55 +0000 Abhinav, Adavanced Search tool GUI is located here in reprository : https://projects.kde.org/projects/extragear/graphics/digikam/repository/show/utilities/searchwindow?rev=development%2F3.0.0 With my previous patch introducing video search fields, i patched : - SearchGroup::setup() where i add Video Properties section with fields relevant. Each fields are identified by a string name, as "format" from "Picture Properties" for exemple. The declaration of fields is simple in SearchGroup class but require to change another class to have effect on GUI. - SearchField::createField() implement how a GUI will manage a field for end user. If you look at "format" properties, it will provide a clickable link to pop-up a list of possible values to use. Values are passed to a QStringList. For each value, you set a pair of strings. The first is to query in DB, and second to display in GUI. There are some other GUI possibility, for ex. to set a range of values. Look my patch for details. When GUI is patch you need to implement the way to use this fields in way to query DB. The Adv Search tool use an XML string to query the DB, through a dedicated interface located here : https://projects.kde.org/projects/extragear/graphics/digikam/repository/changes/libs/database/searchxml.h?rev=development%2F3.0.0 SearchXML can encode a query from Adv. Search tool GUI to an XML string, including section, fields, values, groups, sub-groups, operators, etc... This XML is string is passed to DB to query really data through SQL. With XML you can create complex queries, human readable to hack, intead to play with SQL directly. Advanced Search tool call SearchXML interface by : ==> https://projects.kde.org/projects/extragear/graphics/digikam/repository/entry/utilities/searchwindow/searchwindow.cpp?rev=development%2F3.0.0#L130 ... When press Ok button from dialog. ==> Which emit searchEdited() with current XML string generated by view this method : https://projects.kde.org/projects/extragear/graphics/digikam/repository/entry/utilities/searchwindow/searchview.cpp?rev=development%2F3.0.0#L293 ... where SearchXmlWriter is used. ==> signal emitted arrive to this slot : https://projects.kde.org/projects/extragear/graphics/digikam/repository/entry/utilities/searchwindow/searchtabheader.cpp?rev=development%2F3.0.0#L566 ... where xml string is passed to create or update AlbumManager content with the query to use. Note that XML string is directly stored in DB for future use, in case of you save search album. ==> AlbumManager pass XML query here : https://projects.kde.org/projects/extragear/graphics/digikam/repository/entry/digikam/album/albummanager.cpp?rev=development%2F3.0.0#L2691 ... to the AlbumDB class to query the database of course, through addSearch() method. This one re-route the query to DatabaseCoreBackend class... ==> The most important part to patch to implement Video Search query, is ImageQueryBuilder, with is the XML query to SQL translator, especially in ImageQueryBuilder::buildField() method, where each search fields are implemented as SQL query. You will find the inverse wrap using same field names than SearchField class use... https://projects.kde.org/projects/extragear/graphics/digikam/repository/entry/libs/database/imagequerybuilder.cpp?rev=development%2F3.0.0#L779 Gilles Caulier 1280760 36 caulier.gilles 2012-08-02 14:35:14 +0000 Marcel, if i forget something or i'm wrong somewhere in my comment #35, please fix me (:=)))... Gilles Caulier 1280785 37 mail.abu.to 2012-08-02 16:28:55 +0000 Hi Gilles, Quicktime video backend is not properly complete, so I assume that there may be some bugs that may occur. I will look into the matter soon and fix the bug. For now, Matroska video format is complete(I hope it will produce no bugs. I tested MKV and WEBM formats, and they performed perfectly). I have left the aspect ratio for now, since that would be common to all, I plan to put it in a separate file. It can be completed any time. Apart from that, right now, I am making some changes and completing the missing decoding requiered in Riff format after that. It will take about one-two more days. After that I will patch quicktime, and will start with ASF format soon. I plan to get back to digiKam Advanced Search GUI after that. Once the read metadata backend is complete. 1280800 38 caulier.gilles 2012-08-02 17:41:07 +0000 Abhinav, Plan sound fine for me... What' s about WebP support ? http://en.wikipedia.org/wiki/WebP It's based on Riff format, as AVI video format. It can be supported as well without any specific patch ? If yes, i can plan to add Webp google image support in digiKam core... Gilles 1280819 39 mail.abu.to 2012-08-02 18:36:19 +0000 Hi Gilles, Adding WebP doesn't seem that much of a problem to me. Sure we can add it. It would be nice if we add support for WebP simultaneously with AVI. I was testing some example of WebP. They are based on RIFF container but they didn't seem to contain any additional metadata information (I tested the example image provided with https://code.google.com/p/webp/downloads/detail?name=libwebp-0.1.99.tar.gz ). Can you please give me some links to WebP examples, so that I can test them as well..? Currently I am enhancing RIFF format only, so I can use them as test cases as well, and report back if I find any problem with the implementation. 1280859 40 caulier.gilles 2012-08-02 20:09:33 +0000 Do you tried with these files : https://developers.google.com/speed/webp/gallery1 1280861 41 mail.abu.to 2012-08-02 20:19:57 +0000 Yes, I tried the above link as well. They don't have any additional metadata information in them. I checked using exiftool as well, but it didn't show any addtional metadata other than- ExifTool Version Number : 8.40 File Name : 5.webp Directory : /home/badola/Downloads File Size : 81 kB File Modification Date/Time : 2012:08:03 00:30:58+05:30 File Permissions : rw-r--r-- File Type : WEBP MIME Type : image/webp That is all that I found in these images. Other than that I checked this link- http://webp.googlecode.com/files/webp-samples.zip And it only has PNG files which are encoded using WebP codec, I guess. Exiv2 was not able to decode them so I used exiftool. It showed that the images are of PNG type and not WebP - badola@XPS:~> exiftool ~/Downloads/webp-samples/4_webp.png ExifTool Version Number : 8.40 File Name : 4_webp.png Directory : /home/badola/Downloads/webp-samples File Size : 2.6 MB File Modification Date/Time : 2010:09:30 20:51:32+05:30 File Permissions : r-xr-x--- File Type : PNG MIME Type : image/png Image Width : 2048 Image Height : 1536 Bit Depth : 8 Color Type : RGB Compression : Deflate/Inflate Filter : Adaptive Interlace : Noninterlaced Pixels Per Unit X : 72 Pixels Per Unit Y : 72 Pixel Units : Unknown Virtual Image Width : 2048 Virtual Image Height : 1536 Virtual Page Units : 0 Image Size : 2048x1536 badola@XPS:~> exiv2 ~/Downloads/webp-samples/4_webp.png File name : /home/badola/Downloads/webp-samples/4_webp.png File size : 2707632 Bytes MIME type : image/png Image size : 2048 x 1536 /home/badola/Downloads/webp-samples/4_webp.png: No Exif data found in the file So I am still falling short of test samples. 1287364 42 mail.abu.to 2012-08-18 23:01:45 +0000 Git commit 91f5de3e438ee810c740bd1e0d3f2b245b5924c4 by Abhinav Badola. Committed on 19/08/2012 at 01:01. Pushed by badola into branch 'development/3.0.0'. Updated dmetadata.cpp, changed the way XMP data is fetched from containers. M +17 -17 libs/dmetadata/dmetadata.cpp http://commits.kde.org/digikam/91f5de3e438ee810c740bd1e0d3f2b245b5924c4 1365884 43 79649 geow812 2013-05-03 02:45:31 +0000 Created attachment 79649 Implement Video Advanced Search feature I made a patch which implements video advance search feature. Comparing to Gilles's GUI mockup patch, I changed several fields from SearchFieldChoice to SearchFieldRangeInt because some fields are not standard, so it will be difficult if only given several choices. 1366931 44 geow812 2013-05-07 12:23:56 +0000 Hello everyone, I'd like to know if there's any news on this bug? Does this patch work fine? Thanks :) 1366951 45 caulier.gilles 2013-05-07 13:54:50 +0000 Yiou, Just tested. Patch work as expected. Congratulations... Gilles Caulier 1366952 46 geow812 2013-05-07 13:55:34 +0000 (In reply to comment #45) > Yiou, > > Just tested. Patch work as expected. Congratulations... > > Gilles Caulier Thank you very much Gilles :) 1366955 47 caulier.gilles 2013-05-07 13:57:52 +0000 Git commit 2434a79b8c16edac245e2a64d982bacf1d94fc64 by Gilles Caulier. Committed on 07/05/2013 at 15:56. Pushed by cgilles into branch 'master'. apply patch #79649 from Yiou Wang to support Video properties search in Advanced Search tool. CCMAIL: geow812@gmail.com FIXED-IN: 3.2.0 M +177 -13 libs/database/imagequerybuilder.cpp M +114 -0 utilities/searchwindow/searchfields.cpp M +20 -0 utilities/searchwindow/searchgroup.cpp M +1 -0 utilities/searchwindow/searchview.cpp http://commits.kde.org/digikam/2434a79b8c16edac245e2a64d982bacf1d94fc64 72896 2012-08-02 12:27:21 +0000 2012-08-02 12:27:21 +0000 Video Search mockup patch videosearch.patch text/plain 5713 caulier.gilles ZGlmZiAtLWdpdCBhL3V0aWxpdGllcy9zZWFyY2h3aW5kb3cvc2VhcmNoZmllbGRzLmNwcCBiL3V0 aWxpdGllcy9zZWFyY2h3aW5kb3cvc2VhcmNoZmllbGRzLmNwcAppbmRleCBhZWIwZDI1Li5lZTY5 NWUxIDEwMDY0NAotLS0gYS91dGlsaXRpZXMvc2VhcmNod2luZG93L3NlYXJjaGZpZWxkcy5jcHAK KysrIGIvdXRpbGl0aWVzL3NlYXJjaHdpbmRvdy9zZWFyY2hmaWVsZHMuY3BwCkBAIC01NDMsNiAr NTQzLDEwNCBAQCBTZWFyY2hGaWVsZCogU2VhcmNoRmllbGQ6OmNyZWF0ZUZpZWxkKGNvbnN0IFFT dHJpbmcmIG5hbWUsIFNlYXJjaEZpZWxkR3JvdXAqIGNvbgogICAgICAgICBmaWVsZC0+c2V0VGV4 dChRU3RyaW5nKCksIGkxOG4oIkZpbmQgcGljdHVyZXMgdGhhdCBoYXZlIGFzc29jaWF0ZWQgYWxs IHRoZXNlIHdvcmRzOiIpKTsKICAgICAgICAgcmV0dXJuIGZpZWxkOwogICAgIH0KKworCisgICAg ZWxzZSBpZiAobmFtZSA9PSAidmlkZW9hc3BlY3RyYXRpbyIpCisgICAgeworICAgICAgICBTZWFy Y2hGaWVsZENob2ljZSogZmllbGQgPSBuZXcgU2VhcmNoRmllbGRDaG9pY2UocGFyZW50KTsKKyAg ICAgICAgZmllbGQtPnNldEZpZWxkTmFtZShuYW1lKTsKKyAgICAgICAgZmllbGQtPnNldFRleHQo aTE4bigiQXNwZWN0IFJhdGlvIiksIGkxOG4oIlJldHVybiB2aWRlbyB3aXRoIHRoZSBmcmFtZSBh c3BlY3QgcmF0aW8iKSk7CisgICAgICAgIFFTdHJpbmdMaXN0IHJhdGlvOworICAgICAgICByYXRp byA8PCAiNDozIjsKKyAgICAgICAgcmF0aW8gPDwgIjM6MiI7CisgICAgICAgIC8vIFRPRE86IGFk ZCBtb3JlIHBvc3NpYmxlIGFzcGVjdCByYXRpbworICAgICAgICBmaWVsZC0+c2V0Q2hvaWNlKHJh dGlvKTsKKyAgICAgICAgcmV0dXJuIGZpZWxkOworICAgIH0KKyAgICBlbHNlIGlmIChuYW1lID09 ICJ2aWRlb2R1cmF0aW9uIikKKyAgICB7CisgICAgICAgIFNlYXJjaEZpZWxkUmFuZ2VJbnQqIGZp ZWxkID0gbmV3IFNlYXJjaEZpZWxkUmFuZ2VJbnQocGFyZW50KTsKKyAgICAgICAgZmllbGQtPnNl dEZpZWxkTmFtZShuYW1lKTsKKyAgICAgICAgZmllbGQtPnNldFRleHQoaTE4bigiRHVyYXRpb24i KSwgaTE4bigiTGVuZ2h0IG9mIHRoZSB2aWRlbyIpKTsKKyAgICAgICAgZmllbGQtPnNldEJldHdl ZW5UZXh0KGkxOG5jKCJGaW5kIHZpZGVvIHdpdGggYSBsZW5naHQgYmV0d2Vlbi4uLmFuZC4uLiIs ICJhbmQiKSk7CisgICAgICAgIGZpZWxkLT5zZXROdW1iZXJQcmVmaXhBbmRTdWZmaXgoUVN0cmlu ZygpLCBpMThuYygiU2Vjb25kcyIsICJzIikpOworICAgICAgICBmaWVsZC0+c2V0Qm91bmRhcnko MSwgMTAwMDAsIDEwMCk7CisgICAgICAgIGZpZWxkLT5zZXRTdWdnZXN0ZWRWYWx1ZXMoUUxpc3Q8 aW50PigpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPDwgMTAgPDwgMzAgPDwg NjAgPDwgOTAgPDwgMTIwIDw8IDI0MCA8PCAzNjAgPDwgNTAwIDw8IDEwMDAgPDwgMjAwMAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDw8IDMwMDAgPDwgNDAwMCA8PCA1MDAwIDw8 IDYwMDAgPDwgNzAwMCA8PCA4MDAwIDw8IDkwMDAgPDwgMTAwMDAKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAvLyBUT0RPIDogYWRqdXN0IGRlZmF1bHQgdmFsdWVzCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICApOworICAgICAgICBmaWVsZC0+c2V0U3VnZ2VzdGVk SW5pdGlhbFZhbHVlKDEwKTsKKyAgICAgICAgZmllbGQtPnNldFNpbmdsZVN0ZXBzKDEwLCAxMDAp OworICAgICAgICByZXR1cm4gZmllbGQ7CisgICAgfQorICAgIGVsc2UgaWYgKG5hbWUgPT0gInZp ZGVvZnJhbWVyYXRlIikKKyAgICB7CisgICAgICAgIFNlYXJjaEZpZWxkQ2hvaWNlKiBmaWVsZCA9 IG5ldyBTZWFyY2hGaWVsZENob2ljZShwYXJlbnQpOworICAgICAgICBmaWVsZC0+c2V0RmllbGRO YW1lKG5hbWUpOworICAgICAgICBmaWVsZC0+c2V0VGV4dChpMThuKCJGcmFtZSBSYXRlIiksIGkx OG4oIlJldHVybiB2aWRlbyB3aXRoIHRoZSBmcmFtZSByYXRlIikpOworICAgICAgICBRU3RyaW5n TGlzdCByYXRlOworICAgICAgICByYXRlIDw8ICIxMi41IiA8PCAiMTIuNSI7CisgICAgICAgIHJh dGUgPDwgIjI0IiA8PCAiMjQiOworICAgICAgICByYXRlIDw8ICIzMCIgPDwgIjMwIjsKKyAgICAg ICAgLy8gVE9ETzogYWRkIG1vcmUgcG9zc2libGUgZnJhbWUgcmF0ZQorICAgICAgICBmaWVsZC0+ c2V0Q2hvaWNlKHJhdGUpOworICAgICAgICByZXR1cm4gZmllbGQ7CisgICAgfQorICAgIGVsc2Ug aWYgKG5hbWUgPT0gInZpZGVvY29kZWMiKQorICAgIHsKKyAgICAgICAgU2VhcmNoRmllbGRDaG9p Y2UqIGZpZWxkID0gbmV3IFNlYXJjaEZpZWxkQ2hvaWNlKHBhcmVudCk7CisgICAgICAgIGZpZWxk LT5zZXRGaWVsZE5hbWUobmFtZSk7CisgICAgICAgIGZpZWxkLT5zZXRUZXh0KGkxOG4oIkNvZGVj IiksIGkxOG4oIlJldHVybiB2aWRlbyBjb2RlYyIpKTsKKyAgICAgICAgUVN0cmluZ0xpc3QgY29k ZWM7CisgICAgICAgIGNvZGVjIDw8ICJhdmkiICA8PCAiQXVkaW8gVmlkZW8gSW50ZXJsZWF2ZSI7 CisgICAgICAgIGNvZGVjIDw8ICJtb3YiICA8PCAiUXVpY2tUaW1lIjsKKyAgICAgICAgY29kZWMg PDwgIm1wNCIgIDw8ICJNUEVHIExheWVyIDQiOworICAgICAgICBjb2RlYyA8PCAiM2dwIiAgPDwg IjNHUFAiOworICAgICAgICBjb2RlYyA8PCAiZGl2eCIgPDwgIkRpdlgiOworICAgICAgICBjb2Rl YyA8PCAid21hIiAgPDwgIldpbmRvd3MgTWVkaWEgVmlkZW8iOworICAgICAgICBjb2RlYyA8PCAi bWt2IiAgPDwgIk1hdHJvc2thIjsKKyAgICAgICAgLy8gVE9ETzogYWRkIG1vcmUgcG9zc2libGUg Y29kZWMKKyAgICAgICAgZmllbGQtPnNldENob2ljZShjb2RlYyk7CisgICAgICAgIHJldHVybiBm aWVsZDsKKyAgICB9CisgICAgZWxzZSBpZiAobmFtZSA9PSAidmlkZW9hdWRpb2JpdHJhdGUiKQor ICAgIHsKKyAgICAgICAgU2VhcmNoRmllbGRDaG9pY2UqIGZpZWxkID0gbmV3IFNlYXJjaEZpZWxk Q2hvaWNlKHBhcmVudCk7CisgICAgICAgIGZpZWxkLT5zZXRGaWVsZE5hbWUobmFtZSk7CisgICAg ICAgIGZpZWxkLT5zZXRUZXh0KGkxOG4oIkF1ZGlvIEJpdHMgUmF0ZSIpLCBpMThuKCJSZXR1cm4g dmlkZW8gYXVkaW8gYml0cyByYXRlIikpOworICAgICAgICBRU3RyaW5nTGlzdCByYXRlOworICAg ICAgICByYXRlIDw8ICI4MDAwIiA8PCAiODAwMCI7CisgICAgICAgIHJhdGUgPDwgIjEyMDAwIiA8 PCAiMTIwMDAiOworICAgICAgICAvLyBUT0RPOiBhZGQgbW9yZSBwb3NzaWJsZSBhdWRpbyByYXRl CisgICAgICAgIGZpZWxkLT5zZXRDaG9pY2UocmF0ZSk7CisgICAgICAgIHJldHVybiBmaWVsZDsK KyAgICB9CisgICAgZWxzZSBpZiAobmFtZSA9PSAidmlkZW9hdWRpb2NoYW5uZWx0eXBlIikKKyAg ICB7CisgICAgICAgIFNlYXJjaEZpZWxkQ2hvaWNlKiBmaWVsZCA9IG5ldyBTZWFyY2hGaWVsZENo b2ljZShwYXJlbnQpOworICAgICAgICBmaWVsZC0+c2V0RmllbGROYW1lKG5hbWUpOworICAgICAg ICBmaWVsZC0+c2V0VGV4dChpMThuKCJBdWRpbyBDaGFubmVsIFR5cGUiKSwgaTE4bigiUmV0dXJu IHZpZGVvIGF1ZGlvIENoYW5uZWwgVHlwZSIpKTsKKyAgICAgICAgUVN0cmluZ0xpc3QgdHlwZTsK KyAgICAgICAgdHlwZSA8PCAiMSIgPDwgaTE4bigiTW9ubyIpOworICAgICAgICB0eXBlIDw8ICIy IiA8PCBpMThuKCJTdGVyZW8iKTsKKyAgICAgICAgLy8gVE9ETzogYWRkIG1vcmUgcG9zc2libGUg YXVkaW8gY2hhbm5lbCB0eXBlCisgICAgICAgIGZpZWxkLT5zZXRDaG9pY2UodHlwZSk7CisgICAg ICAgIHJldHVybiBmaWVsZDsKKyAgICB9CisgICAgZWxzZSBpZiAobmFtZSA9PSAidmlkZW9hdWRp b2NvbXByZXNzb3IiKQorICAgIHsKKyAgICAgICAgU2VhcmNoRmllbGRDaG9pY2UqIGZpZWxkID0g bmV3IFNlYXJjaEZpZWxkQ2hvaWNlKHBhcmVudCk7CisgICAgICAgIGZpZWxkLT5zZXRGaWVsZE5h bWUobmFtZSk7CisgICAgICAgIGZpZWxkLT5zZXRUZXh0KGkxOG4oIkF1ZGlvIENvbXByZXNzb3Ii KSwgaTE4bigiUmV0dXJuIHZpZGVvIGF1ZGlvIENvbXByZXNzb3IiKSk7CisgICAgICAgIFFTdHJp bmdMaXN0IHR5cGU7CisgICAgICAgIHR5cGUgPDwgInJhdyIgPDwgIlJBVyI7CisgICAgICAgIHR5 cGUgPDwgIm1wMyIgPDwgIk1QRUcgTGF5ZXIgMyI7CisgICAgICAgIC8vIFRPRE86IGFkZCBtb3Jl IHBvc3NpYmxlIGF1ZGlvIGNvbXByZXNzb3IKKyAgICAgICAgZmllbGQtPnNldENob2ljZSh0eXBl KTsKKyAgICAgICAgcmV0dXJuIGZpZWxkOworICAgIH0KKwogICAgIGVsc2UKICAgICB7CiAgICAg ICAgIGtXYXJuaW5nKCkgPDwgIlNlYXJjaEZpZWxkOjpjcmVhdGVGaWVsZDogY2Fubm90IGNyZWF0 ZSBTZWFyY2hGaWVsZCBmb3IiIDw8IG5hbWU7CmRpZmYgLS1naXQgYS91dGlsaXRpZXMvc2VhcmNo d2luZG93L3NlYXJjaGdyb3VwLmNwcCBiL3V0aWxpdGllcy9zZWFyY2h3aW5kb3cvc2VhcmNoZ3Jv dXAuY3BwCmluZGV4IDU5OWIwOWUuLmViNzY3YWMgMTAwNjQ0Ci0tLSBhL3V0aWxpdGllcy9zZWFy Y2h3aW5kb3cvc2VhcmNoZ3JvdXAuY3BwCisrKyBiL3V0aWxpdGllcy9zZWFyY2h3aW5kb3cvc2Vh cmNoZ3JvdXAuY3BwCkBAIC0xMzUsNiArMTM1LDI2IEBAIHZvaWQgU2VhcmNoR3JvdXA6OnNldHVw KFR5cGUgdHlwZSkKICAgICAvLyAtLS0tLSAvLwogCiAgICAgbGFiZWwgPSBuZXcgU2VhcmNoRmll bGRHcm91cExhYmVsKHRoaXMpOworICAgIGxhYmVsLT5zZXRUaXRsZShpMThuKCJWaWRlbyBQcm9w ZXJ0aWVzIikpOworICAgIGdyb3VwID0gbmV3IFNlYXJjaEZpZWxkR3JvdXAodGhpcyk7CisgICAg Z3JvdXAtPnNldExhYmVsKGxhYmVsKTsKKworICAgIGdyb3VwLT5hZGRGaWVsZChTZWFyY2hGaWVs ZDo6Y3JlYXRlRmllbGQoInZpZGVvYXNwZWN0cmF0aW8iLCBncm91cCkpOworICAgIGdyb3VwLT5h ZGRGaWVsZChTZWFyY2hGaWVsZDo6Y3JlYXRlRmllbGQoInZpZGVvZHVyYXRpb24iLCBncm91cCkp OworICAgIGdyb3VwLT5hZGRGaWVsZChTZWFyY2hGaWVsZDo6Y3JlYXRlRmllbGQoInZpZGVvZnJh bWVyYXRlIiwgZ3JvdXApKTsKKyAgICBncm91cC0+YWRkRmllbGQoU2VhcmNoRmllbGQ6OmNyZWF0 ZUZpZWxkKCJ2aWRlb2NvZGVjIiwgZ3JvdXApKTsKKyAgICBncm91cC0+YWRkRmllbGQoU2VhcmNo RmllbGQ6OmNyZWF0ZUZpZWxkKCJ2aWRlb2F1ZGlvYml0cmF0ZSIsIGdyb3VwKSk7CisgICAgZ3Jv dXAtPmFkZEZpZWxkKFNlYXJjaEZpZWxkOjpjcmVhdGVGaWVsZCgidmlkZW9hdWRpb2NoYW5uZWx0 eXBlIiwgZ3JvdXApKTsKKyAgICBncm91cC0+YWRkRmllbGQoU2VhcmNoRmllbGQ6OmNyZWF0ZUZp ZWxkKCJ2aWRlb2F1ZGlvY29tcHJlc3NvciIsIGdyb3VwKSk7CisKKyAgICBtX2ZpZWxkTGFiZWxz IDw8IGxhYmVsOworICAgIG1fZmllbGRHcm91cHMgPDwgZ3JvdXA7CisgICAgbV9sYXlvdXQtPmFk ZFdpZGdldChsYWJlbCk7CisgICAgbV9sYXlvdXQtPmFkZFdpZGdldChncm91cCk7CisKKyAgICAv LyAtLS0tLSAvLworCisgICAgbGFiZWwgPSBuZXcgU2VhcmNoRmllbGRHcm91cExhYmVsKHRoaXMp OwogICAgIGxhYmVsLT5zZXRUaXRsZShpMThuKCJDYXB0aW9uLCBDb21tZW50LCBUaXRsZSIpKTsK ICAgICBncm91cCA9IG5ldyBTZWFyY2hGaWVsZEdyb3VwKHRoaXMpOwogICAgIGdyb3VwLT5zZXRM YWJlbChsYWJlbCk7Cg== 79649 2013-05-03 02:45:31 +0000 2013-05-03 02:45:31 +0000 Implement Video Advanced Search feature videoadvsearch.patch text/plain 15101 geow812 ZGlmZiAtLWdpdCBhL2xpYnMvZGF0YWJhc2UvaW1hZ2VxdWVyeWJ1aWxkZXIuY3BwIGIvbGlicy9k YXRhYmFzZS9pbWFnZXF1ZXJ5YnVpbGRlci5jcHAKaW5kZXggN2Q3YTQ3Ni4uMWZkZjY2YyAxMDA2 NDQKLS0tIGEvbGlicy9kYXRhYmFzZS9pbWFnZXF1ZXJ5YnVpbGRlci5jcHAKKysrIGIvbGlicy9k YXRhYmFzZS9pbWFnZXF1ZXJ5YnVpbGRlci5jcHAKQEAgLTEwNjYsMzMgKzEwNjYsMTk3IEBAIGJv b2wgSW1hZ2VRdWVyeUJ1aWxkZXI6OmJ1aWxkRmllbGQoUVN0cmluZyYgc3FsLCBTZWFyY2hYbWxD YWNoaW5nUmVhZGVyJiByZWFkZXIsCiAgICAgewogICAgICAgICBmaWVsZFF1ZXJ5LmFkZEludEZp ZWxkKCJJbWFnZUluZm9ybWF0aW9uLmNvbG9yTW9kZWwiKTsKICAgICB9Ci0gICAgZWxzZSBpZiAo bmFtZSA9PSAiYXNwZWN0cmF0aW8iKQorICAgIGVsc2UgaWYgKG5hbWUgPT0gInZpZGVvYXNwZWN0 cmF0aW8iKQogICAgIHsKLSAgICAgICAgZmllbGRRdWVyeS5hZGRTdHJpbmdGaWVsZCgiVmlkZW9N ZXRhZGF0YS5hc3BlY3RSYXRpbyIpOworICAgICAgICBpZiAocmVsYXRpb24gPT0gU2VhcmNoWG1s OjpPbmVPZikKKyAgICAgICAgeworICAgICAgICAgICAgUVN0cmluZ0xpc3QgdmFsdWVzID0gcmVh ZGVyLnZhbHVlVG9TdHJpbmdMaXN0KCk7CisKKyAgICAgICAgICAgIGlmICh2YWx1ZXMuaXNFbXB0 eSgpKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGtEZWJ1ZygpIDw8ICJMaXN0IGZv ciBPbmVPZiBpcyBlbXB0eSI7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIFFMaXN0PGRv dWJsZT4gcmF0aW9WYWx1ZXM7CisgICAgICAgICAgICBmb3JlYWNoKGNvbnN0IFFTdHJpbmcmIHZh bHVlLCB2YWx1ZXMpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICpib3VuZFZhbHVl cyA8PCB2YWx1ZTsKKworICAgICAgICAgICAgICAgICBpZiAodmFsdWUuY29udGFpbnMoIjoiKSkK KyAgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgUVN0cmluZ0xpc3QgcmF0 aW9OdW0gPSB2YWx1ZS5zcGxpdCgiOiIsIFFTdHJpbmc6OlNraXBFbXB0eVBhcnRzKTsKKyAgICAg ICAgICAgICAgICAgICAgIGludCBudW0gPSByYXRpb051bS5hdCgwKS50b0ludCgpOworICAgICAg ICAgICAgICAgICAgICAgaW50IGRlbm9taW5hdG9yID0gcmF0aW9OdW0uYXQoMSkudG9JbnQoKTsK KyAgICAgICAgICAgICAgICAgICAgIHJhdGlvVmFsdWVzIDw8IChkb3VibGUpbnVtL2Rlbm9taW5h dG9yOworICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIHNx bCArPSAiKFZpZGVvTWV0YWRhdGEuYXNwZWN0UmF0aW8gSU4gKCI7CisgICAgICAgICAgICBBbGJ1 bURCOjphZGRCb3VuZFZhbHVlUGxhY2Vob2xkZXJzKHNxbCwgdmFsdWVzLnNpemUoKSk7CisgICAg ICAgICAgICBzcWwgKz0gIikgIjsKKyAgICAgICAgICAgIFFTdHJpbmcgcXVlcnkgPSAiYWJzKChD QVNUKFZpZGVvTWV0YWRhdGEuYXNwZWN0UmF0aW8gYXMgUkVBTCkgLSA/KSAgPCAwLjEpICI7CisK KyAgICAgICAgICAgIGZvcmVhY2goZG91YmxlIHZhbHVlLCByYXRpb1ZhbHVlcykKKyAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICAqYm91bmRWYWx1ZXMgPDwgdmFsdWU7CisgICAgICAgICAg ICAgICAgc3FsICs9ICAiT1IgIiArIHF1ZXJ5OworICAgICAgICAgICAgfQorCisgICAgICAgICAg ICBzcWwgKz0gIikgIjsKKyAgICAgICAgfQorICAgICAgICBlbHNlCisgICAgICAgIHsKKyAgICAg ICAgICAgIFFTdHJpbmcgdmFsdWUgPSByZWFkZXIudmFsdWUoKTsKKyAgICAgICAgICAgICpib3Vu ZFZhbHVlcyA8PCB2YWx1ZTsKKworICAgICAgICAgICAgaWYgKHZhbHVlLmNvbnRhaW5zKCI6Iikp CisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgUVN0cmluZ0xpc3QgcmF0aW9OdW0gPSB2 YWx1ZS5zcGxpdCgiOiIsIFFTdHJpbmc6OlNraXBFbXB0eVBhcnRzKTsKKyAgICAgICAgICAgICAg ICBpbnQgbnVtID0gcmF0aW9OdW0uYXQoMCkudG9JbnQoKTsKKyAgICAgICAgICAgICAgICBpbnQg ZGVub21pbmF0b3IgPSByYXRpb051bS5hdCgxKS50b0ludCgpOworICAgICAgICAgICAgICAgICpi b3VuZFZhbHVlcyA8PCAoZG91YmxlKW51bS9kZW5vbWluYXRvcjsKKyAgICAgICAgICAgIH0KKwor ICAgICAgICAgICAgc3FsICs9ICIoVmlkZW9NZXRhZGF0YS5hc3BlY3RSYXRpbz0/IE9SIGFicygo Q0FTVChWaWRlb01ldGFkYXRhLmFzcGVjdFJhdGlvIGFzIFJFQUwpIC0gPykgIDwgMC4xICkpICI7 CisgICAgICAgIH0KICAgICB9Ci0gICAgZWxzZSBpZiAobmFtZSA9PSAiYXVkaW9iaXRyYXRlIikK KyAgICBlbHNlIGlmIChuYW1lID09ICJ2aWRlb2F1ZGlvYml0cmF0ZSIpCiAgICAgewotICAgICAg ICBmaWVsZFF1ZXJ5LmFkZFN0cmluZ0ZpZWxkKCJWaWRlb01ldGFkYXRhLmF1ZGlvQml0UmF0ZSIp OworICAgICAgICAvL2ZpZWxkUXVlcnkuYWRkSW50RmllbGQoIlZpZGVvTWV0YWRhdGEuYXVkaW9C aXRSYXRlIik7CisgICAgICAgIFFMaXN0PGludD4gdmFsdWVzID0gcmVhZGVyLnZhbHVlVG9JbnRM aXN0KCk7CisKKyAgICAgICAgaWYgKHZhbHVlcy5zaXplKCkgIT0gMikKKyAgICAgICAgeworICAg ICAgICAgICAga1dhcm5pbmcoKSA8PCAiUmVsYXRpb24gSW50ZXJ2YWwgcmVxdWlyZXMgYSBsaXN0 IG9mIHR3byB2YWx1ZXMiOworICAgICAgICB9CisKKyAgICAgICAgc3FsICs9ICIgKCBDQVNUKFZp ZGVvTWV0YWRhdGEuYXVkaW9CaXRSYXRlIEFTIElOVEVHRVIpIjsKKyAgICAgICAgSW1hZ2VRdWVy eUJ1aWxkZXI6OmFkZFNxbFJlbGF0aW9uKHNxbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHJlbGF0aW9uID09IFNlYXJjaFhtbDo6SW50ZXJ2YWwgPyBTZWFyY2hY bWw6OkdyZWF0ZXJUaGFuT3JFcXVhbCA6IFNlYXJjaFhtbDo6R3JlYXRlclRoYW4pOworICAgICAg ICBzcWwgKz0gIiA/IEFORCBDQVNUKFZpZGVvTWV0YWRhdGEuYXVkaW9CaXRSYXRlIEFTIElOVEVH RVIpIjsKKyAgICAgICAgSW1hZ2VRdWVyeUJ1aWxkZXI6OmFkZFNxbFJlbGF0aW9uKHNxbCwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlbGF0aW9uID09IFNlYXJj aFhtbDo6SW50ZXJ2YWwgPyBTZWFyY2hYbWw6Okxlc3NUaGFuT3JFcXVhbCA6IFNlYXJjaFhtbDo6 TGVzc1RoYW4pOworICAgICAgICBzcWwgKz0gIiA/KSAiOworCisgICAgICAgICpib3VuZFZhbHVl cyA8PCB2YWx1ZXMuZmlyc3QoKSA8PCB2YWx1ZXMubGFzdCgpOwogICAgIH0KLSAgICBlbHNlIGlm IChuYW1lID09ICJhdWRpb2NoYW5uZWx0eXBlIikKKyAgICBlbHNlIGlmIChuYW1lID09ICJ2aWRl b2F1ZGlvY2hhbm5lbHR5cGUiKQogICAgIHsKLSAgICAgICAgZmllbGRRdWVyeS5hZGRTdHJpbmdG aWVsZCgiVmlkZW9NZXRhZGF0YS5hdWRpb0NoYW5uZWxUeXBlIik7CisgICAgICAgIGlmIChyZWxh dGlvbiA9PSBTZWFyY2hYbWw6Ok9uZU9mKQorICAgICAgICB7CisgICAgICAgICAgICBRU3RyaW5n TGlzdCB2YWx1ZXMgPSByZWFkZXIudmFsdWVUb1N0cmluZ0xpc3QoKTsKKworICAgICAgICAgICAg aWYgKHZhbHVlcy5pc0VtcHR5KCkpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAga0Rl YnVnKCkgPDwgIkxpc3QgZm9yIE9uZU9mIGlzIGVtcHR5IjsKKyAgICAgICAgICAgIH0KKworICAg ICAgICAgICAgZm9yZWFjaChjb25zdCBRU3RyaW5nJiB2YWx1ZSwgdmFsdWVzKQorICAgICAgICAg ICAgeworICAgICAgICAgICAgICAgICAqYm91bmRWYWx1ZXMgPDwgdmFsdWU7CisKKyAgICAgICAg ICAgICAgICAgaWYgKHZhbHVlPT0iMSIpCisgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICAgICAgICpib3VuZFZhbHVlcyA8PCAiTW9ubyI7CisgICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICAgZWxzZSBpZiAodmFsdWUgPT0gIjIiKQorICAgICAgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgICAgICAqYm91bmRWYWx1ZXMgPDwgIlN0ZXJlbyI7CisgICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgc3FsICs9ICIoVmlkZW9N ZXRhZGF0YS5hdWRpb0NoYW5uZWxUeXBlIElOICgiOworICAgICAgICAgICAgQWxidW1EQjo6YWRk Qm91bmRWYWx1ZVBsYWNlaG9sZGVycyhzcWwsIGJvdW5kVmFsdWVzLT5zaXplKCkpOworICAgICAg ICAgICAgc3FsICs9ICIpKSAiOworICAgICAgICB9CisgICAgICAgIGVsc2UKKyAgICAgICAgewor ICAgICAgICAgICAgUVN0cmluZyB2YWx1ZSA9IHJlYWRlci52YWx1ZSgpOworICAgICAgICAgICAg KmJvdW5kVmFsdWVzIDw8IHZhbHVlOworCisgICAgICAgICAgICBpZiAodmFsdWU9PSIxIikKKyAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAqYm91bmRWYWx1ZXMgPDwgIk1vbm8iOworICAg ICAgICAgICAgfQorICAgICAgICAgICAgZWxzZSBpZiAodmFsdWUgPT0gIjIiKQorICAgICAgICAg ICAgeworICAgICAgICAgICAgICAgICpib3VuZFZhbHVlcyA8PCAiU3RlcmVvIjsKKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgc3FsICs9ICIoVmlkZW9NZXRhZGF0YS5hdWRpb0NoYW5uZWxU eXBlIElOICgiOworICAgICAgICAgICAgQWxidW1EQjo6YWRkQm91bmRWYWx1ZVBsYWNlaG9sZGVy cyhzcWwsIGJvdW5kVmFsdWVzLT5zaXplKCkpOworICAgICAgICAgICAgc3FsICs9ICIpKSAiOwor ICAgICAgICB9CiAgICAgfQotICAgIGVsc2UgaWYgKG5hbWUgPT0gImF1ZGlvY29tcHJlc3NvciIp CisgICAgZWxzZSBpZiAobmFtZSA9PSAidmlkZW9hdWRpb2NvbXByZXNzb3IiKQogICAgIHsKLSAg ICAgICAgZmllbGRRdWVyeS5hZGRTdHJpbmdGaWVsZCgiVmlkZW9NZXRhZGF0YS5hdWRpb0NvbXBy ZXNzb3IiKTsKKyAgICAgICAgZmllbGRRdWVyeS5hZGRDaG9pY2VTdHJpbmdGaWVsZCgiVmlkZW9N ZXRhZGF0YS5hdWRpb0NvbXByZXNzb3IiKTsKICAgICB9Ci0gICAgZWxzZSBpZiAobmFtZSA9PSAi ZHVyYXRpb24iKQorICAgIGVsc2UgaWYgKG5hbWUgPT0gInZpZGVvZHVyYXRpb24iKQogICAgIHsK LSAgICAgICAgZmllbGRRdWVyeS5hZGRTdHJpbmdGaWVsZCgiVmlkZW9NZXRhZGF0YS5kdXJhdGlv biIpOworICAgICAgICBRTGlzdDxpbnQ+IHZhbHVlcyA9IHJlYWRlci52YWx1ZVRvSW50TGlzdCgp OworCisgICAgICAgIGlmICh2YWx1ZXMuc2l6ZSgpICE9IDIpCisgICAgICAgIHsKKyAgICAgICAg ICAgIGtXYXJuaW5nKCkgPDwgIlJlbGF0aW9uIEludGVydmFsIHJlcXVpcmVzIGEgbGlzdCBvZiB0 d28gdmFsdWVzIjsKKyAgICAgICAgfQorCisgICAgICAgIHNxbCArPSAiICggQ0FTVChWaWRlb01l dGFkYXRhLmR1cmF0aW9uIEFTIElOVEVHRVIpIjsKKyAgICAgICAgSW1hZ2VRdWVyeUJ1aWxkZXI6 OmFkZFNxbFJlbGF0aW9uKHNxbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHJlbGF0aW9uID09IFNlYXJjaFhtbDo6SW50ZXJ2YWwgPyBTZWFyY2hYbWw6OkdyZWF0 ZXJUaGFuT3JFcXVhbCA6IFNlYXJjaFhtbDo6R3JlYXRlclRoYW4pOworICAgICAgICBzcWwgKz0g IiA/IEFORCBDQVNUKFZpZGVvTWV0YWRhdGEuZHVyYXRpb24gQVMgSU5URUdFUikiOworICAgICAg ICBJbWFnZVF1ZXJ5QnVpbGRlcjo6YWRkU3FsUmVsYXRpb24oc3FsLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVsYXRpb24gPT0gU2VhcmNoWG1sOjpJbnRlcnZh bCA/IFNlYXJjaFhtbDo6TGVzc1RoYW5PckVxdWFsIDogU2VhcmNoWG1sOjpMZXNzVGhhbik7Cisg ICAgICAgIHNxbCArPSAiID8pICI7CisKKyAgICAgICAgKmJvdW5kVmFsdWVzIDw8IHZhbHVlcy5m aXJzdCgpKjEwMDAgPDwgdmFsdWVzLmxhc3QoKSoxMDAwOwogICAgIH0KLSAgICBlbHNlIGlmIChu YW1lID09ICJmcmFtZXJhdGUiKQorICAgIGVsc2UgaWYgKG5hbWUgPT0gInZpZGVvZnJhbWVyYXRl IikKICAgICB7Ci0gICAgICAgIGZpZWxkUXVlcnkuYWRkU3RyaW5nRmllbGQoIlZpZGVvTWV0YWRh dGEuZnJhbWVSYXRlIik7CisgICAgICAgIC8vZmllbGRRdWVyeS5hZGRDaG9pY2VTdHJpbmdGaWVs ZCgiVmlkZW9NZXRhZGF0YS5mcmFtZVJhdGUiKTsKKyAgICAgICAgUUxpc3Q8ZG91YmxlPiB2YWx1 ZXMgPSByZWFkZXIudmFsdWVUb0RvdWJsZUxpc3QoKTsKKworICAgICAgICBpZiAodmFsdWVzLnNp emUoKSAhPSAyKQorICAgICAgICB7CisgICAgICAgICAgICBrV2FybmluZygpIDw8ICJSZWxhdGlv biBJbnRlcnZhbCByZXF1aXJlcyBhIGxpc3Qgb2YgdHdvIHZhbHVlcyI7CisgICAgICAgIH0KKwor ICAgICAgICBzcWwgKz0gIiAoIENBU1QoVmlkZW9NZXRhZGF0YS5mcmFtZVJhdGUgQVMgUkVBTCki OworICAgICAgICBJbWFnZVF1ZXJ5QnVpbGRlcjo6YWRkU3FsUmVsYXRpb24oc3FsLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVsYXRpb24gPT0gU2VhcmNoWG1s OjpJbnRlcnZhbCA/IFNlYXJjaFhtbDo6R3JlYXRlclRoYW5PckVxdWFsIDogU2VhcmNoWG1sOjpH cmVhdGVyVGhhbik7CisgICAgICAgIHNxbCArPSAiID8gQU5EIENBU1QoVmlkZW9NZXRhZGF0YS5m cmFtZVJhdGUgQVMgUkVBTCkiOworICAgICAgICBJbWFnZVF1ZXJ5QnVpbGRlcjo6YWRkU3FsUmVs YXRpb24oc3FsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVs YXRpb24gPT0gU2VhcmNoWG1sOjpJbnRlcnZhbCA/IFNlYXJjaFhtbDo6TGVzc1RoYW5PckVxdWFs IDogU2VhcmNoWG1sOjpMZXNzVGhhbik7CisgICAgICAgIHNxbCArPSAiID8pICI7CisKKyAgICAg ICAgKmJvdW5kVmFsdWVzIDw8IHZhbHVlcy5maXJzdCgpIDw8IHZhbHVlcy5sYXN0KCk7CiAgICAg fQogICAgIGVsc2UgaWYgKG5hbWUgPT0gInZpZGVvY29kZWMiKQogICAgIHsKLSAgICAgICAgZmll bGRRdWVyeS5hZGRTdHJpbmdGaWVsZCgiVmlkZW9NZXRhZGF0YS52aWRlb0NvZGVjIik7CisgICAg ICAgIGlmIChyZWxhdGlvbiA9PSBTZWFyY2hYbWw6Ok9uZU9mKQorICAgICAgICB7CisgICAgICAg ICAgICBRU3RyaW5nTGlzdCB2YWx1ZXMgPSByZWFkZXIudmFsdWVUb1N0cmluZ0xpc3QoKTsKKwor ICAgICAgICAgICAgaWYgKHZhbHVlcy5pc0VtcHR5KCkpCisgICAgICAgICAgICB7CisgICAgICAg ICAgICAgICAga0RlYnVnKCkgPDwgIkxpc3QgZm9yIE9uZU9mIGlzIGVtcHR5IjsKKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgZm9yZWFjaChjb25zdCBRU3RyaW5nJiB2YWx1ZSwgdmFsdWVz KQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHNxbCArPSAiKCBVcHBlcihWaWRlb01l dGFkYXRhLnZpZGVvQ29kZWMpIExJS0UgJyUiICsgdmFsdWUudG9VcHBlcigpICsgIiUnICI7Cisg ICAgICAgICAgICAgICAgaWYgKHZhbHVlIT12YWx1ZXMubGFzdCgpKQorICAgICAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICAgICAgc3FsICs9ICJPUiAiOworICAgICAgICAgICAgICAgIH0K KyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHNxbCArPSAiKSAiOworICAgICAgICB9CisgICAg ICAgIGVsc2UKKyAgICAgICAgeworICAgICAgICAgICAgUVN0cmluZyB2YWx1ZSA9IHJlYWRlci52 YWx1ZSgpOworICAgICAgICAgICAgc3FsICs9ICIoVXBwZXIoVmlkZW9NZXRhZGF0YS52aWRlb0Nv ZGVjKSBMSUtFICclIiArIHZhbHVlLnRvVXBwZXIoKSArICIlJykgIjsKKyAgICAgICAgfQogICAg IH0KICAgICBlbHNlIGlmIChuYW1lID09ICJtYWtlIikKICAgICB7CmRpZmYgLS1naXQgYS91dGls aXRpZXMvc2VhcmNod2luZG93L3NlYXJjaGZpZWxkcy5jcHAgYi91dGlsaXRpZXMvc2VhcmNod2lu ZG93L3NlYXJjaGZpZWxkcy5jcHAKaW5kZXggMjhlYTgzNy4uNGU3YjkzYiAxMDA2NDQKLS0tIGEv dXRpbGl0aWVzL3NlYXJjaHdpbmRvdy9zZWFyY2hmaWVsZHMuY3BwCisrKyBiL3V0aWxpdGllcy9z ZWFyY2h3aW5kb3cvc2VhcmNoZmllbGRzLmNwcApAQCAtNTYwLDYgKzU2MCwxMjAgQEAgU2VhcmNo RmllbGQqIFNlYXJjaEZpZWxkOjpjcmVhdGVGaWVsZChjb25zdCBRU3RyaW5nJiBuYW1lLCBTZWFy Y2hGaWVsZEdyb3VwKiBjb24KICAgICAgICAgZmllbGQtPnNldEJvdW5kYXJ5KDEsIDIwMDAwMDAw MDAsIDEwMCk7CiAgICAgICAgIHJldHVybiBmaWVsZDsKICAgICB9CisKKworICAgIGVsc2UgaWYg KG5hbWUgPT0gInZpZGVvYXNwZWN0cmF0aW8iKQorICAgIHsKKyAgICAgICAgU2VhcmNoRmllbGRD aG9pY2UqIGZpZWxkID0gbmV3IFNlYXJjaEZpZWxkQ2hvaWNlKHBhcmVudCk7CisgICAgICAgIGZp ZWxkLT5zZXRGaWVsZE5hbWUobmFtZSk7CisgICAgICAgIGZpZWxkLT5zZXRUZXh0KGkxOG4oIkFz cGVjdCBSYXRpbyIpLCBpMThuKCJSZXR1cm4gdmlkZW8gd2l0aCB0aGUgZnJhbWUgYXNwZWN0IHJh dGlvIikpOworICAgICAgICBRU3RyaW5nTGlzdCByYXRpbzsKKyAgICAgICAgcmF0aW8gPDwgIjQ6 MyI8PCAiNDozIjsKKyAgICAgICAgcmF0aW8gPDwgIjM6MiI8PCAiMzoyIjsKKyAgICAgICAgcmF0 aW8gPDwgIjE2OjkiIDw8ICIxNjo5IjsKKyAgICAgICAgcmF0aW8gPDwgIjI6MSIgPDwgIjI6MSI7 CisgICAgICAgIC8vIFRPRE86IGFkZCBtb3JlIHBvc3NpYmxlIGFzcGVjdCByYXRpbworICAgICAg ICBmaWVsZC0+c2V0Q2hvaWNlKHJhdGlvKTsKKyAgICAgICAgcmV0dXJuIGZpZWxkOworICAgIH0K KyAgICBlbHNlIGlmIChuYW1lID09ICJ2aWRlb2R1cmF0aW9uIikKKyAgICB7CisgICAgICAgIFNl YXJjaEZpZWxkUmFuZ2VJbnQqIGZpZWxkID0gbmV3IFNlYXJjaEZpZWxkUmFuZ2VJbnQocGFyZW50 KTsKKyAgICAgICAgZmllbGQtPnNldEZpZWxkTmFtZShuYW1lKTsKKyAgICAgICAgZmllbGQtPnNl dFRleHQoaTE4bigiRHVyYXRpb24iKSwgaTE4bigiTGVuZ2h0IG9mIHRoZSB2aWRlbyIpKTsKKyAg ICAgICAgZmllbGQtPnNldEJldHdlZW5UZXh0KGkxOG5jKCJGaW5kIHZpZGVvIHdpdGggYSBsZW5n aHQgYmV0d2Vlbi4uLmFuZC4uLiIsICJhbmQiKSk7CisgICAgICAgIGZpZWxkLT5zZXROdW1iZXJQ cmVmaXhBbmRTdWZmaXgoUVN0cmluZygpLCBpMThuYygiU2Vjb25kcyIsICJzIikpOworICAgICAg ICBmaWVsZC0+c2V0Qm91bmRhcnkoMSwgMTAwMDAsIDEwMCk7CisgICAgICAgIGZpZWxkLT5zZXRT dWdnZXN0ZWRWYWx1ZXMoUUxpc3Q8aW50PigpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgPDwgMTAgPDwgMzAgPDwgNjAgPDwgOTAgPDwgMTIwIDw8IDI0MCA8PCAzNjAgPDwgNTAw IDw8IDEwMDAgPDwgMjAwMAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDw8IDMw MDAgPDwgNDAwMCA8PCA1MDAwIDw8IDYwMDAgPDwgNzAwMCA8PCA4MDAwIDw8IDkwMDAgPDwgMTAw MDAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBUT0RPIDogYWRqdXN0IGRl ZmF1bHQgdmFsdWVzCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICApOworICAgICAg ICBmaWVsZC0+c2V0U3VnZ2VzdGVkSW5pdGlhbFZhbHVlKDEwKTsKKyAgICAgICAgZmllbGQtPnNl dFNpbmdsZVN0ZXBzKDEwLCAxMDApOworICAgICAgICByZXR1cm4gZmllbGQ7CisgICAgfQorICAg IGVsc2UgaWYgKG5hbWUgPT0gInZpZGVvZnJhbWVyYXRlIikKKyAgICB7CisgICAgICAgIFNlYXJj aEZpZWxkUmFuZ2VJbnQqIGZpZWxkID0gbmV3IFNlYXJjaEZpZWxkUmFuZ2VJbnQocGFyZW50KTsK KyAgICAgICAgZmllbGQtPnNldEZpZWxkTmFtZShuYW1lKTsKKyAgICAgICAgZmllbGQtPnNldFRl eHQoaTE4bigiRnJhbWUgUmF0ZSIpLCBpMThuKCJSZXR1cm4gdmlkZW8gd2l0aCB0aGUgZnJhbWUg cmF0ZSIpKTsKKyAgICAgICAgZmllbGQtPnNldEJldHdlZW5UZXh0KGkxOG5jKCJGaW5kIHZpZGVv IHdpdGggZnJhbWUgcmF0ZSBiZXR3ZWVuLi4uYW5kLi4uIiwgImFuZCIpKTsKKyAgICAgICAgZmll bGQtPnNldE51bWJlclByZWZpeEFuZFN1ZmZpeChRU3RyaW5nKCksIGkxOG5jKCJGcmFtZXMgcGVy IFNlY29uZCIsICJmcHMiKSk7CisgICAgICAgIGZpZWxkLT5zZXRCb3VuZGFyeSgxMCwgNjAsIDUp OworICAgICAgICBmaWVsZC0+c2V0U3VnZ2VzdGVkVmFsdWVzKFFMaXN0PGludD4oKQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDw8IDEwIDw8IDE1IDw8IDIwIDw8IDI1IDw8IDMw IDw8IDM1IDw8IDQwIDw8IDQ1IDw8IDU1IDw8IDYwCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgLy8gVE9ETyA6IGFkanVzdCBkZWZhdWx0IHZhbHVlcworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKTsKKyAgICAgICAgZmllbGQtPnNldFN1Z2dlc3RlZEluaXRpYWxW YWx1ZSgxMCk7CisgICAgICAgIGZpZWxkLT5zZXRTaW5nbGVTdGVwcyg1LCA2MCk7CisgICAgICAg IHJldHVybiBmaWVsZDsKKyAgICB9CisgICAgZWxzZSBpZiAobmFtZSA9PSAidmlkZW9jb2RlYyIp CisgICAgeworICAgICAgICBTZWFyY2hGaWVsZENob2ljZSogZmllbGQgPSBuZXcgU2VhcmNoRmll bGRDaG9pY2UocGFyZW50KTsKKyAgICAgICAgZmllbGQtPnNldEZpZWxkTmFtZShuYW1lKTsKKyAg ICAgICAgZmllbGQtPnNldFRleHQoaTE4bigiQ29kZWMiKSwgaTE4bigiUmV0dXJuIHZpZGVvIGNv ZGVjIikpOworICAgICAgICBRU3RyaW5nTGlzdCBjb2RlYzsKKyAgICAgICAgY29kZWMgPDwgImF2 aSIgIDw8ICJBdWRpbyBWaWRlbyBJbnRlcmxlYXZlIjsKKyAgICAgICAgY29kZWMgPDwgIm1vdiIg IDw8ICJRdWlja1RpbWUiOworICAgICAgICBjb2RlYyA8PCAibXA0IiAgPDwgIk1QRUcgTGF5ZXIg NCI7CisgICAgICAgIGNvZGVjIDw8ICIzZ3AiICA8PCAiM0dQUCI7CisgICAgICAgIGNvZGVjIDw8 ICJkaXZ4IiA8PCAiRGl2WCI7CisgICAgICAgIGNvZGVjIDw8ICJ3bWEiICA8PCAiV2luZG93cyBN ZWRpYSBWaWRlbyI7CisgICAgICAgIGNvZGVjIDw8ICJta3YiICA8PCAiTWF0cm9za2EiOworICAg ICAgICBjb2RlYyA8PCAiczI2MyIgPDwgIkguMjYzIjsKKyAgICAgICAgY29kZWMgPDwgIm1qcGci IDw8ICJNb3Rpb24gSlBFRyI7CisgICAgICAgIC8vIFRPRE86IGFkZCBtb3JlIHBvc3NpYmxlIGNv ZGVjCisgICAgICAgIGZpZWxkLT5zZXRDaG9pY2UoY29kZWMpOworICAgICAgICByZXR1cm4gZmll bGQ7CisgICAgfQorICAgIGVsc2UgaWYgKG5hbWUgPT0gInZpZGVvYXVkaW9iaXRyYXRlIikKKyAg ICB7CisgICAgICAgIFNlYXJjaEZpZWxkUmFuZ2VJbnQqIGZpZWxkID0gbmV3IFNlYXJjaEZpZWxk UmFuZ2VJbnQocGFyZW50KTsKKyAgICAgICAgZmllbGQtPnNldEZpZWxkTmFtZShuYW1lKTsKKyAg ICAgICAgZmllbGQtPnNldFRleHQoaTE4bigiQXVkaW8gQml0IFJhdGUiKSwgaTE4bigiUmV0dXJu IHZpZGVvIGF1ZGlvIGJpdHMgcmF0ZSIpKTsKKyAgICAgICAgZmllbGQtPnNldEJldHdlZW5UZXh0 KGkxOG5jKCJGaW5kIHZpZGVvIHdpdGggYXVkaW8gYml0IHJhdGUgYmV0d2Vlbi4uLmFuZC4uLiIs ICJhbmQiKSk7CisgICAgICAgIGZpZWxkLT5zZXROdW1iZXJQcmVmaXhBbmRTdWZmaXgoUVN0cmlu ZygpLCBpMThuYygiQml0cyBwZXIgU2Vjb25kIiwgImJwcyIpKTsKKyAgICAgICAgZmllbGQtPnNl dEJvdW5kYXJ5KDEwMDAsIDEwMDAwMCwgMTAwMCk7CisgICAgICAgIGZpZWxkLT5zZXRTdWdnZXN0 ZWRWYWx1ZXMoUUxpc3Q8aW50PigpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg PDwgMTAwMCA8PCA0MDAwIDw8IDgwMDAgPDwgMTIwMDAgPDwgMTYwMDAgPDwgMjAwMDAgPDwgMzAw MDAgPDwgNDAwMDAgPDwgNTAwMDAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8 PCA2MDAwMCA8PCA3MDAwMDAgPDwgODAwMDAwIDw8IDkwMDAwMCA8PCAxMDAwMDAKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBUT0RPIDogYWRqdXN0IGRlZmF1bHQgdmFsdWVz CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICApOworICAgICAgICBmaWVsZC0+c2V0 U3VnZ2VzdGVkSW5pdGlhbFZhbHVlKDEwMDApOworICAgICAgICBmaWVsZC0+c2V0U2luZ2xlU3Rl cHMoMTAwMCwgMTAwMCk7CisgICAgICAgIHJldHVybiBmaWVsZDsKKyAgICB9CisgICAgZWxzZSBp ZiAobmFtZSA9PSAidmlkZW9hdWRpb2NoYW5uZWx0eXBlIikKKyAgICB7CisgICAgICAgIFNlYXJj aEZpZWxkQ2hvaWNlKiBmaWVsZCA9IG5ldyBTZWFyY2hGaWVsZENob2ljZShwYXJlbnQpOworICAg ICAgICBmaWVsZC0+c2V0RmllbGROYW1lKG5hbWUpOworICAgICAgICBmaWVsZC0+c2V0VGV4dChp MThuKCJBdWRpbyBDaGFubmVsIFR5cGUiKSwgaTE4bigiUmV0dXJuIHZpZGVvIGF1ZGlvIENoYW5u ZWwgVHlwZSIpKTsKKyAgICAgICAgUVN0cmluZ0xpc3QgdHlwZTsKKyAgICAgICAgdHlwZSA8PCAi MSIgPDwgaTE4bigiTW9ubyIpOworICAgICAgICB0eXBlIDw8ICIyIiA8PCBpMThuKCJTdGVyZW8i KTsKKyAgICAgICAgLy8gVE9ETzogYWRkIG1vcmUgcG9zc2libGUgYXVkaW8gY2hhbm5lbCB0eXBl CisgICAgICAgIGZpZWxkLT5zZXRDaG9pY2UodHlwZSk7CisgICAgICAgIHJldHVybiBmaWVsZDsK KyAgICB9CisgICAgZWxzZSBpZiAobmFtZSA9PSAidmlkZW9hdWRpb2NvbXByZXNzb3IiKQorICAg IHsKKyAgICAgICAgU2VhcmNoRmllbGRDaG9pY2UqIGZpZWxkID0gbmV3IFNlYXJjaEZpZWxkQ2hv aWNlKHBhcmVudCk7CisgICAgICAgIGZpZWxkLT5zZXRGaWVsZE5hbWUobmFtZSk7CisgICAgICAg IGZpZWxkLT5zZXRUZXh0KGkxOG4oIkF1ZGlvIENvbXByZXNzb3IiKSwgaTE4bigiUmV0dXJuIHZp ZGVvIGF1ZGlvIENvbXByZXNzb3IiKSk7CisgICAgICAgIFFTdHJpbmdMaXN0IHR5cGU7CisgICAg ICAgIHR5cGUgPDwgInJhdyIgPDwgIlJBVyI7CisgICAgICAgIHR5cGUgPDwgIm1wMyIgPDwgIk1Q RUcgTGF5ZXIgMyI7CisgICAgICAgIHR5cGUgPDwgIm1wNGEiIDw8ICJNUEVHNCBBdWRpbyI7Cisg ICAgICAgIHR5cGUgPDwgInNhbXIiIDw8ICJBZGFwdGl2ZSBNdWx0aS1yYXRlIEF1ZGlvIjsKKyAg ICAgICAgdHlwZSA8PCAic293dCIgPDwgIkFwcGxlIFF1aWNrVGltZSBTV09UIExpdHRsZSBFbmRp YW4gUENNIEF1ZGlvIjsKKyAgICAgICAgdHlwZSA8PCAiTWljcm9zb2Z0IFBDTSIgPDwgIk1pY3Jv c29mdCBQQ00iOworICAgICAgICAvLyBUT0RPOiBhZGQgbW9yZSBwb3NzaWJsZSBhdWRpbyBjb21w cmVzc29yCisgICAgICAgIGZpZWxkLT5zZXRDaG9pY2UodHlwZSk7CisgICAgICAgIHJldHVybiBm aWVsZDsKKyAgICB9CisKICAgICBlbHNlCiAgICAgewogICAgICAgICBrV2FybmluZygpIDw8ICJT ZWFyY2hGaWVsZDo6Y3JlYXRlRmllbGQ6IGNhbm5vdCBjcmVhdGUgU2VhcmNoRmllbGQgZm9yIiA8 PCBuYW1lOwpkaWZmIC0tZ2l0IGEvdXRpbGl0aWVzL3NlYXJjaHdpbmRvdy9zZWFyY2hncm91cC5j cHAgYi91dGlsaXRpZXMvc2VhcmNod2luZG93L3NlYXJjaGdyb3VwLmNwcAppbmRleCBhYjMwZWJk Li4wZTUzYzhkIDEwMDY0NAotLS0gYS91dGlsaXRpZXMvc2VhcmNod2luZG93L3NlYXJjaGdyb3Vw LmNwcAorKysgYi91dGlsaXRpZXMvc2VhcmNod2luZG93L3NlYXJjaGdyb3VwLmNwcApAQCAtMTM4 LDYgKzEzOCwyNiBAQCB2b2lkIFNlYXJjaEdyb3VwOjpzZXR1cChUeXBlIHR5cGUpCiAgICAgLy8g LS0tLS0gLy8KIAogICAgIGxhYmVsID0gbmV3IFNlYXJjaEZpZWxkR3JvdXBMYWJlbCh0aGlzKTsK KyAgICBsYWJlbC0+c2V0VGl0bGUoaTE4bigiVmlkZW8gUHJvcGVydGllcyIpKTsKKyAgICBncm91 cCA9IG5ldyBTZWFyY2hGaWVsZEdyb3VwKHRoaXMpOworICAgIGdyb3VwLT5zZXRMYWJlbChsYWJl bCk7CisKKyAgICBncm91cC0+YWRkRmllbGQoU2VhcmNoRmllbGQ6OmNyZWF0ZUZpZWxkKCJ2aWRl b2FzcGVjdHJhdGlvIiwgZ3JvdXApKTsKKyAgICBncm91cC0+YWRkRmllbGQoU2VhcmNoRmllbGQ6 OmNyZWF0ZUZpZWxkKCJ2aWRlb2R1cmF0aW9uIiwgZ3JvdXApKTsKKyAgICBncm91cC0+YWRkRmll bGQoU2VhcmNoRmllbGQ6OmNyZWF0ZUZpZWxkKCJ2aWRlb2ZyYW1lcmF0ZSIsIGdyb3VwKSk7Cisg ICAgZ3JvdXAtPmFkZEZpZWxkKFNlYXJjaEZpZWxkOjpjcmVhdGVGaWVsZCgidmlkZW9jb2RlYyIs IGdyb3VwKSk7CisgICAgZ3JvdXAtPmFkZEZpZWxkKFNlYXJjaEZpZWxkOjpjcmVhdGVGaWVsZCgi dmlkZW9hdWRpb2JpdHJhdGUiLCBncm91cCkpOworICAgIGdyb3VwLT5hZGRGaWVsZChTZWFyY2hG aWVsZDo6Y3JlYXRlRmllbGQoInZpZGVvYXVkaW9jaGFubmVsdHlwZSIsIGdyb3VwKSk7CisgICAg Z3JvdXAtPmFkZEZpZWxkKFNlYXJjaEZpZWxkOjpjcmVhdGVGaWVsZCgidmlkZW9hdWRpb2NvbXBy ZXNzb3IiLCBncm91cCkpOworCisgICAgbV9maWVsZExhYmVscyA8PCBsYWJlbDsKKyAgICBtX2Zp ZWxkR3JvdXBzIDw8IGdyb3VwOworICAgIG1fbGF5b3V0LT5hZGRXaWRnZXQobGFiZWwpOworICAg IG1fbGF5b3V0LT5hZGRXaWRnZXQoZ3JvdXApOworCisgICAgLy8gLS0tLS0gLy8KKworICAgIGxh YmVsID0gbmV3IFNlYXJjaEZpZWxkR3JvdXBMYWJlbCh0aGlzKTsKICAgICBsYWJlbC0+c2V0VGl0 bGUoaTE4bigiQ2FwdGlvbiwgQ29tbWVudCwgVGl0bGUiKSk7CiAgICAgZ3JvdXAgPSBuZXcgU2Vh cmNoRmllbGRHcm91cCh0aGlzKTsKICAgICBncm91cC0+c2V0TGFiZWwobGFiZWwpOwpkaWZmIC0t Z2l0IGEvdXRpbGl0aWVzL3NlYXJjaHdpbmRvdy9zZWFyY2h2aWV3LmNwcCBiL3V0aWxpdGllcy9z ZWFyY2h3aW5kb3cvc2VhcmNodmlldy5jcHAKaW5kZXggZDI1OGM4MS4uNDdkM2Y2NiAxMDA2NDQK LS0tIGEvdXRpbGl0aWVzL3NlYXJjaHdpbmRvdy9zZWFyY2h2aWV3LmNwcAorKysgYi91dGlsaXRp ZXMvc2VhcmNod2luZG93L3NlYXJjaHZpZXcuY3BwCkBAIC0yOTUsNiArMjk1LDcgQEAgUVN0cmlu ZyBTZWFyY2hWaWV3Ojp3cml0ZSgpIGNvbnN0CiAgICAgU2VhcmNoWG1sV3JpdGVyIHdyaXRlcjsK ICAgICB3cml0ZUdyb3Vwcyh3cml0ZXIpOwogICAgIHdyaXRlci5maW5pc2goKTsKKyAgICBrRGVi dWcoKSA8PCB3cml0ZXIueG1sKCk7CiAgICAgcmV0dXJuIHdyaXRlci54bWwoKTsKIH0KIAo=