---
libavcodec/pcm.c | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index 24ff0f9..1bb1650 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -24,9 +24,11 @@
* PCM codecs
*/
+#include "libavutil/mathematics.h"
#include "avcodec.h"
#include "libavutil/common.h" /* for av_reverse */
#include "bytestream.h"
+#include "internal.h"
#include "pcm_tablegen.h"
#define MAX_CHANNELS 64
@@ -77,10 +79,10 @@ static av_cold int pcm_encode_close(AVCodecContext *avctx)
bytestream_put_##endian(&dst, v); \
}
-static int pcm_encode_frame(AVCodecContext *avctx,
- unsigned char *frame, int buf_size, void *data)
+static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
+ const AVFrame *frame)
{
- int n, sample_size, v;
+ int n, sample_size, v, ret;
const short *samples;
unsigned char *dst;
const uint8_t *srcu8;
@@ -91,9 +93,14 @@ static int pcm_encode_frame(AVCodecContext *avctx,
const uint32_t *samples_uint32_t;
sample_size = av_get_bits_per_sample(avctx->codec->id)/8;
- n = buf_size / sample_size;
- samples = data;
- dst = frame;
+ n = frame->nb_samples * avctx->channels;
+ samples = (const short *)frame->data[0];
+
+ if ((ret = ff_alloc_packet(avpkt, n * sample_size))) {
+ av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");
+ return ret;
+ }
+ dst = avpkt->data;
switch(avctx->codec->id) {
case CODEC_ID_PCM_U32LE:
@@ -130,7 +137,7 @@ static int pcm_encode_frame(AVCodecContext *avctx,
ENCODE(uint16_t, be16, samples, dst, n, 0, 0x8000)
break;
case CODEC_ID_PCM_S8:
- srcu8= data;
+ srcu8 = frame->data[0];
for(;n>0;n--) {
v = *srcu8++;
*dst++ = v - 128;
@@ -186,9 +193,14 @@ static int pcm_encode_frame(AVCodecContext *avctx,
default:
return -1;
}
- //avctx->frame_size = (dst - frame) / (sample_size * avctx->channels);
- return dst - frame;
+ avpkt->duration = av_rescale_q(frame->nb_samples,
+ (AVRational){ 1, avctx->sample_rate },
+ avctx->time_base);
+ avpkt->pts = frame->pts;
+ avpkt->size = frame->nb_samples * avctx->channels * sample_size;
+
+ return 0;
}
typedef struct PCMDecode {
@@ -472,7 +484,7 @@ AVCodec ff_ ## name_ ## _encoder = { \
.type = AVMEDIA_TYPE_AUDIO, \
.id = id_, \
.init = pcm_encode_init, \
- .encode = pcm_encode_frame, \
+ .encode2 = pcm_encode_frame, \
.close = pcm_encode_close, \
.capabilities = CODEC_CAP_VARIABLE_FRAME_SIZE, \
.sample_fmts = (const enum
AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
