From 09a49e8919ddd31d0255f46ad1c3d19be7bb5ed1 Mon Sep 17 00:00:00 2001 From: Mohamed Naufal Date: Fri, 7 Oct 2011 17:01:08 +0530 Subject: [PATCH] libstagefright: set the correct frame size --- libavcodec/libstagefright.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/libstagefright.cpp b/libavcodec/libstagefright.cpp index 2022bab37e..6989357f53 100644 --- a/libavcodec/libstagefright.cpp +++ b/libavcodec/libstagefright.cpp @@ -311,7 +311,7 @@ static int Stagefright_decode_frame(AVCodecContext *avctx, void *data, frame = (Frame*)av_mallocz(sizeof(Frame)); if (avpkt->data) { frame->status = OK; - frame->size = orig_size; + frame->size = avpkt->size; // Stagefright can't handle negative timestamps - // if needed, work around this by offsetting them manually? if (avpkt->pts >= 0) @@ -324,8 +324,10 @@ static int Stagefright_decode_frame(AVCodecContext *avctx, void *data, } uint8_t *ptr = avpkt->data; // The OMX.SEC decoder fails without this. - if (avpkt->size == orig_size + avctx->extradata_size) + if (avpkt->size == orig_size + avctx->extradata_size) { ptr += avctx->extradata_size; + frame->size = orig_size; + } memcpy(frame->buffer, ptr, orig_size); } else { frame->status = ERROR_END_OF_STREAM;