generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/libxavs: 2nd attempt to fix compilation after b18c7c8d.

Browse Source
This commit is contained in:
Clément Bœsch 2013-11-18 08:08:41 +01:00
parent 71cd83e34c
commit 260fc0d95b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/libxavs.c
View File

@ -113,7 +113,7 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt,
static int XAVS_frame(AVCodecContext *avctx, AVPacket *pkt, static int XAVS_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *frame, int *got_packet) const AVFrame *frame, int *got_packet)
{ {
XavsContext *x4 = ctx->priv_data; XavsContext *x4 = avctx->priv_data;
xavs_nal_t *nal; xavs_nal_t *nal;
int nnal, i, ret; int nnal, i, ret;
xavs_picture_t pic_out; xavs_picture_t pic_out;
@ -129,29 +129,29 @@ static int XAVS_frame(AVCodecContext *avctx, AVPacket *pkt,
x4->pic.i_pts = frame->pts; x4->pic.i_pts = frame->pts;
x4->pic.i_type = XAVS_TYPE_AUTO; x4->pic.i_type = XAVS_TYPE_AUTO;
x4->pts_buffer[ctx->frame_number % (ctx->max_b_frames+1)] = frame->pts; x4->pts_buffer[avctx->frame_number % (avctx->max_b_frames+1)] = frame->pts;
} }
if (xavs_encoder_encode(x4->enc, &nal, &nnal, if (xavs_encoder_encode(x4->enc, &nal, &nnal,
frame? &x4->pic: NULL, &pic_out) < 0) frame? &x4->pic: NULL, &pic_out) < 0)
return -1; return -1;
ret = encode_nals(ctx, pkt, nal, nnal); ret = encode_nals(avctx, pkt, nal, nnal);
if (ret < 0) if (ret < 0)
return -1; return -1;
if (!ret) { if (!ret) {
if (!frame && !(x4->end_of_stream)) { if (!frame && !(x4->end_of_stream)) {
if ((ret = ff_alloc_packet2(ctx, pkt, 4)) < 0) if ((ret = ff_alloc_packet2(avctx, pkt, 4)) < 0)
return ret; return ret;
pkt->data[0] = 0x0; pkt->data[0] = 0x0;
pkt->data[1] = 0x0; pkt->data[1] = 0x0;
pkt->data[2] = 0x01; pkt->data[2] = 0x01;
pkt->data[3] = 0xb1; pkt->data[3] = 0xb1;
pkt->dts = 2*x4->pts_buffer[(x4->out_frame_count-1)%(ctx->max_b_frames+1)] - pkt->dts = 2*x4->pts_buffer[(x4->out_frame_count-1)%(avctx->max_b_frames+1)] -
x4->pts_buffer[(x4->out_frame_count-2)%(ctx->max_b_frames+1)]; x4->pts_buffer[(x4->out_frame_count-2)%(avctx->max_b_frames+1)];
x4->end_of_stream = END_OF_STREAM; x4->end_of_stream = END_OF_STREAM;
*got_packet = 1; *got_packet = 1;
} }
@ -160,11 +160,11 @@ static int XAVS_frame(AVCodecContext *avctx, AVPacket *pkt,
avctx->coded_frame->pts = pic_out.i_pts; avctx->coded_frame->pts = pic_out.i_pts;
pkt->pts = pic_out.i_pts; pkt->pts = pic_out.i_pts;
if (ctx->has_b_frames) { if (avctx->has_b_frames) {
if (!x4->out_frame_count) if (!x4->out_frame_count)
pkt->dts = pkt->pts - (x4->pts_buffer[1] - x4->pts_buffer[0]); pkt->dts = pkt->pts - (x4->pts_buffer[1] - x4->pts_buffer[0]);
else else
pkt->dts = x4->pts_buffer[(x4->out_frame_count-1)%(ctx->max_b_frames+1)]; pkt->dts = x4->pts_buffer[(x4->out_frame_count-1)%(avctx->max_b_frames+1)];
} else } else
pkt->dts = pkt->pts; pkt->dts = pkt->pts;