RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux_mkv: introduce new_demux_packet_from() and use it

This commit is contained in:
wm4 2013-04-14 23:19:29 +02:00
parent eb27e14622
commit 23da9e68e8
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
demux/demux.c
View File

@ -133,7 +133,7 @@ struct demux_packet *new_demux_packet(size_t len)
return dp; return dp;
} }
// data must already have suitable padding // data must already have suitable padding, and does not copy the data
struct demux_packet *new_demux_packet_fromdata(void *data, size_t len) struct demux_packet *new_demux_packet_fromdata(void *data, size_t len)
{ {
struct demux_packet *dp = create_packet(len); struct demux_packet *dp = create_packet(len);
@ -141,6 +141,13 @@ struct demux_packet *new_demux_packet_fromdata(void *data, size_t len)
return dp; return dp;
} }
struct demux_packet *new_demux_packet_from(void *data, size_t len)
{
struct demux_packet *dp = new_demux_packet(len);
memcpy(dp->buffer, data, len);
return dp;
}
void resize_demux_packet(struct demux_packet *dp, size_t len) void resize_demux_packet(struct demux_packet *dp, size_t len)
{ {
if (len > 1000000000) { if (len > 1000000000) {

1
demux/demux.h
View File

@ -287,6 +287,7 @@ typedef struct {
struct demux_packet *new_demux_packet(size_t len); struct demux_packet *new_demux_packet(size_t len);
// data must already have suitable padding // data must already have suitable padding
struct demux_packet *new_demux_packet_fromdata(void *data, size_t len); struct demux_packet *new_demux_packet_fromdata(void *data, size_t len);
struct demux_packet *new_demux_packet_from(void *data, size_t len);
void resize_demux_packet(struct demux_packet *dp, size_t len); void resize_demux_packet(struct demux_packet *dp, size_t len);
void free_demux_packet(struct demux_packet *dp); void free_demux_packet(struct demux_packet *dp);

15
demux/demux_mkv.c
View File

@ -1891,8 +1891,7 @@ static void handle_realvideo(demuxer_t *demuxer, mkv_track_t *track,
demux_packet_t *dp; demux_packet_t *dp;
uint32_t timestamp = mkv_d->last_pts * 1000; uint32_t timestamp = mkv_d->last_pts * 1000;
dp = new_demux_packet(data.len); dp = new_demux_packet_from(data.start, data.len);
memcpy(dp->buffer, data.start, data.len);
if (mkv_d->v_skip_to_keyframe) { if (mkv_d->v_skip_to_keyframe) {
dp->pts = mkv_d->last_pts; dp->pts = mkv_d->last_pts;
@ -1991,9 +1990,8 @@ static void handle_realaudio(demuxer_t *demuxer, mkv_track_t *track,
track->sub_packet_cnt = 0; track->sub_packet_cnt = 0;
// Release all the audio packets // Release all the audio packets
for (x = 0; x < sph * w / apk_usize; x++) { for (x = 0; x < sph * w / apk_usize; x++) {
dp = new_demux_packet(apk_usize); dp = new_demux_packet_from(track->audio_buf + x * apk_usize,
memcpy(dp->buffer, track->audio_buf + x * apk_usize, apk_usize);
apk_usize);
/* Put timestamp only on packets that correspond to original /* Put timestamp only on packets that correspond to original
* audio packets in file */ * audio packets in file */
dp->pts = (x * apk_usize % w) ? 0 : dp->pts = (x * apk_usize % w) ? 0 :
@ -2004,8 +2002,7 @@ static void handle_realaudio(demuxer_t *demuxer, mkv_track_t *track,
} }
} }
} else { // Not a codec that require reordering } else { // Not a codec that require reordering
dp = new_demux_packet(size); dp = new_demux_packet_from(buffer, size);
memcpy(dp->buffer, buffer, size);
if (track->ra_pts == mkv_d->last_pts && !mkv_d->a_skip_to_keyframe) if (track->ra_pts == mkv_d->last_pts && !mkv_d->a_skip_to_keyframe)
dp->pts = 0; dp->pts = 0;
else else
@ -2165,8 +2162,8 @@ static int handle_block(demuxer_t *demuxer, struct block_info *block_info)
else { else {
bstr buffer = demux_mkv_decode(track, block, 1); bstr buffer = demux_mkv_decode(track, block, 1);
if (buffer.start) { if (buffer.start) {
demux_packet_t *dp = new_demux_packet(buffer.len); demux_packet_t *dp =
memcpy(dp->buffer, buffer.start, buffer.len); new_demux_packet_from(buffer.start, buffer.len);
if (buffer.start != block.start) if (buffer.start != block.start)
talloc_free(buffer.start); talloc_free(buffer.start);
dp->keyframe = keyframe; dp->keyframe = keyframe;