* function definitions common to libschroedinger decoder and encoder
*/
-#include "libschroedinger.h"
+#include "libavutil/attributes.h"
#include "libavutil/mem.h"
+#include "libschroedinger.h"
+#include "internal.h"
static const SchroVideoFormatInfo ff_schro_video_format_info[] = {
{ 640, 480, 24000, 1001},
return ret_idx;
}
-void ff_schro_queue_init(FFSchroQueue *queue)
+av_cold void ff_schro_queue_init(FFSchroQueue *queue)
{
queue->p_head = queue->p_tail = NULL;
queue->size = 0;
static void free_schro_frame(SchroFrame *frame, void *priv)
{
- AVPicture *p_pic = priv;
-
- if (!p_pic)
- return;
-
- avpicture_free(p_pic);
- av_freep(&p_pic);
+ AVFrame *p_pic = priv;
+ av_frame_free(&p_pic);
}
SchroFrame *ff_create_schro_frame(AVCodecContext *avctx,
SchroFrameFormat schro_frame_fmt)
{
- AVPicture *p_pic;
+ AVFrame *p_pic;
SchroFrame *p_frame;
int y_width, uv_width;
int y_height, uv_height;
uv_width = y_width >> (SCHRO_FRAME_FORMAT_H_SHIFT(schro_frame_fmt));
uv_height = y_height >> (SCHRO_FRAME_FORMAT_V_SHIFT(schro_frame_fmt));
- p_pic = av_mallocz(sizeof(AVPicture));
- avpicture_alloc(p_pic, avctx->pix_fmt, y_width, y_height);
+ p_pic = av_frame_alloc();
+ if (!p_pic)
+ return NULL;
+
+ if (ff_get_buffer(avctx, p_pic, AV_GET_BUFFER_FLAG_REF) < 0) {
+ av_frame_free(&p_pic);
+ av_log(avctx, AV_LOG_ERROR, "Unable to allocate buffer\n");
+ return NULL;
+ }
p_frame = schro_frame_new();
p_frame->format = schro_frame_fmt;
p_frame->width = y_width;
p_frame->height = y_height;
- schro_frame_set_free_callback(p_frame, free_schro_frame, (void *)p_pic);
+ schro_frame_set_free_callback(p_frame, free_schro_frame, p_pic);
for (i = 0; i < 3; ++i) {
p_frame->components[i].width = i ? uv_width : y_width;