Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

ad_lavc: allow skip samples amount to be larger than 1 packet

Browse Source 
Apparently we actually need this. At least the following commit would
break without this.
This commit is contained in:
wm4
2014-11-03 19:56:38 +01:00
parent 416c86f3cb
commit 93e1db0bff
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
audio/decode/ad_lavc.c
View File

@@ -44,6 +44,7 @@ struct priv {
struct mp_audio frame;
bool force_channel_map;
struct demux_packet *packet;
uint32_t skip_samples;
};
static void uninit(struct dec_audio *da);
@@ -107,11 +108,13 @@ static void set_data_from_avframe(struct dec_audio *da)
av_frame_get_side_data(priv->avframe, AV_FRAME_DATA_SKIP_SAMPLES);
if (sd && sd->size >= 10) {
char *d = sd->data;
uint32_t skip = AV_RL32(d + 0);
priv->skip_samples += AV_RL32(d + 0);
uint32_t pad = AV_RL32(d + 4);
if (skip <= da->decoded.samples) {
uint32_t skip = MPMIN(priv->skip_samples, da->decoded.samples);
if (skip) {
mp_audio_skip_samples(&da->decoded, skip);
da->pts_offset += skip;
priv->skip_samples -= skip;
}
if (pad <= da->decoded.samples)
da->decoded.samples -= pad;
@@ -222,6 +225,7 @@ static int control(struct dec_audio *da, int cmd, void *arg)
mp_audio_set_null_data(&da->decoded);
talloc_free(ctx->packet);
ctx->packet = NULL;
ctx->skip_samples = 0;
return CONTROL_TRUE;
}
return CONTROL_UNKNOWN;