RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 01:22:30 +00:00
Code Issues Releases Wiki Activity

ad_ffmpeg: pass packet side data from libavformat

Browse Source 
Pass avpacket->side_data when using a libavcodec audio decoder
together with libavformat demuxer (this was already done for video).
This commit is contained in:
Uoti Urpala 2011-12-22 05:54:48 +02:00
parent c32b3edfea
commit 62e3877417
4 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libmpcodecs/ad_ffmpeg.c
View File

@ -20,6 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdbool.h> #include <stdbool.h>
#include <assert.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
@ -47,7 +48,7 @@ LIBAD_EXTERN(ffmpeg)
struct priv { struct priv {
AVCodecContext *avctx; AVCodecContext *avctx;
bool old_packet; int previous_data_left;
}; };
static int preinit(sh_audio_t *sh) static int preinit(sh_audio_t *sh)
@ -230,7 +231,7 @@ static int control(sh_audio_t *sh, int cmd, void *arg, ...)
case ADCTRL_RESYNC_STREAM: case ADCTRL_RESYNC_STREAM:
avcodec_flush_buffers(ctx->avctx); avcodec_flush_buffers(ctx->avctx);
ds_clear_parser(sh->ds); ds_clear_parser(sh->ds);
ctx->old_packet = false; ctx->previous_data_left = 0;
return CONTROL_TRUE; return CONTROL_TRUE;
} }
return CONTROL_UNKNOWN; return CONTROL_UNKNOWN;
@ -247,23 +248,37 @@ static int decode_audio(sh_audio_t *sh_audio, unsigned char *buf, int minlen,
while (len < minlen) { while (len < minlen) {
AVPacket pkt; AVPacket pkt;
int len2 = maxlen; int len2 = maxlen;
double pts; double pts = MP_NOPTS_VALUE;
int x = ds_get_packet_pts(sh_audio->ds, &start, &pts); int x;
if (x <= 0) { bool packet_already_used = ctx->previous_data_left;
struct demux_packet *mpkt = ds_get_packet2(sh_audio->ds,
ctx->previous_data_left);
if (!mpkt) {
assert(!ctx->previous_data_left);
start = NULL; start = NULL;
x = 0; x = 0;
ds_parse(sh_audio->ds, &start, &x, MP_NOPTS_VALUE, 0); ds_parse(sh_audio->ds, &start, &x, pts, 0);
if (x <= 0) if (x <= 0)
break; // error break; // error
} else { } else {
int in_size = x; assert(mpkt->len >= ctx->previous_data_left);
if (!ctx->previous_data_left) {
ctx->previous_data_left = mpkt->len;
pts = mpkt->pts;
}
x = ctx->previous_data_left;
start = mpkt->buffer + mpkt->len - ctx->previous_data_left;
int consumed = ds_parse(sh_audio->ds, &start, &x, pts, 0); int consumed = ds_parse(sh_audio->ds, &start, &x, pts, 0);
sh_audio->ds->buffer_pos -= in_size - consumed; ctx->previous_data_left -= consumed;
} }
av_init_packet(&pkt); av_init_packet(&pkt);
pkt.data = start; pkt.data = start;
pkt.size = x; pkt.size = x;
if (pts != MP_NOPTS_VALUE && !ctx->old_packet) { if (mpkt && mpkt->avpacket) {
pkt.side_data = mpkt->avpacket->side_data;
pkt.side_data_elems = mpkt->avpacket->side_data_elems;
}
if (pts != MP_NOPTS_VALUE && !packet_already_used) {
sh_audio->pts = pts; sh_audio->pts = pts;
sh_audio->pts_bytes = 0; sh_audio->pts_bytes = 0;
} }
@ -275,10 +290,8 @@ static int decode_audio(sh_audio_t *sh_audio, unsigned char *buf, int minlen,
mp_msg(MSGT_DECAUDIO, MSGL_V, "lavc_audio: error\n"); mp_msg(MSGT_DECAUDIO, MSGL_V, "lavc_audio: error\n");
break; break;
} }
if (!sh_audio->parser && y < x) { if (!sh_audio->parser)
sh_audio->ds->buffer_pos += y - x; // put back data (HACK!) ctx->previous_data_left += x - y;
ctx->old_packet = true;
}
if (len2 > 0) { if (len2 > 0) {
if (avctx->channels >= 5) { if (avctx->channels >= 5) {
int samplesize = av_get_bytes_per_sample(avctx->sample_fmt); int samplesize = av_get_bytes_per_sample(avctx->sample_fmt);

7
libmpdemux/demuxer.c
View File

@ -831,11 +831,12 @@ int ds_get_packet_sub(demux_stream_t *ds, unsigned char **start)
return len; return len;
} }
struct demux_packet *ds_get_packet2(struct demux_stream *ds) struct demux_packet *ds_get_packet2(struct demux_stream *ds, bool repeat_last)
{ {
// This shouldn't get used together with partial reads // This shouldn't get used together with partial reads
assert(ds->buffer_pos >= ds->buffer_size); assert(ds->buffer_pos == 0 || ds->buffer_pos >= ds->buffer_size);
ds_fill_buffer(ds); if (!repeat_last)
ds_fill_buffer(ds);
ds->buffer_pos = ds->buffer_size; ds->buffer_pos = ds->buffer_size;
return ds->current; return ds->current;
} }

2
libmpdemux/demuxer.h
View File

@ -346,7 +346,7 @@ int ds_get_packet(struct demux_stream *ds, unsigned char **start);
int ds_get_packet_pts(struct demux_stream *ds, unsigned char **start, int ds_get_packet_pts(struct demux_stream *ds, unsigned char **start,
double *pts); double *pts);
int ds_get_packet_sub(struct demux_stream *ds, unsigned char **start); int ds_get_packet_sub(struct demux_stream *ds, unsigned char **start);
struct demux_packet *ds_get_packet2(struct demux_stream *ds); struct demux_packet *ds_get_packet2(struct demux_stream *ds, bool repeat_last);
double ds_get_next_pts(struct demux_stream *ds); double ds_get_next_pts(struct demux_stream *ds);
int ds_parse(struct demux_stream *sh, uint8_t **buffer, int *len, double pts, int ds_parse(struct demux_stream *sh, uint8_t **buffer, int *len, double pts,
off_t pos); off_t pos);

2
mplayer.c
View File

@ -2933,7 +2933,7 @@ static double update_video(struct MPContext *mpctx)
int in_size = 0; int in_size = 0;
unsigned char *buf = NULL; unsigned char *buf = NULL;
pts = MP_NOPTS_VALUE; pts = MP_NOPTS_VALUE;
struct demux_packet *pkt = ds_get_packet2(mpctx->d_video); struct demux_packet *pkt = ds_get_packet2(mpctx->d_video, false);
if (pkt) { if (pkt) {
in_size = pkt->len; in_size = pkt->len;
buf = pkt->buffer; buf = pkt->buffer;