X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Flibschroedingerdec.c;h=7e258e3f9887aecf760d54ec27571677ccd18647;hb=aa51b0492bfced6d650fb5ff419e2b13fde6833d;hp=7d942e77d080842516e6ab02a770de26910f97be;hpb=36ef5369ee9b336febc2c270f8718cec4476cb85;p=ffmpeg diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index 7d942e77d08..7e258e3f988 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -27,9 +27,14 @@ * (http://dirac.sourceforge.net/specification.html). */ +#include + #include "libavutil/imgutils.h" +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" +#include "libavutil/mem.h" #include "avcodec.h" +#include "internal.h" #include "libschroedinger.h" #undef NDEBUG @@ -65,9 +70,6 @@ typedef struct SchroDecoderParams { /** end of sequence pulled */ int eos_pulled; - - /** decoded picture */ - AVFrame dec_frame; } SchroDecoderParams; typedef struct SchroParseUnitContext { @@ -134,7 +136,7 @@ static SchroBuffer *find_next_parse_unit(SchroParseUnitContext *parse_ctx) /** * Returns Libav chroma format. */ -static enum PixelFormat get_chroma_format(SchroChromaFormat schro_pix_fmt) +static enum AVPixelFormat get_chroma_format(SchroChromaFormat schro_pix_fmt) { int num_formats = sizeof(schro_pixel_format_map) / sizeof(schro_pixel_format_map[0]); @@ -143,17 +145,17 @@ static enum PixelFormat get_chroma_format(SchroChromaFormat schro_pix_fmt) for (idx = 0; idx < num_formats; ++idx) if (schro_pixel_format_map[idx].schro_pix_fmt == schro_pix_fmt) return schro_pixel_format_map[idx].ff_pix_fmt; - return PIX_FMT_NONE; + return AV_PIX_FMT_NONE; } -static av_cold int libschroedinger_decode_init(AVCodecContext *avccontext) +static av_cold int libschroedinger_decode_init(AVCodecContext *avctx) { - SchroDecoderParams *p_schro_params = avccontext->priv_data; + SchroDecoderParams *p_schro_params = avctx->priv_data; /* First of all, initialize our supporting libraries. */ schro_init(); - schro_debug_set_level(avccontext->debug); + schro_debug_set_level(avctx->debug); p_schro_params->decoder = schro_decoder_new(); schro_decoder_set_skip_ratio(p_schro_params->decoder, 1); @@ -170,39 +172,39 @@ static void libschroedinger_decode_frame_free(void *frame) schro_frame_unref(frame); } -static void libschroedinger_handle_first_access_unit(AVCodecContext *avccontext) +static void libschroedinger_handle_first_access_unit(AVCodecContext *avctx) { - SchroDecoderParams *p_schro_params = avccontext->priv_data; + SchroDecoderParams *p_schro_params = avctx->priv_data; SchroDecoder *decoder = p_schro_params->decoder; p_schro_params->format = schro_decoder_get_video_format(decoder); /* Tell Libav about sequence details. */ if (av_image_check_size(p_schro_params->format->width, - p_schro_params->format->height, 0, avccontext) < 0) { - av_log(avccontext, AV_LOG_ERROR, "invalid dimensions (%dx%d)\n", + p_schro_params->format->height, 0, avctx) < 0) { + av_log(avctx, AV_LOG_ERROR, "invalid dimensions (%dx%d)\n", p_schro_params->format->width, p_schro_params->format->height); - avccontext->height = avccontext->width = 0; + avctx->height = avctx->width = 0; return; } - avccontext->height = p_schro_params->format->height; - avccontext->width = p_schro_params->format->width; - avccontext->pix_fmt = get_chroma_format(p_schro_params->format->chroma_format); + avctx->height = p_schro_params->format->height; + avctx->width = p_schro_params->format->width; + avctx->pix_fmt = get_chroma_format(p_schro_params->format->chroma_format); if (ff_get_schro_frame_format(p_schro_params->format->chroma_format, &p_schro_params->frame_format) == -1) { - av_log(avccontext, AV_LOG_ERROR, + av_log(avctx, AV_LOG_ERROR, "This codec currently only supports planar YUV 4:2:0, 4:2:2 " "and 4:4:4 formats.\n"); return; } - avccontext->time_base.den = p_schro_params->format->frame_rate_numerator; - avccontext->time_base.num = p_schro_params->format->frame_rate_denominator; + avctx->time_base.den = p_schro_params->format->frame_rate_numerator; + avctx->time_base.num = p_schro_params->format->frame_rate_denominator; } -static int libschroedinger_decode_frame(AVCodecContext *avccontext, - void *data, int *data_size, +static int libschroedinger_decode_frame(AVCodecContext *avctx, + void *data, int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; @@ -210,17 +212,18 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, int64_t pts = avpkt->pts; SchroTag *tag; - SchroDecoderParams *p_schro_params = avccontext->priv_data; + SchroDecoderParams *p_schro_params = avctx->priv_data; SchroDecoder *decoder = p_schro_params->decoder; SchroBuffer *enc_buf; SchroFrame* frame; + AVFrame *avframe = data; int state; int go = 1; int outer = 1; SchroParseUnitContext parse_ctx; LibSchroFrameContext *framewithpts = NULL; - *data_size = 0; + *got_frame = 0; parse_context_init(&parse_ctx, buf, buf_size); if (!buf_size) { @@ -236,17 +239,17 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, /* Set Schrotag with the pts to be recovered after decoding*/ enc_buf->tag = schro_tag_new(av_malloc(sizeof(int64_t)), av_free); if (!enc_buf->tag->value) { - av_log(avccontext, AV_LOG_ERROR, "Unable to allocate SchroTag\n"); + av_log(avctx, AV_LOG_ERROR, "Unable to allocate SchroTag\n"); return AVERROR(ENOMEM); } AV_WN(64, enc_buf->tag->value, pts); /* Push buffer into decoder. */ if (SCHRO_PARSE_CODE_IS_PICTURE(enc_buf->data[4]) && SCHRO_PARSE_CODE_NUM_REFS(enc_buf->data[4]) > 0) - avccontext->has_b_frames = 1; + avctx->has_b_frames = 1; state = schro_decoder_push(decoder, enc_buf); if (state == SCHRO_DECODER_FIRST_ACCESS_UNIT) - libschroedinger_handle_first_access_unit(avccontext); + libschroedinger_handle_first_access_unit(avctx); go = 1; } else outer = 0; @@ -256,7 +259,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, state = schro_decoder_wait(decoder); switch (state) { case SCHRO_DECODER_FIRST_ACCESS_UNIT: - libschroedinger_handle_first_access_unit(avccontext); + libschroedinger_handle_first_access_unit(avctx); break; case SCHRO_DECODER_NEED_BITS: @@ -266,7 +269,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, case SCHRO_DECODER_NEED_FRAME: /* Decoder needs a frame - create one and push it in. */ - frame = ff_create_schro_frame(avccontext, + frame = ff_create_schro_frame(avctx, p_schro_params->frame_format); schro_decoder_add_output_picture(decoder, frame); break; @@ -280,7 +283,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, /* Add relation between schroframe and pts. */ framewithpts = av_malloc(sizeof(LibSchroFrameContext)); if (!framewithpts) { - av_log(avccontext, AV_LOG_ERROR, "Unable to allocate FrameWithPts\n"); + av_log(avctx, AV_LOG_ERROR, "Unable to allocate FrameWithPts\n"); return AVERROR(ENOMEM); } framewithpts->frame = frame; @@ -307,58 +310,49 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, framewithpts = ff_schro_queue_pop(&p_schro_params->dec_frame_queue); if (framewithpts && framewithpts->frame) { - if (p_schro_params->dec_frame.data[0]) - avccontext->release_buffer(avccontext, &p_schro_params->dec_frame); - if (avccontext->get_buffer(avccontext, &p_schro_params->dec_frame) < 0) { - av_log(avccontext, AV_LOG_ERROR, "Unable to allocate buffer\n"); + if (ff_get_buffer(avctx, avframe, 0) < 0) { + av_log(avctx, AV_LOG_ERROR, "Unable to allocate buffer\n"); return AVERROR(ENOMEM); } - memcpy(p_schro_params->dec_frame.data[0], + memcpy(avframe->data[0], framewithpts->frame->components[0].data, framewithpts->frame->components[0].length); - memcpy(p_schro_params->dec_frame.data[1], + memcpy(avframe->data[1], framewithpts->frame->components[1].data, framewithpts->frame->components[1].length); - memcpy(p_schro_params->dec_frame.data[2], + memcpy(avframe->data[2], framewithpts->frame->components[2].data, framewithpts->frame->components[2].length); /* Fill frame with current buffer data from Schroedinger. */ - p_schro_params->dec_frame.format = -1; /* Unknown -1 */ - p_schro_params->dec_frame.width = framewithpts->frame->width; - p_schro_params->dec_frame.height = framewithpts->frame->height; - p_schro_params->dec_frame.pkt_pts = framewithpts->pts; - p_schro_params->dec_frame.linesize[0] = framewithpts->frame->components[0].stride; - p_schro_params->dec_frame.linesize[1] = framewithpts->frame->components[1].stride; - p_schro_params->dec_frame.linesize[2] = framewithpts->frame->components[2].stride; + avframe->pkt_pts = framewithpts->pts; + avframe->linesize[0] = framewithpts->frame->components[0].stride; + avframe->linesize[1] = framewithpts->frame->components[1].stride; + avframe->linesize[2] = framewithpts->frame->components[2].stride; - *(AVFrame*)data = p_schro_params->dec_frame; - *data_size = sizeof(AVFrame); + *got_frame = 1; /* Now free the frame resources. */ libschroedinger_decode_frame_free(framewithpts->frame); av_free(framewithpts); } else { data = NULL; - *data_size = 0; + *got_frame = 0; } return buf_size; } -static av_cold int libschroedinger_decode_close(AVCodecContext *avccontext) +static av_cold int libschroedinger_decode_close(AVCodecContext *avctx) { - SchroDecoderParams *p_schro_params = avccontext->priv_data; + SchroDecoderParams *p_schro_params = avctx->priv_data; /* Free the decoder. */ schro_decoder_free(p_schro_params->decoder); av_freep(&p_schro_params->format); - if (p_schro_params->dec_frame.data[0]) - avccontext->release_buffer(avccontext, &p_schro_params->dec_frame); - /* Free data in the output frame queue. */ ff_schro_queue_free(&p_schro_params->dec_frame_queue, libschroedinger_decode_frame_free); @@ -366,11 +360,11 @@ static av_cold int libschroedinger_decode_close(AVCodecContext *avccontext) return 0; } -static void libschroedinger_flush(AVCodecContext *avccontext) +static void libschroedinger_flush(AVCodecContext *avctx) { /* Got a seek request. Free the decoded frames queue and then reset * the decoder */ - SchroDecoderParams *p_schro_params = avccontext->priv_data; + SchroDecoderParams *p_schro_params = avctx->priv_data; /* Free data in the output frame queue. */ ff_schro_queue_free(&p_schro_params->dec_frame_queue, @@ -384,6 +378,7 @@ static void libschroedinger_flush(AVCodecContext *avccontext) AVCodec ff_libschroedinger_decoder = { .name = "libschroedinger", + .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DIRAC, .priv_data_size = sizeof(SchroDecoderParams), @@ -392,5 +387,4 @@ AVCodec ff_libschroedinger_decoder = { .decode = libschroedinger_decode_frame, .capabilities = CODEC_CAP_DELAY, .flush = libschroedinger_flush, - .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"), };