X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fasf.c;h=ec34b5010d334cedb9d8bde258a07f7e14956fc7;hb=2ded57371abead879bcee56da5131e5fac0d17ef;hp=20bfd8de1e57aab1438913108f187956ab9aea21;hpb=88b51ea9483bca1fa21795d07677d733e1f6a042;p=ffmpeg diff --git a/libavformat/asf.c b/libavformat/asf.c index 20bfd8de1e5..ec34b5010d3 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -1,26 +1,25 @@ /* * Copyright (c) 2000, 2001 Fabrice Bellard * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "asf.h" - const ff_asf_guid ff_asf_header = { 0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C }; @@ -48,13 +47,17 @@ const ff_asf_guid ff_asf_audio_conceal_none = { }; const ff_asf_guid ff_asf_audio_conceal_spread = { - 0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20 + 0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20 }; const ff_asf_guid ff_asf_video_stream = { 0xC0, 0xEF, 0x19, 0xBC, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B }; +const ff_asf_guid ff_asf_jfif_media = { + 0x00, 0xE1, 0x1B, 0xB6, 0x4E, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B +}; + const ff_asf_guid ff_asf_video_conceal_none = { 0x00, 0x57, 0xFB, 0x20, 0x55, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B }; @@ -87,31 +90,39 @@ const ff_asf_guid ff_asf_head2_guid = { }; const ff_asf_guid ff_asf_extended_content_header = { - 0x40, 0xA4, 0xD0, 0xD2, 0x07, 0xE3, 0xD2, 0x11, 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50 + 0x40, 0xA4, 0xD0, 0xD2, 0x07, 0xE3, 0xD2, 0x11, 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50 }; const ff_asf_guid ff_asf_simple_index_header = { - 0x90, 0x08, 0x00, 0x33, 0xB1, 0xE5, 0xCF, 0x11, 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB + 0x90, 0x08, 0x00, 0x33, 0xB1, 0xE5, 0xCF, 0x11, 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB }; const ff_asf_guid ff_asf_ext_stream_embed_stream_header = { - 0xe2, 0x65, 0xfb, 0x3a, 0xEF, 0x47, 0xF2, 0x40, 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43 + 0xe2, 0x65, 0xfb, 0x3a, 0xEF, 0x47, 0xF2, 0x40, 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43 }; const ff_asf_guid ff_asf_ext_stream_audio_stream = { - 0x9d, 0x8c, 0x17, 0x31, 0xE1, 0x03, 0x28, 0x45, 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03 + 0x9d, 0x8c, 0x17, 0x31, 0xE1, 0x03, 0x28, 0x45, 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03 }; const ff_asf_guid ff_asf_metadata_header = { - 0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca + 0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca +}; + +const ff_asf_guid ff_asf_metadata_library_header = { + 0x94, 0x1c, 0x23, 0x44, 0x98, 0x94, 0xd1, 0x49, 0xa1, 0x41, 0x1d, 0x13, 0x4e, 0x45, 0x70, 0x54 }; const ff_asf_guid ff_asf_marker_header = { - 0x01, 0xCD, 0x87, 0xF4, 0x51, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 + 0x01, 0xCD, 0x87, 0xF4, 0x51, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 +}; + +const ff_asf_guid ff_asf_reserved_4 = { + 0x20, 0xdb, 0xfe, 0x4c, 0xf6, 0x75, 0xCF, 0x11, 0x9c, 0x0f, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb }; /* I am not a number !!! This GUID is the one found on the PC used to - generate the stream */ + * generate the stream */ const ff_asf_guid ff_asf_my_guid = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -134,21 +145,23 @@ const ff_asf_guid ff_asf_digital_signature = { /* List of official tags at http://msdn.microsoft.com/en-us/library/dd743066(VS.85).aspx */ const AVMetadataConv ff_asf_metadata_conv[] = { - { "WM/AlbumArtist" , "album_artist"}, - { "WM/AlbumTitle" , "album " }, - { "Author" , "artist" }, - { "Description" , "comment" }, - { "WM/Composer" , "composer" }, - { "WM/EncodedBy" , "encoded_by" }, - { "WM/EncodingSettings", "encoder" }, - { "WM/Genre" , "genre" }, - { "WM/Language" , "language" }, - { "WM/OriginalFilename", "filename" }, - { "WM/PartOfSet" , "disc" }, - { "WM/Publisher" , "publisher" }, - { "WM/Tool" , "encoder" }, - { "WM/TrackNumber" , "track" }, - { "WM/Track" , "track" }, + { "WM/AlbumArtist", "album_artist" }, + { "WM/AlbumTitle", "album" }, + { "Author", "artist" }, + { "Description", "comment" }, + { "WM/Composer", "composer" }, + { "WM/EncodedBy", "encoded_by" }, + { "WM/EncodingSettings", "encoder" }, + { "WM/Genre", "genre" }, + { "WM/Language", "language" }, + { "WM/OriginalFilename", "filename" }, + { "WM/PartOfSet", "disc" }, + { "WM/Publisher", "publisher" }, + { "WM/Tool", "encoder" }, + { "WM/TrackNumber", "track" }, + { "WM/Track", "track" }, + { "WM/MediaStationCallSign", "service_provider" }, + { "WM/MediaStationName", "service_name" }, // { "Year" , "date" }, TODO: conversion year<->date { 0 } };