videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

ogg: allow streams to update metadata 

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Ben Boeckel 2014-02-05 12:10:54 -05:00 committed by Michael Niedermayer
parent 129e24f78e
commit 7eb84f2c3b
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/oggdec.c
View File

@ -78,6 +78,8 @@ static int ogg_save(AVFormatContext *s)
struct ogg_stream *os = ogg->streams + i;
os->buf = av_mallocz(os->bufsize + FF_INPUT_BUFFER_PADDING_SIZE);
memcpy(os->buf, ost->streams[i].buf, os->bufpos);
os->new_metadata = NULL;
os->new_metadata_size = 0;
}
ogg->state = ost;
@ -144,6 +146,8 @@ static int ogg_reset(AVFormatContext *s)
os->lastpts = 0;
}
os->end_trimming = 0;
av_freep(&os->new_metadata);
os->new_metadata_size = 0;
}
ogg->page_pos = -1;
@ -641,6 +645,7 @@ static int ogg_read_close(AVFormatContext *s)
ogg->streams[i].codec->cleanup(s, i);
}
av_freep(&ogg->streams[i].private);
av_freep(&ogg->streams[i].new_metadata);
}
av_freep(&ogg->streams);
return 0;
@ -789,6 +794,15 @@ retry:
os->end_trimming = 0;
}
if (os->new_metadata) {
uint8_t *side_data = av_packet_new_side_data(pkt,
AV_PKT_DATA_METADATA_UPDATE,
os->new_metadata_size);
memcpy(side_data, os->new_metadata, os->new_metadata_size);
av_freep(&os->new_metadata);
os->new_metadata_size = 0;
}
return psize;
}

2
libavformat/oggdec.h
View File

@ -85,6 +85,8 @@ struct ogg_stream {
int got_data; ///< 1 if the stream got some data (non-initial packets), 0 otherwise
int nb_header; ///< set to the number of parsed headers
int end_trimming; ///< set the number of packets to drop from the end
uint8_t *new_metadata;
unsigned int new_metadata_size;
void *private;
};