* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <strings.h>
#include "avformat.h"
#include "avio_internal.h"
#include "id3v1.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"
#include "libavutil/dict.h"
+#include "libavutil/avassert.h"
static int id3v1_set_string(AVFormatContext *s, const char *key,
uint8_t *buf, int buf_size)
buf[127] = 0xFF; /* default to unknown genre */
if ((tag = av_dict_get(s->metadata, "TCON", NULL, 0))) { //genre
for(i = 0; i <= ID3v1_GENRE_MAX; i++) {
- if (!strcasecmp(tag->value, ff_id3v1_genre_str[i])) {
+ if (!av_strcasecmp(tag->value, ff_id3v1_genre_str[i])) {
buf[127] = i;
count++;
break;
return count;
}
-/* simple formats */
+typedef struct MP3Context {
+ const AVClass *class;
+ ID3v2EncContext id3;
+ int id3v2_version;
+ int write_id3v1;
+ int64_t nb_frames_offset;
-static void id3v2_put_size(AVFormatContext *s, int size)
-{
- avio_w8(s->pb, size >> 21 & 0x7f);
- avio_w8(s->pb, size >> 14 & 0x7f);
- avio_w8(s->pb, size >> 7 & 0x7f);
- avio_w8(s->pb, size & 0x7f);
-}
+ /* index of the audio stream */
+ int audio_stream_idx;
+ /* number of attached pictures we still need to write */
+ int pics_to_write;
-static int string_is_ascii(const uint8_t *str)
+ /* audio packets are queued here until we get all the attached pictures */
+ AVPacketList *queue, *queue_end;
+} MP3Context;
+
+/* insert a dummy frame containing number of frames */
+static void mp3_write_xing(AVFormatContext *s)
{
- while (*str && *str < 128) str++;
- return !*str;
+ MP3Context *mp3 = s->priv_data;
+ AVCodecContext *codec = s->streams[mp3->audio_stream_idx]->codec;
+ int bitrate_idx = 1; // 32 kbps
+ int64_t xing_offset = (codec->channels == 2) ? 32 : 17;
+ int32_t header;
+ MPADecodeHeader mpah;
+ int srate_idx, i, channels;
+
+ if (!s->pb->seekable)
+ return;
+
+ for (i = 0; i < FF_ARRAY_ELEMS(avpriv_mpa_freq_tab); i++)
+ if (avpriv_mpa_freq_tab[i] == codec->sample_rate) {
+ srate_idx = i;
+ break;
+ }
+ if (i == FF_ARRAY_ELEMS(avpriv_mpa_freq_tab)) {
+ av_log(s, AV_LOG_ERROR, "Unsupported sample rate.\n");
+ return;
+ }
+
+ switch (codec->channels) {
+ case 1: channels = MPA_MONO; break;
+ case 2: channels = MPA_STEREO; break;
+ default: av_log(s, AV_LOG_ERROR, "Unsupported number of channels.\n"); return;
+ }
+
+ /* dummy MPEG audio header */
+ header = 0xff << 24; // sync
+ header |= (0x7 << 5 | 0x3 << 3 | 0x1 << 1 | 0x1) << 16; // sync/mpeg-1/layer 3/no crc*/
+ header |= (bitrate_idx << 4 | srate_idx << 2) << 8;
+ header |= channels << 6;
+ avio_wb32(s->pb, header);
+
+ avpriv_mpegaudio_decode_header(&mpah, header);
+
+ ffio_fill(s->pb, 0, xing_offset);
+ ffio_wfourcc(s->pb, "Xing");
+ avio_wb32(s->pb, 0x1); // only number of frames
+ mp3->nb_frames_offset = avio_tell(s->pb);
+ avio_wb32(s->pb, 0);
+
+ mpah.frame_size -= 4 + xing_offset + 4 + 4 + 4;
+ ffio_fill(s->pb, 0, mpah.frame_size);
}
-/**
- * Write a text frame with one (normal frames) or two (TXXX frames) strings
- * according to encoding (only UTF-8 or UTF-16+BOM supported).
- * @return number of bytes written or a negative error code.
- */
-static int id3v2_put_ttag(AVFormatContext *s, const char *str1, const char *str2,
- uint32_t tag, enum ID3v2Encoding enc)
+static int mp3_queue_flush(AVFormatContext *s)
{
- int len;
- uint8_t *pb;
- int (*put)(AVIOContext*, const char*);
- AVIOContext *dyn_buf;
- if (avio_open_dyn_buf(&dyn_buf) < 0)
- return AVERROR(ENOMEM);
-
- /* check if the strings are ASCII-only and use UTF16 only if
- * they're not */
- if (enc == ID3v2_ENCODING_UTF16BOM && string_is_ascii(str1) &&
- (!str2 || string_is_ascii(str2)))
- enc = ID3v2_ENCODING_ISO8859;
-
- avio_w8(dyn_buf, enc);
- if (enc == ID3v2_ENCODING_UTF16BOM) {
- avio_wl16(dyn_buf, 0xFEFF); /* BOM */
- put = avio_put_str16le;
- } else
- put = avio_put_str;
-
- put(dyn_buf, str1);
- if (str2)
- put(dyn_buf, str2);
- len = avio_close_dyn_buf(dyn_buf, &pb);
-
- avio_wb32(s->pb, tag);
- id3v2_put_size(s, len);
- avio_wb16(s->pb, 0);
- avio_write(s->pb, pb, len);
-
- av_freep(&pb);
- return len + ID3v2_HEADER_SIZE;
+ MP3Context *mp3 = s->priv_data;
+ AVPacketList *pktl;
+ int ret = 0, write = 1;
+
+ ff_id3v2_finish(&mp3->id3, s->pb);
+ mp3_write_xing(s);
+
+ while ((pktl = mp3->queue)) {
+ if (write && (ret = ff_raw_write_packet(s, &pktl->pkt)) < 0)
+ write = 0;
+ av_free_packet(&pktl->pkt);
+ mp3->queue = pktl->next;
+ av_freep(&pktl);
+ }
+ mp3->queue_end = NULL;
+ return ret;
}
-typedef struct MP3Context {
- const AVClass *class;
- int id3v2_version;
- int write_id3v1;
- int64_t nb_frames_offset;
-} MP3Context;
-
static int mp3_write_trailer(struct AVFormatContext *s)
{
uint8_t buf[ID3v1_TAG_SIZE];
MP3Context *mp3 = s->priv_data;
+ if (mp3 && mp3->pics_to_write) {
+ av_log(s, AV_LOG_WARNING, "No packets were sent for some of the "
+ "attached pictures.\n");
+ mp3_queue_flush(s);
+ }
+
/* write the id3v1 tag */
if (mp3 && mp3->write_id3v1 && id3v1_create_tag(s, buf) > 0) {
avio_write(s->pb, buf, ID3v1_TAG_SIZE);
/* write number of frames */
if (mp3 && mp3->nb_frames_offset) {
avio_seek(s->pb, mp3->nb_frames_offset, SEEK_SET);
- avio_wb32(s->pb, s->streams[0]->nb_frames);
+ avio_wb32(s->pb, s->streams[mp3->audio_stream_idx]->nb_frames);
avio_seek(s->pb, 0, SEEK_END);
}
static const AVOption options[] = {
{ "id3v2_version", "Select ID3v2 version to write. Currently 3 and 4 are supported.",
- offsetof(MP3Context, id3v2_version), FF_OPT_TYPE_INT, {.dbl = 4}, 3, 4, AV_OPT_FLAG_ENCODING_PARAM},
+ offsetof(MP3Context, id3v2_version), AV_OPT_TYPE_INT, {.dbl = 4}, 3, 4, AV_OPT_FLAG_ENCODING_PARAM},
{ "write_id3v1", "Enable ID3v1 writing. ID3v1 tags are written in UTF-8 which may not be supported by most software.",
- offsetof(MP3Context, write_id3v1), FF_OPT_TYPE_INT, {.dbl = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
+ offsetof(MP3Context, write_id3v1), AV_OPT_TYPE_INT, {.dbl = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
{ NULL },
};
.version = LIBAVUTIL_VERSION_INT,
};
-static int id3v2_check_write_tag(AVFormatContext *s, AVDictionaryEntry *t, const char table[][4],
- enum ID3v2Encoding enc)
+static int mp3_write_packet(AVFormatContext *s, AVPacket *pkt)
{
- uint32_t tag;
- int i;
-
- if (t->key[0] != 'T' || strlen(t->key) != 4)
- return -1;
- tag = AV_RB32(t->key);
- for (i = 0; *table[i]; i++)
- if (tag == AV_RB32(table[i]))
- return id3v2_put_ttag(s, t->value, NULL, tag, enc);
- return -1;
-}
+ MP3Context *mp3 = s->priv_data;
-/* insert a dummy frame containing number of frames */
-static void mp3_write_xing(AVFormatContext *s)
-{
- AVCodecContext *codec = s->streams[0]->codec;
- MP3Context *mp3 = s->priv_data;
- int bitrate_idx = 1; // 32 kbps
- int64_t xing_offset = (codec->channels == 2) ? 32 : 17;
- int32_t header;
- MPADecodeHeader mpah;
- int srate_idx, i, channels;
+ if (pkt->stream_index == mp3->audio_stream_idx) {
+ if (mp3->pics_to_write) {
+ /* buffer audio packets until we get all the pictures */
+ AVPacketList *pktl = av_mallocz(sizeof(*pktl));
+ if (!pktl)
+ return AVERROR(ENOMEM);
+
+ pktl->pkt = *pkt;
+ pkt->destruct = NULL;
+
+ if (mp3->queue_end)
+ mp3->queue_end->next = pktl;
+ else
+ mp3->queue = pktl;
+ mp3->queue_end = pktl;
+ } else
+ return ff_raw_write_packet(s, pkt);
+ } else {
+ int ret;
- for (i = 0; i < FF_ARRAY_ELEMS(ff_mpa_freq_tab); i++)
- if (ff_mpa_freq_tab[i] == codec->sample_rate) {
- srate_idx = i;
- break;
+ /* warn only once for each stream */
+ if (s->streams[pkt->stream_index]->nb_frames == 1) {
+ av_log(s, AV_LOG_WARNING, "Got more than one picture in stream %d,"
+ " ignoring.\n", pkt->stream_index);
}
- if (i == FF_ARRAY_ELEMS(ff_mpa_freq_tab)) {
- av_log(s, AV_LOG_ERROR, "Unsupported sample rate.\n");
- return;
- }
+ if (!mp3->pics_to_write || s->streams[pkt->stream_index]->nb_frames >= 1)
+ return 0;
- switch (codec->channels) {
- case 1: channels = MPA_MONO; break;
- case 2: channels = MPA_STEREO; break;
- default: av_log(s, AV_LOG_ERROR, "Unsupported number of channels.\n"); return;
- }
-
- /* dummy MPEG audio header */
- header = 0xff << 24; // sync
- header |= (0x7 << 5 | 0x3 << 3 | 0x1 << 1 | 0x1) << 16; // sync/mpeg-1/layer 3/no crc*/
- header |= (bitrate_idx << 4 | srate_idx << 2) << 8;
- header |= channels << 6;
- avio_wb32(s->pb, header);
-
- ff_mpegaudio_decode_header(&mpah, header);
+ if ((ret = ff_id3v2_write_apic(s, &mp3->id3, pkt)) < 0)
+ return ret;
+ mp3->pics_to_write--;
- ffio_fill(s->pb, 0, xing_offset);
- ffio_wfourcc(s->pb, "Xing");
- avio_wb32(s->pb, 0x1); // only number of frames
- mp3->nb_frames_offset = avio_tell(s->pb);
- avio_wb32(s->pb, 0);
+ /* flush the buffered audio packets */
+ if (!mp3->pics_to_write &&
+ (ret = mp3_queue_flush(s)) < 0)
+ return ret;
+ }
- mpah.frame_size -= 4 + xing_offset + 4 + 4 + 4;
- ffio_fill(s->pb, 0, mpah.frame_size);
+ return 0;
}
/**
static int mp3_write_header(struct AVFormatContext *s)
{
MP3Context *mp3 = s->priv_data;
- AVDictionaryEntry *t = NULL;
- int totlen = 0, enc = mp3->id3v2_version == 3 ? ID3v2_ENCODING_UTF16BOM :
- ID3v2_ENCODING_UTF8;
- int64_t size_pos, cur_pos;
-
- avio_wb32(s->pb, MKBETAG('I', 'D', '3', mp3->id3v2_version));
- avio_w8(s->pb, 0);
- avio_w8(s->pb, 0); /* flags */
-
- /* reserve space for size */
- size_pos = avio_tell(s->pb);
- avio_wb32(s->pb, 0);
-
- ff_metadata_conv(&s->metadata, ff_id3v2_34_metadata_conv, NULL);
- if (mp3->id3v2_version == 4)
- ff_metadata_conv(&s->metadata, ff_id3v2_4_metadata_conv, NULL);
-
- while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) {
- int ret;
-
- if ((ret = id3v2_check_write_tag(s, t, ff_id3v2_tags, enc)) > 0) {
- totlen += ret;
- continue;
- }
- if ((ret = id3v2_check_write_tag(s, t, mp3->id3v2_version == 3 ?
- ff_id3v2_3_tags : ff_id3v2_4_tags, enc)) > 0) {
- totlen += ret;
- continue;
+ int ret, i;
+
+ /* check the streams -- we want exactly one audio and arbitrary number of
+ * video (attached pictures) */
+ mp3->audio_stream_idx = -1;
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
+ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+ if (mp3->audio_stream_idx >= 0 || st->codec->codec_id != CODEC_ID_MP3) {
+ av_log(s, AV_LOG_ERROR, "Invalid audio stream. Exactly one MP3 "
+ "audio stream is required.\n");
+ return AVERROR(EINVAL);
+ }
+ mp3->audio_stream_idx = i;
+ } else if (st->codec->codec_type != AVMEDIA_TYPE_VIDEO) {
+ av_log(s, AV_LOG_ERROR, "Only audio streams and pictures are allowed in MP3.\n");
+ return AVERROR(EINVAL);
}
-
- /* unknown tag, write as TXXX frame */
- if ((ret = id3v2_put_ttag(s, t->key, t->value, MKBETAG('T', 'X', 'X', 'X'), enc)) < 0)
- return ret;
- totlen += ret;
}
+ if (mp3->audio_stream_idx < 0) {
+ av_log(s, AV_LOG_ERROR, "No audio stream present.\n");
+ return AVERROR(EINVAL);
+ }
+ mp3->pics_to_write = s->nb_streams - 1;
- cur_pos = avio_tell(s->pb);
- avio_seek(s->pb, size_pos, SEEK_SET);
- id3v2_put_size(s, totlen);
- avio_seek(s->pb, cur_pos, SEEK_SET);
+ ff_id3v2_start(&mp3->id3, s->pb, mp3->id3v2_version, ID3v2_DEFAULT_MAGIC);
+ ret = ff_id3v2_write_metadata(s, &mp3->id3);
+ if (ret < 0)
+ return ret;
- if (s->pb->seekable)
+ if (!mp3->pics_to_write) {
+ ff_id3v2_finish(&mp3->id3, s->pb);
mp3_write_xing(s);
+ }
return 0;
}
.extensions = "mp3",
.priv_data_size = sizeof(MP3Context),
.audio_codec = CODEC_ID_MP3,
- .video_codec = CODEC_ID_NONE,
+ .video_codec = CODEC_ID_PNG,
.write_header = mp3_write_header,
- .write_packet = ff_raw_write_packet,
+ .write_packet = mp3_write_packet,
.write_trailer = mp3_write_trailer,
.flags = AVFMT_NOTIMESTAMPS,
- .priv_class = &mp3_muxer_class,
+ .priv_class = &mp3_muxer_class,
};
#endif
projects / ffmpeg / blobdiff