avcodec/bsf: support shorthand options for av_bsf_list_parse_str

[ffmpeg] / libavformat / mp3enc.c

diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index dd662f5473c8bd0b9f9f0c9d7acd2c8f1be41598..14d4b6e0af48ad1a72e354e2d9e3f96c5699803f 100644 (file)
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -45,6 +45,7 @@ static int id3v1_set_string(AVFormatContext *s, const char *key,
     return !!tag;
 }
 
+// refer to: http://id3.org/ID3v1
 static int id3v1_create_tag(AVFormatContext *s, uint8_t *buf)
 {
     AVDictionaryEntry *tag;
@@ -58,7 +59,17 @@ static int id3v1_create_tag(AVFormatContext *s, uint8_t *buf)
     count += id3v1_set_string(s, "TIT2",    buf +  3, 30 + 1);       //title
     count += id3v1_set_string(s, "TPE1",    buf + 33, 30 + 1);       //author|artist
     count += id3v1_set_string(s, "TALB",    buf + 63, 30 + 1);       //album
-    count += id3v1_set_string(s, "TDRC",    buf + 93,  4 + 1);       //date
+    if ((tag = av_dict_get(s->metadata, "TYER", NULL, 0))) {         //year
+        av_strlcpy(buf + 93, tag->value, 4 + 1);
+        count++;
+    } else if ((tag = av_dict_get(s->metadata, "TDRC", NULL, 0))) {
+        av_strlcpy(buf + 93, tag->value, 4 + 1);
+        count++;
+    } else if ((tag = av_dict_get(s->metadata, "TDAT", NULL, 0))) {
+        av_strlcpy(buf + 93, tag->value, 4 + 1);
+        count++;
+    }
+
     count += id3v1_set_string(s, "comment", buf + 97, 30 + 1);
     if ((tag = av_dict_get(s->metadata, "TRCK", NULL, 0))) { //track
         buf[125] = 0;
@@ -391,6 +402,7 @@ static void mp3_update_xing(AVFormatContext *s)
     uint16_t tag_crc;
     uint8_t *toc;
     int i, rg_size;
+    int64_t old_pos = avio_tell(s->pb);
 
     /* replace "Xing" identification string with "Info" for CBR files. */
     if (!mp3->has_variable_bitrate)
@@ -450,7 +462,7 @@ static void mp3_update_xing(AVFormatContext *s)
 
     avio_seek(s->pb,  mp3->xing_frame_offset, SEEK_SET);
     avio_write(s->pb, mp3->xing_frame, mp3->xing_frame_size);
-    avio_seek(s->pb, 0, SEEK_END);
+    avio_seek(s->pb, old_pos, SEEK_SET);
 }
 
 static int mp3_write_trailer(struct AVFormatContext *s)
@@ -472,8 +484,6 @@ static int mp3_write_trailer(struct AVFormatContext *s)
     if (mp3->xing_offset)
         mp3_update_xing(s);
 
-    av_freep(&mp3->xing_frame);
-
     return 0;
 }
 
@@ -550,10 +560,10 @@ static int mp3_write_packet(AVFormatContext *s, AVPacket *pkt)
  * Write an ID3v2 header at beginning of stream
  */
 
-static int mp3_write_header(struct AVFormatContext *s)
+static int mp3_init(struct AVFormatContext *s)
 {
     MP3Context  *mp3 = s->priv_data;
-    int ret, i;
+    int i;
 
     if (mp3->id3v2_version      &&
         mp3->id3v2_version != 3 &&
@@ -592,6 +602,14 @@ static int mp3_write_header(struct AVFormatContext *s)
         return AVERROR(EINVAL);
     }
 
+    return 0;
+}
+
+static int mp3_write_header(struct AVFormatContext *s)
+{
+    MP3Context  *mp3 = s->priv_data;
+    int ret;
+
     if (mp3->id3v2_version) {
         ff_id3v2_start(&mp3->id3, s->pb, mp3->id3v2_version, ID3v2_DEFAULT_MAGIC);
         ret = ff_id3v2_write_metadata(s, &mp3->id3);
@@ -608,6 +626,14 @@ static int mp3_write_header(struct AVFormatContext *s)
     return 0;
 }
 
+static void mp3_deinit(struct AVFormatContext *s)
+{
+    MP3Context *mp3 = s->priv_data;
+
+    ff_packet_list_free(&mp3->queue, &mp3->queue_end);
+    av_freep(&mp3->xing_frame);
+}
+
 AVOutputFormat ff_mp3_muxer = {
     .name              = "mp3",
     .long_name         = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),
@@ -616,9 +642,11 @@ AVOutputFormat ff_mp3_muxer = {
     .priv_data_size    = sizeof(MP3Context),
     .audio_codec       = AV_CODEC_ID_MP3,
     .video_codec       = AV_CODEC_ID_PNG,
+    .init              = mp3_init,
     .write_header      = mp3_write_header,
     .write_packet      = mp3_write_packet,
     .write_trailer     = mp3_write_trailer,
+    .deinit            = mp3_deinit,
     .query_codec       = query_codec,
     .flags             = AVFMT_NOTIMESTAMPS,
     .priv_class        = &mp3_muxer_class,