f9ecb849ef
* qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
76 lines
2.5 KiB
C
76 lines
2.5 KiB
C
/*
|
|
* VorbisComment writer
|
|
* Copyright (c) 2009 James Darnley
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg 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,
|
|
* 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
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "avformat.h"
|
|
#include "metadata.h"
|
|
#include "vorbiscomment.h"
|
|
#include "libavcodec/bytestream.h"
|
|
#include "libavutil/dict.h"
|
|
|
|
/**
|
|
* VorbisComment metadata conversion mapping.
|
|
* from Ogg Vorbis I format specification: comment field and header specification
|
|
* http://xiph.org/vorbis/doc/v-comment.html
|
|
*/
|
|
const AVMetadataConv ff_vorbiscomment_metadata_conv[] = {
|
|
{ "ALBUMARTIST", "album_artist"},
|
|
{ "TRACKNUMBER", "track" },
|
|
{ "DISCNUMBER", "disc" },
|
|
{ 0 }
|
|
};
|
|
|
|
int ff_vorbiscomment_length(AVDictionary *m, const char *vendor_string,
|
|
unsigned *count)
|
|
{
|
|
int len = 8;
|
|
len += strlen(vendor_string);
|
|
*count = 0;
|
|
if (m) {
|
|
AVDictionaryEntry *tag = NULL;
|
|
while ((tag = av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX))) {
|
|
len += 4 +strlen(tag->key) + 1 + strlen(tag->value);
|
|
(*count)++;
|
|
}
|
|
}
|
|
return len;
|
|
}
|
|
|
|
int ff_vorbiscomment_write(uint8_t **p, AVDictionary **m,
|
|
const char *vendor_string, const unsigned count)
|
|
{
|
|
bytestream_put_le32(p, strlen(vendor_string));
|
|
bytestream_put_buffer(p, vendor_string, strlen(vendor_string));
|
|
if (*m) {
|
|
AVDictionaryEntry *tag = NULL;
|
|
bytestream_put_le32(p, count);
|
|
while ((tag = av_dict_get(*m, "", tag, AV_DICT_IGNORE_SUFFIX))) {
|
|
unsigned int len1 = strlen(tag->key);
|
|
unsigned int len2 = strlen(tag->value);
|
|
bytestream_put_le32(p, len1+1+len2);
|
|
bytestream_put_buffer(p, tag->key, len1);
|
|
bytestream_put_byte(p, '=');
|
|
bytestream_put_buffer(p, tag->value, len2);
|
|
}
|
|
} else
|
|
bytestream_put_le32(p, 0);
|
|
return 0;
|
|
}
|