MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use avcodec_decode_audio3() when available (FFmpeg 0.6)

Browse Source
This commit is contained in:
Julien BLACHE 2011-02-23 18:26:42 +01:00
parent 96a65ade6b
commit 67daf3259a
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/transcode.c
View File

@ -60,8 +60,7 @@ struct transcode_ctx {
AVCodecContext *acodec; /* pCodecCtx */ AVCodecContext *acodec; /* pCodecCtx */
AVCodec *adecoder; /* pCodec */ AVCodec *adecoder; /* pCodec */
AVPacket apacket; AVPacket apacket;
int apacket_size; AVPacket apacket2;
uint8_t *apacket_data;
int16_t *abuffer; int16_t *abuffer;
/* Resampling */ /* Resampling */
@ -161,23 +160,30 @@ transcode(struct transcode_ctx *ctx, struct evbuffer *evbuf, int wanted)
while ((processed < wanted) && !stop) while ((processed < wanted) && !stop)
{ {
/* Decode data */ /* Decode data */
while (ctx->apacket_size > 0) while (ctx->apacket2.size > 0)
{ {
buflen = XCODE_BUFFER_SIZE; buflen = XCODE_BUFFER_SIZE;
#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
/* FFmpeg 0.6 */
used = avcodec_decode_audio3(ctx->acodec,
ctx->abuffer, &buflen,
&ctx->apacket2);
#else
used = avcodec_decode_audio2(ctx->acodec, used = avcodec_decode_audio2(ctx->acodec,
ctx->abuffer, &buflen, ctx->abuffer, &buflen,
ctx->apacket_data, ctx->apacket_size); ctx->apacket2.data, ctx->apacket2.size);
#endif
if (used < 0) if (used < 0)
{ {
/* Something happened, skip this packet */ /* Something happened, skip this packet */
ctx->apacket_size = 0; ctx->apacket2.size = 0;
break; break;
} }
ctx->apacket_data += used; ctx->apacket2.data += used;
ctx->apacket_size -= used; ctx->apacket2.size -= used;
/* No frame decoded this time around */ /* No frame decoded this time around */
if (buflen == 0) if (buflen == 0)
@ -235,9 +241,8 @@ transcode(struct transcode_ctx *ctx, struct evbuffer *evbuf, int wanted)
} }
while (ctx->apacket.stream_index != ctx->astream); while (ctx->apacket.stream_index != ctx->astream);
/* Copy apacket data & size and do not mess with them */ /* Copy apacket and do not mess with it */
ctx->apacket_data = ctx->apacket.data; ctx->apacket2 = ctx->apacket;
ctx->apacket_size = ctx->apacket.size;
} }
ctx->offset += processed; ctx->offset += processed;
@ -304,9 +309,8 @@ transcode_seek(struct transcode_ctx *ctx, int ms)
if (flags) if (flags)
return -1; return -1;
/* Copy apacket data & size and do not mess with them */ /* Copy apacket and do not mess with it */
ctx->apacket_data = ctx->apacket.data; ctx->apacket2 = ctx->apacket;
ctx->apacket_size = ctx->apacket.size;
/* Compute position in ms from pts */ /* Compute position in ms from pts */
got_pts = ctx->apacket.pts; got_pts = ctx->apacket.pts;