mirror of https://github.com/FFmpeg/FFmpeg.git
Hendrik Leppkes
9 years ago
parent
033764e015
commit
144fb06806
14 changed files with 1 additions and 342 deletions
@ -1,91 +0,0 @@ |
||||
/*
|
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#ifndef AVFILTER_ASRC_ABUFFER_H |
||||
#define AVFILTER_ASRC_ABUFFER_H |
||||
|
||||
#include "avfilter.h" |
||||
|
||||
/**
|
||||
* @file |
||||
* memory buffer source for audio |
||||
* |
||||
* @deprecated use buffersrc.h instead. |
||||
*/ |
||||
|
||||
/**
|
||||
* Queue an audio buffer to the audio buffer source. |
||||
* |
||||
* @param abuffersrc audio source buffer context |
||||
* @param data pointers to the samples planes |
||||
* @param linesize linesizes of each audio buffer plane |
||||
* @param nb_samples number of samples per channel |
||||
* @param sample_fmt sample format of the audio data |
||||
* @param ch_layout channel layout of the audio data |
||||
* @param planar flag to indicate if audio data is planar or packed |
||||
* @param pts presentation timestamp of the audio buffer |
||||
* @param flags unused |
||||
* |
||||
* @deprecated use av_buffersrc_add_ref() instead. |
||||
*/ |
||||
attribute_deprecated |
||||
int av_asrc_buffer_add_samples(AVFilterContext *abuffersrc, |
||||
uint8_t *data[8], int linesize[8], |
||||
int nb_samples, int sample_rate, |
||||
int sample_fmt, int64_t ch_layout, int planar, |
||||
int64_t pts, int av_unused flags); |
||||
|
||||
/**
|
||||
* Queue an audio buffer to the audio buffer source. |
||||
* |
||||
* This is similar to av_asrc_buffer_add_samples(), but the samples |
||||
* are stored in a buffer with known size. |
||||
* |
||||
* @param abuffersrc audio source buffer context |
||||
* @param buf pointer to the samples data, packed is assumed |
||||
* @param size the size in bytes of the buffer, it must contain an |
||||
* integer number of samples |
||||
* @param sample_fmt sample format of the audio data |
||||
* @param ch_layout channel layout of the audio data |
||||
* @param pts presentation timestamp of the audio buffer |
||||
* @param flags unused |
||||
* |
||||
* @deprecated use av_buffersrc_add_ref() instead. |
||||
*/ |
||||
attribute_deprecated |
||||
int av_asrc_buffer_add_buffer(AVFilterContext *abuffersrc, |
||||
uint8_t *buf, int buf_size, |
||||
int sample_rate, |
||||
int sample_fmt, int64_t ch_layout, int planar, |
||||
int64_t pts, int av_unused flags); |
||||
|
||||
/**
|
||||
* Queue an audio buffer to the audio buffer source. |
||||
* |
||||
* @param abuffersrc audio source buffer context |
||||
* @param samplesref buffer ref to queue |
||||
* @param flags unused |
||||
* |
||||
* @deprecated use av_buffersrc_add_ref() instead. |
||||
*/ |
||||
attribute_deprecated |
||||
int av_asrc_buffer_add_audio_buffer_ref(AVFilterContext *abuffersrc, |
||||
AVFilterBufferRef *samplesref, |
||||
int av_unused flags); |
||||
|
||||
#endif /* AVFILTER_ASRC_ABUFFER_H */ |
||||
@ -1,139 +0,0 @@ |
||||
/*
|
||||
* Copyright 2011 Stefano Sabatini | stefasab at gmail.com |
||||
* |
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
/**
|
||||
* @file |
||||
* libavcodec/libavfilter gluing utilities |
||||
*/ |
||||
|
||||
#include "avcodec.h" |
||||
#include "libavutil/avassert.h" |
||||
#include "libavutil/channel_layout.h" |
||||
#include "libavutil/opt.h" |
||||
|
||||
#if FF_API_AVFILTERBUFFER |
||||
FF_DISABLE_DEPRECATION_WARNINGS |
||||
AVFilterBufferRef *avfilter_get_video_buffer_ref_from_frame(const AVFrame *frame, |
||||
int perms) |
||||
{ |
||||
AVFilterBufferRef *picref = |
||||
avfilter_get_video_buffer_ref_from_arrays(frame->data, frame->linesize, perms, |
||||
frame->width, frame->height, |
||||
frame->format); |
||||
if (!picref) |
||||
return NULL; |
||||
if (avfilter_copy_frame_props(picref, frame) < 0) { |
||||
picref->buf->data[0] = NULL; |
||||
avfilter_unref_bufferp(&picref); |
||||
} |
||||
return picref; |
||||
} |
||||
|
||||
AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame, |
||||
int perms) |
||||
{ |
||||
AVFilterBufferRef *samplesref; |
||||
int channels = av_frame_get_channels(frame); |
||||
int64_t layout = av_frame_get_channel_layout(frame); |
||||
|
||||
if (layout && av_get_channel_layout_nb_channels(layout) != av_frame_get_channels(frame)) { |
||||
av_log(NULL, AV_LOG_ERROR, "Layout indicates a different number of channels than actually present\n"); |
||||
return NULL; |
||||
} |
||||
|
||||
samplesref = avfilter_get_audio_buffer_ref_from_arrays_channels( |
||||
(uint8_t **)frame->extended_data, frame->linesize[0], perms, |
||||
frame->nb_samples, frame->format, channels, layout); |
||||
if (!samplesref) |
||||
return NULL; |
||||
if (avfilter_copy_frame_props(samplesref, frame) < 0) { |
||||
samplesref->buf->data[0] = NULL; |
||||
avfilter_unref_bufferp(&samplesref); |
||||
} |
||||
return samplesref; |
||||
} |
||||
|
||||
AVFilterBufferRef *avfilter_get_buffer_ref_from_frame(enum AVMediaType type, |
||||
const AVFrame *frame, |
||||
int perms) |
||||
{ |
||||
switch (type) { |
||||
case AVMEDIA_TYPE_VIDEO: |
||||
return avfilter_get_video_buffer_ref_from_frame(frame, perms); |
||||
case AVMEDIA_TYPE_AUDIO: |
||||
return avfilter_get_audio_buffer_ref_from_frame(frame, perms); |
||||
default: |
||||
return NULL; |
||||
} |
||||
} |
||||
|
||||
int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src) |
||||
{ |
||||
int planes, nb_channels; |
||||
|
||||
if (!dst) |
||||
return AVERROR(EINVAL); |
||||
/* abort in case the src is NULL and dst is not, avoid inconsistent state in dst */ |
||||
av_assert0(src); |
||||
|
||||
memcpy(dst->data, src->data, sizeof(dst->data)); |
||||
memcpy(dst->linesize, src->linesize, sizeof(dst->linesize)); |
||||
|
||||
dst->pts = src->pts; |
||||
dst->format = src->format; |
||||
av_frame_set_pkt_pos(dst, src->pos); |
||||
|
||||
switch (src->type) { |
||||
case AVMEDIA_TYPE_VIDEO: |
||||
av_assert0(src->video); |
||||
dst->width = src->video->w; |
||||
dst->height = src->video->h; |
||||
dst->sample_aspect_ratio = src->video->sample_aspect_ratio; |
||||
dst->interlaced_frame = src->video->interlaced; |
||||
dst->top_field_first = src->video->top_field_first; |
||||
dst->key_frame = src->video->key_frame; |
||||
dst->pict_type = src->video->pict_type; |
||||
break; |
||||
case AVMEDIA_TYPE_AUDIO: |
||||
av_assert0(src->audio); |
||||
nb_channels = av_get_channel_layout_nb_channels(src->audio->channel_layout); |
||||
planes = av_sample_fmt_is_planar(src->format) ? nb_channels : 1; |
||||
|
||||
if (planes > FF_ARRAY_ELEMS(dst->data)) { |
||||
dst->extended_data = av_mallocz_array(planes, sizeof(*dst->extended_data)); |
||||
if (!dst->extended_data) |
||||
return AVERROR(ENOMEM); |
||||
memcpy(dst->extended_data, src->extended_data, |
||||
planes * sizeof(*dst->extended_data)); |
||||
} else |
||||
dst->extended_data = dst->data; |
||||
dst->nb_samples = src->audio->nb_samples; |
||||
av_frame_set_sample_rate (dst, src->audio->sample_rate); |
||||
av_frame_set_channel_layout(dst, src->audio->channel_layout); |
||||
av_frame_set_channels (dst, src->audio->channels); |
||||
break; |
||||
default: |
||||
return AVERROR(EINVAL); |
||||
} |
||||
|
||||
return 0; |
||||
} |
||||
FF_ENABLE_DEPRECATION_WARNINGS |
||||
#endif |
||||
@ -1,69 +0,0 @@ |
||||
/*
|
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#ifndef AVFILTER_AVCODEC_H |
||||
#define AVFILTER_AVCODEC_H |
||||
|
||||
/**
|
||||
* @file |
||||
* libavcodec/libavfilter gluing utilities |
||||
* |
||||
* This should be included in an application ONLY if the installed |
||||
* libavfilter has been compiled with libavcodec support, otherwise |
||||
* symbols defined below will not be available. |
||||
*/ |
||||
|
||||
#include "avfilter.h" |
||||
|
||||
#if FF_API_AVFILTERBUFFER |
||||
/**
|
||||
* Create and return a picref reference from the data and properties |
||||
* contained in frame. |
||||
* |
||||
* @param perms permissions to assign to the new buffer reference |
||||
* @deprecated avfilter APIs work natively with AVFrame instead. |
||||
*/ |
||||
attribute_deprecated |
||||
AVFilterBufferRef *avfilter_get_video_buffer_ref_from_frame(const AVFrame *frame, int perms); |
||||
|
||||
|
||||
/**
|
||||
* Create and return a picref reference from the data and properties |
||||
* contained in frame. |
||||
* |
||||
* @param perms permissions to assign to the new buffer reference |
||||
* @deprecated avfilter APIs work natively with AVFrame instead. |
||||
*/ |
||||
attribute_deprecated |
||||
AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame, |
||||
int perms); |
||||
|
||||
/**
|
||||
* Create and return a buffer reference from the data and properties |
||||
* contained in frame. |
||||
* |
||||
* @param perms permissions to assign to the new buffer reference |
||||
* @deprecated avfilter APIs work natively with AVFrame instead. |
||||
*/ |
||||
attribute_deprecated |
||||
AVFilterBufferRef *avfilter_get_buffer_ref_from_frame(enum AVMediaType type, |
||||
const AVFrame *frame, |
||||
int perms); |
||||
#endif |
||||
|
||||
#endif /* AVFILTER_AVCODEC_H */ |
||||
Loading…
Reference in new issue