*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
typedef struct MsrleContext {
AVCodecContext *avctx;
AVFrame frame;
- AVFrame prev_frame;
unsigned char *buf;
int size;
FETCH_NEXT_STREAM_BYTE();
s->frame.data[0][row_ptr + pixel_ptr] = stream_byte >> 4;
pixel_ptr++;
- if (i + 1 == rle_code && odd_pixel)
- break;
+ if (i + 1 == rle_code && odd_pixel)
+ break;
if (pixel_ptr >= s->avctx->width)
break;
s->frame.data[0][row_ptr + pixel_ptr] = stream_byte & 0x0F;
avctx->pix_fmt = PIX_FMT_PAL8;
avctx->has_b_frames = 0;
- s->frame.data[0] = s->prev_frame.data[0] = NULL;
+ s->frame.data[0] = NULL;
return 0;
}
{
MsrleContext *s = (MsrleContext *)avctx->priv_data;
- /* no supplementary picture */
- if (buf_size == 0)
- return 0;
-
s->buf = buf;
s->size = buf_size;
s->frame.reference = 1;
- s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE;
- if (avctx->cr_available)
- s->frame.buffer_hints |= FF_BUFFER_HINTS_REUSABLE;
- else
- s->frame.buffer_hints |= FF_BUFFER_HINTS_READABLE;
- if (avctx->get_buffer(avctx, &s->frame)) {
- av_log(avctx, AV_LOG_ERROR, " MS RLE: get_buffer() failed\n");
+ s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
+ if (avctx->reget_buffer(avctx, &s->frame)) {
+ av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1;
}
- if (s->prev_frame.data[0] && (s->frame.linesize[0] != s->prev_frame.linesize[0]))
- av_log(avctx, AV_LOG_ERROR, " MS RLE: Buffer linesize changed: current %u, previous %u.\n"
- " Expect wrong image and/or crash!\n",
- s->frame.linesize[0], s->prev_frame.linesize[0]);
-
- /* grossly inefficient, but...oh well */
- if (s->prev_frame.data[0] != NULL)
- memcpy(s->frame.data[0], s->prev_frame.data[0],
- s->frame.linesize[0] * s->avctx->height);
-
switch (avctx->bits_per_sample) {
case 8:
msrle_decode_pal8(s);
avctx->bits_per_sample);
}
- if (s->prev_frame.data[0])
- avctx->release_buffer(avctx, &s->prev_frame);
-
- /* shuffle frames */
- if (!avctx->cr_available)
- s->prev_frame = s->frame;
-
*data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame;
MsrleContext *s = (MsrleContext *)avctx->priv_data;
/* release the last frame */
- if (s->prev_frame.data[0])
- avctx->release_buffer(avctx, &s->prev_frame);
+ if (s->frame.data[0])
+ avctx->release_buffer(avctx, &s->frame);
return 0;
}
NULL,
msrle_decode_end,
msrle_decode_frame,
- CODEC_CAP_DR1 | CODEC_CAP_CR,
+ CODEC_CAP_DR1,
};