RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-04 21:27:58 +00:00
Code Issues Releases Wiki Activity

audio: add function to convert AVFrame to mp_audio references

Browse Source 
This is somewhat duplicated from ad_lavc.c and af_lavfi.c, but will
eventually be used by both.
This commit is contained in:
wm4 2014-11-10 18:45:24 +01:00
parent 5d46e44160
commit 0b26d8c666
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
audio/audio.c
View File

@ -21,9 +21,12 @@
#include <assert.h> #include <assert.h>
#include <libavutil/buffer.h> #include <libavutil/buffer.h>
#include <libavutil/frame.h>
#include <libavutil/version.h>
#include "talloc.h" #include "talloc.h"
#include "common/common.h" #include "common/common.h"
#include "fmt-conversion.h"
#include "audio.h" #include "audio.h"
static void update_redundant_info(struct mp_audio *mpa) static void update_redundant_info(struct mp_audio *mpa)
@ -239,6 +242,51 @@ void mp_audio_skip_samples(struct mp_audio *data, int samples)
data->samples -= samples; data->samples -= samples;
} }
struct mp_audio *mp_audio_from_avframe(struct AVFrame *avframe)
{
struct mp_audio *new = talloc_zero(NULL, struct mp_audio);
talloc_set_destructor(new, mp_audio_destructor);
mp_audio_set_format(new, af_from_avformat(avframe->format));
struct mp_chmap lavc_chmap;
mp_chmap_from_lavc(&lavc_chmap, avframe->channel_layout);
#if LIBAVUTIL_VERSION_MICRO >= 100
// FFmpeg being special again
if (lavc_chmap.num != avframe->channels)
mp_chmap_from_channels(&lavc_chmap, avframe->channels);
#endif
new->rate = avframe->sample_rate;
mp_audio_set_channels(new, &lavc_chmap);
// If we can't handle the format (e.g. too many channels), bail out.
if (!mp_audio_config_valid(new) || avframe->nb_extended_buf)
goto fail;
for (int n = 0; n < AV_NUM_DATA_POINTERS; n++) {
if (!avframe->buf[n])
break;
if (n >= MP_NUM_CHANNELS)
goto fail;
new->allocated[n] = av_buffer_ref(avframe->buf[n]);
if (!new->allocated[n])
goto fail;
}
for (int n = 0; n < new->num_planes; n++)
new->planes[n] = avframe->data[n];
new->samples = avframe->nb_samples;
return new;
fail:
talloc_free(new);
return NULL;
}
struct mp_audio_pool { struct mp_audio_pool {
AVBufferPool *avpool; AVBufferPool *avpool;
int element_size; int element_size;

3
audio/audio.h
View File

@ -68,6 +68,9 @@ void mp_audio_copy(struct mp_audio *dst, int dst_offset,
struct mp_audio *src, int src_offset, int length); struct mp_audio *src, int src_offset, int length);
void mp_audio_skip_samples(struct mp_audio *data, int samples); void mp_audio_skip_samples(struct mp_audio *data, int samples);
struct AVFrame;
struct mp_audio *mp_audio_from_avframe(struct AVFrame *avframe);
struct mp_audio_pool *mp_audio_pool_create(void *ta_parent); struct mp_audio_pool *mp_audio_pool_create(void *ta_parent);
struct mp_audio *mp_audio_pool_get(struct mp_audio_pool *pool, struct mp_audio *mp_audio_pool_get(struct mp_audio_pool *pool,
const struct mp_audio *fmt, int samples); const struct mp_audio *fmt, int samples);